Merge branch 'develop' into add/spe-feature-flag

woocommerce · Feb 27, 2025 · 90d8e3d · 90d8e3d
2 parents 885ac2b + df929cc
commit 90d8e3d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/tests/e2e/bin/down.sh b/tests/e2e/bin/down.sh
@@ -4,4 +4,4 @@ set -e
 . ./tests/e2e/bin/common.sh
 
 step "Stopping E2E docker containers"
-CWD="$CWD" redirect_output docker-compose -p wcstripe-e2e down
+CWD="$CWD" redirect_output docker compose -p wcstripe-e2e down
diff --git a/tests/e2e/bin/run-tests.sh b/tests/e2e/bin/run-tests.sh
@@ -31,17 +31,11 @@ for arg in "$@"; do
 	fi
 done
 
-if [[ *"wordpress" == "$(docker compose -p wcstripe-e2e ps --services --filter "status=running" | grep wordpress)" ]]; then
+if [[ "wordpress" != "$(docker compose -p wcstripe-e2e ps --services --filter "status=running" | grep wordpress)" ]]; then
 	error "Docker E2E containers are not running, please start them with 'npm run test:e2e-up' or 'npm run test:e2e-setup' and try again."
 	exit 1
 fi
 
-set -e
-
-. ./tests/e2e/bin/common.sh
-
-cd "$CWD"
-
 TEST_ENV="$TEST_ENV DOCKER=true E2E_ROOT=${E2E_ROOT} BASE_URL='http://localhost:8088'"
 TEST_ENV="$TEST_ENV ADMIN_USER='admin' ADMIN_PASSWORD='admin'"
 

diff --git a/tests/e2e/bin/up.sh b/tests/e2e/bin/up.sh
@@ -4,4 +4,4 @@ set -e
 . ./tests/e2e/bin/common.sh
 
 step "Starting E2E docker containers"
-CWD="$CWD" redirect_output docker-compose -f "$E2E_ROOT/env/docker-compose.yml" up -d
+CWD="$CWD" redirect_output docker compose -p wcstripe-e2e -f "$E2E_ROOT/env/docker-compose.yml" up -d