Cleanup duplicate behat docker compose config

OpenConext · Nov 4, 2024 · 677ac3f · 677ac3f
1 parent 0b8ed37
commit 677ac3f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 63 deletions.
diff --git a/.github/workflows/stepup-behat.yml b/.github/workflows/stepup-behat.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     env:
-      DOCKER_COMPOSE: docker compose -f docker-compose.yml -f docker-compose-behat.yml
+      DOCKER_COMPOSE: docker compose -f docker-compose.yml
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -30,13 +30,13 @@ jobs:
       - name: Install composer dependencies on the Behat container
         run: |
           cd stepup
-          ${DOCKER_COMPOSE} exec -T behat bash -lc "composer install --ignore-platform-reqs -n"
+          ${DOCKER_COMPOSE} exec behat composer install --ignore-platform-reqs -n
       - name: Sleep for 10 seconds
         run: sleep 10s
       - name: Run Behat tests
         run: |
           cd stepup
-          docker exec -t stepup-behat-1 bash -lc "./behat"
+          ${DOCKER_COMPOSE} exec behat ./vendor/bin/behat --config config/behat.yml
       - name: Output logs on failure
         if: failure()
         run: |

diff --git a/stepup/docker-compose-behat.yml b/stepup/docker-compose-behat.yml
diff --git a/stepup/docs/functional-testing.md b/stepup/docs/functional-testing.md
diff --git a/stepup/start-dev-env.sh b/stepup/start-dev-env.sh
@@ -13,7 +13,6 @@ else
 fi
 
 if [ "${STEPUP_VERSION}" == "test" ]; then
-	extra_compose_args="-f docker-compose-behat.yml"
 	MODE="test"
 	echo -e "${GREEN}Starting in test mode${ENDCOLOR}"
 else

diff --git a/stepup/tests/behat/features/bootstrap/FeatureContext.php b/stepup/tests/behat/features/bootstrap/FeatureContext.php
@@ -51,17 +51,17 @@ public static function setupDatabase(BeforeFeatureScope $scope)
     {
         // Generate test databases
         echo "Preparing test schemas\n";
-        shell_exec("docker exec -it stepup-middleware-1 bin/console doctrine:schema:drop --env=smoketest --force");
-        shell_exec("docker exec -it stepup-gateway-1  bin/console doctrine:schema:drop --env=smoketest --force");
-        shell_exec("docker exec -it stepup-middleware-1 bin/console doctrine:schema:create --env=smoketest");
-        shell_exec("docker exec -it stepup-gateway-1 bin/console doctrine:schema:create --env=smoketest");
+        shell_exec("docker exec -t stepup-middleware-1 bin/console doctrine:schema:drop --env=smoketest --force");
+        shell_exec("docker exec -t stepup-gateway-1  bin/console doctrine:schema:drop --env=smoketest --force");
+        shell_exec("docker exec -t stepup-middleware-1 bin/console doctrine:schema:create --env=smoketest");
+        shell_exec("docker exec -t stepup-gateway-1 bin/console doctrine:schema:create --env=smoketest");
 
         echo "Replaying event stream\n";
         // Import the events.sql into middleware
         shell_exec("mysql -uroot -psecret middleware_test -h mariadb < ./fixtures/events.sql");
         shell_exec("./fixtures/middleware-push-config.sh");
         // Perform an event replay
-        shell_exec("docker exec -ti stepup-middleware-1 bin/console middleware:event:replay --env=smoketest_event_replay --no-interaction -q");
+        shell_exec("docker exec -t stepup-middleware-1 bin/console middleware:event:replay --env=smoketest_event_replay --no-interaction -q");
     }
 
     /**