refactor: move common code back to its own file

ddev · Oct 8, 2024 · 180ae7e · 180ae7e
1 parent 80f4259
commit 180ae7e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 49 deletions.
diff --git a/tests/_common.bash b/tests/_common.bash
@@ -12,46 +12,16 @@ _common_setup() {
   cd ${TESTDIR}
   ddev config  --project-name=${PROJNAME} --project-type=drupal --docroot=web
   echo -e "web_environment:\n    - DRUPAL_CORE=^${TEST_DRUPAL_CORE}" > .ddev/config.~overrides.yaml
+  ddev get ${DIR}
 }
 
 _common_teardown() {
   ddev delete -Oy ${PROJNAME} >/dev/null 2>&1
   [ "${TESTDIR}" != "" ] && rm -rf ${TESTDIR}
 }
 
-_common_test_install() {
-  echo "# ddev get ${DIR} with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
-  ddev get ${DIR}
-  ddev start
-}
-
 _common_test_poser() {
   ddev poser
   ddev mutagen sync
   ls -la
 }
-
-_common_test_symlink() {
-  ddev symlink-project
-  ddev mutagen sync
-  ls -la web/modules/custom/test_drupal_contrib/test_drupal_contrib.info.yml
-}
-
-_common_test_php() {
-  ddev phpcs --version
-  ddev phpstan --version
-  ddev phpunit --version
-}
-
-_common_test_drupal_version() {
-  run -0 ddev exec 'drush st --fields=drupal-version --format=string | cut -d. -f1'
-  [ "$output" = "${TEST_DRUPAL_CORE}" ]
-}
-
-_common_test_node() {
-  ddev exec "cd web/core && yarn install"
-  ddev exec touch web/core/.env
-  ddev mutagen sync
-  ddev stylelint --version
-  ddev eslint --version
-}
diff --git a/tests/default-no-composer-json.bats b/tests/default-no-composer-json.bats
@@ -8,18 +8,14 @@ setup_file() {
   fi
   load '_common.bash'
   _common_setup
+  ddev start
 }
 
 teardown_file() {
   load '_common.bash'
   _common_teardown
 }
 
-@test "install from directory" {
-  load '_common.bash'
-  _common_test_install
-}
-
 @test "ddev poser without composer.json" {
   load '_common.bash'
   rm -f composer.json

diff --git a/tests/full.bats b/tests/full.bats
@@ -12,39 +12,40 @@ setup_file() {
   if [ "$TEST_DRUPAL_CORE" = "11" ]; then
     ddev config --php-version=8.3 --corepack-enable
   fi
+  ddev start
 }
 
 teardown_file() {
   load '_common.bash'
   _common_teardown
 }
 
-@test "install from directory" {
-  load '_common.bash'
-  _common_test_install
-}
-
 @test "ddev poser with composer.json" {
   load '_common.bash'
   _common_test_poser
 }
 
 @test "ddev symlink-project" {
-  load '_common.bash'
-  _common_test_symlink
+  ddev symlink-project
+  ddev mutagen sync
+  ls -la web/modules/custom/test_drupal_contrib/test_drupal_contrib.info.yml
 }
 
 @test "php tools availability" {
-  load '_common.bash'
-  _common_test_php
+  ddev phpcs --version
+  ddev phpstan --version
+  ddev phpunit --version
 }
 
 @test "drupal core version" {
-  load '_common.bash'
-  _common_test_drupal_version
+  run -0 ddev exec 'drush st --fields=drupal-version --format=string | cut -d. -f1'
+  [ "$output" = "${TEST_DRUPAL_CORE}" ]
 }
 
 @test "node tools availability" {
-  load '_common.bash'
-  _common_test_node
+  ddev exec "cd web/core && yarn install"
+  ddev exec touch web/core/.env
+  ddev mutagen sync
+  ddev stylelint --version
+  ddev eslint --version
 }