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

Tests - Extends base class for testing admin pages and landing page #5225

Merged
merged 1 commit into from
Jan 17, 2025

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Jan 16, 2025

Follow up from #5204

Add some base classes to test the admin side, or the landing page. I have checked a little bit with Cypress tests as well, for later.

I will stop here about Playrwight Object Model, it was to start to use this, for better maintenance.

I'm just not sure why we need a "new" object, in the test itself.

@Gustry Gustry added tests unit tests and docker configuration for tests run end2end If the PR must run end2end tests or not backport release_3_7 backport release_3_8 backport release_3_9 labels Jan 16, 2025
@github-actions github-actions bot added this to the 3.10.0 milestone Jan 16, 2025
Copy link
Contributor

@nworr nworr left a comment

Choose a reason for hiding this comment

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

POM is great !!

thanks

@Gustry Gustry merged commit 157c66a into 3liz:master Jan 17, 2025
16 checks passed
@Gustry Gustry deleted the admin-pom branch January 17, 2025 10:15
@3liz-bot
Copy link
Contributor

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0d53fd301... Tests - Extends base class for testing admin pages and landing page
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
CONFLICT (modify/delete): tests/end2end/playwright/landing_page_config.spec.js deleted in HEAD and modified in 0d53fd301 (Tests - Extends base class for testing admin pages and landing page).  Version 0d53fd301 (Tests - Extends base class for testing admin pages and landing page) of tests/end2end/playwright/landing_page_config.spec.js left in tree.
Auto-merging tests/end2end/playwright/maps-management.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/maps-management.spec.js
Auto-merging tests/end2end/playwright/server-information.spec.js

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_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-5225-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0d53fd301b3e1962b98d54d6f3f9f2ef0b5cf1d0
# Push it to GitHub
git push --set-upstream origin backport-5225-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

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

@3liz-bot
Copy link
Contributor

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0d53fd301... Tests - Extends base class for testing admin pages and landing page
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging tests/end2end/playwright/maps-management.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/maps-management.spec.js

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_8 release_3_8
# Navigate to the new working tree
cd .worktrees/backport-release_3_8
# Create a new branch
git switch --create backport-5225-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0d53fd301b3e1962b98d54d6f3f9f2ef0b5cf1d0
# Push it to GitHub
git push --set-upstream origin backport-5225-to-release_3_8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_8

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

@3liz-bot
Copy link
Contributor

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0d53fd301... Tests - Extends base class for testing admin pages and landing page
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging tests/end2end/playwright/maps-management.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/maps-management.spec.js

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_9 release_3_9
# Navigate to the new working tree
cd .worktrees/backport-release_3_9
# Create a new branch
git switch --create backport-5225-to-release_3_9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0d53fd301b3e1962b98d54d6f3f9f2ef0b5cf1d0
# Push it to GitHub
git push --set-upstream origin backport-5225-to-release_3_9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_9

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_7 backport release_3_8 backport release_3_9 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