Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[end2end] cors and projet filename test converted from cypress to playwright #4009

Merged
merged 2 commits into from
Dec 11, 2023

Conversation

nworr
Copy link
Contributor

@nworr nworr commented Dec 10, 2023

Tests converted using https://ray.run/tools/cypress-to-playwright and improved a bit

Funded by 3Liz

@github-actions github-actions bot added this to the 3.8.0 milestone Dec 10, 2023
@nworr nworr added the run end2end If the PR must run end2end tests or not label Dec 10, 2023
@github-actions github-actions bot added the tests unit tests and docker configuration for tests label Dec 10, 2023
@nworr nworr requested review from nboisteault and Gustry December 11, 2023 09:11
@nworr nworr marked this pull request as ready for review December 11, 2023 09:12
@nworr
Copy link
Contributor Author

nworr commented Dec 11, 2023

i created a dedicated en2end config to ignore cors test that can only be performed locally

Copy link
Member

@Gustry Gustry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, as I don't review JS too much :)
But for the tests side, thanks.

@nworr
Copy link
Contributor Author

nworr commented Dec 11, 2023

LGTM, as I don't review JS too much :) But for the tests side, thanks.

i set you as reviewer for the worflow side :)

Copy link
Member

@nboisteault nboisteault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @nworr !

@Gustry
Copy link
Member

Gustry commented Dec 11, 2023

i set you as reviewer for the worflow side :)

Thanks, no worries, it's what I did !

@nworr nworr merged commit 4089de0 into 3liz:master Dec 11, 2023
11 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_6 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 33df158c3... cors and projet filename converted from cypress to playwright
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
CONFLICT (modify/delete): tests/end2end/cypress/integration/projects_filename_dot_space-ghaction.js deleted in 33df158c3 (cors and projet filename converted from cypress to playwright) and modified in HEAD.  Version HEAD of tests/end2end/cypress/integration/projects_filename_dot_space-ghaction.js left in tree.

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_6 release_3_6
# Navigate to the new working tree
cd .worktrees/backport-release_3_6
# Create a new branch
git switch --create backport-4009-to-release_3_6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 33df158c3376c14cce91cc6975e8248bc45d01a1,c4ef100540d0f52d9ee2edee2ca220bef4488611
# Push it to GitHub
git push --set-upstream origin backport-4009-to-release_3_6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_6

Then, create a pull request where the base branch is release_3_6 and the compare/head branch is backport-4009-to-release_3_6.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_7 failed backport run end2end If the PR must run end2end tests or not tests unit tests and docker configuration for tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants