Update permissions settings and project names for E2E test setup #10315
+43
−8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Test the buildOption 1. Jetpack Beta
Option 2. Jurassic Ninja - available for logged-in A12s🚀 Launch a JN site with this branch 🚀 ℹ️ Install this Tampermonkey script to get more options. Build info:
Note: the build is updated when a new commit is pushed to this PR. |
|
Size Change: 0 B Total Size: 1.28 MB ℹ️ View Unchanged
|
achyuthajoy
requested changes
Feb 6, 2025
There was a problem hiding this comment.
@dmvrtx Thanks for working on this. The changes makes sense, however I have added some suggestions.
tests/e2e/env/setup.sh
Outdated
| @@ -67,27 +84,29 @@ if [[ "$E2E_USE_LOCAL_SERVER" != false ]]; then | |||
| echo "Secrets created" | |||
|
|
|||
| step "Starting SERVER containers" | |||
| redirect_output docker compose -f docker-compose.yml -f docker-compose.e2e.yml up --build --force-recreate -d | |||
| redirect_output docker compose -p transact-platform-server-e2e -f docker-compose.yml -f docker-compose.e2e.yml up --build --force-recreate -d | |||
There was a problem hiding this comment.
Specifying the project name is not required. Instead, we can rename the dependency directory for transact-platform-server to transact-platform-server-e2e. Same for dec tools directory.
Since docker picks up the immediate parent directory as project name, transact-platform-server-e2e will be picked as the name automatically and we don't need to specify it everywhere. Also we don't need to specify it using the COMPOSE_PROJECT_NAME env variable.
There was a problem hiding this comment.
List of changes to be done in this approach.
On env/shared.sh:
- Replace
export SERVER_PATH="$E2E_ROOT/deps/transact-platform-server"withexport SERVER_PATH="$E2E_ROOT/deps/transact-platform-server-e2e" - Replace
export DEV_TOOLS_DIR="wcp-dev-tools"withexport DEV_TOOLS_DIR="wcp-dev-tools-e2e"
There was a problem hiding this comment.
Implemented this great suggestion in 81cfb99
achyuthajoy
requested changes
Feb 6, 2025
tests/e2e/env/setup.sh
Outdated
| @@ -67,27 +84,29 @@ if [[ "$E2E_USE_LOCAL_SERVER" != false ]]; then | |||
| echo "Secrets created" | |||
|
|
|||
| step "Starting SERVER containers" | |||
| redirect_output docker compose -f docker-compose.yml -f docker-compose.e2e.yml up --build --force-recreate -d | |||
| redirect_output docker compose -p transact-platform-server-e2e -f docker-compose.yml -f docker-compose.e2e.yml up --build --force-recreate -d | |||
There was a problem hiding this comment.
List of changes to be done in this approach.
On env/shared.sh:
- Replace
export SERVER_PATH="$E2E_ROOT/deps/transact-platform-server"withexport SERVER_PATH="$E2E_ROOT/deps/transact-platform-server-e2e" - Replace
export DEV_TOOLS_DIR="wcp-dev-tools"withexport DEV_TOOLS_DIR="wcp-dev-tools-e2e"
achyuthajoy
reviewed
Feb 6, 2025
...merchant-admin-transactions.spec.ts/Admin-transactions-page-should-load-without-errors-1.png
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes proposed in this Pull Request
docker composedoesn't override containers and networks.Testing instructions
npm run test:e2e-resetto clean-up E2E tests configuration. Ensure thattests/e2e/depspath doesn't contain checked out repositories.npm run test:e2e-setup. Consult with the documentation about the necessary configuration settings if you haven't done it before.npm run changelogto add a changelog file, choosepatchto leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.Post merge