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.

Sign up for GitHub

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

TASK: Run acceptance tests also on chrome #3862

Closed
wants to merge 6 commits into from
Closed

TASK: Run acceptance tests also on chrome #3862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df16008
TASK: Remove complecity of renaming existing presets
markusguenther Sep 27, 2024
4b4216c
TASK: Use Chrome on Mac
markusguenther Sep 27, 2024
8f37ddd
TASK: Resolve conflicts
markusguenther Sep 27, 2024
45b8f57
Merge branch '8.3' into backport-e2e-tests
markusguenther Sep 27, 2024
6de3e09
TASK: Test just Chrome on Windows
markusguenther Sep 27, 2024
9919071
TASK: Test multiple browsers
markusguenther Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .sauce/config1Dimension.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,20 @@ testcafe:
# Controls what files are available in the context of a test run (unless explicitly excluded by .sauceignore).
rootDir: ./
suites:
- name: "One dimensional Tests in Firefox on Windows"
browserName: "firefox"
- name: "One dimensional Tests in Edge on Windows"
browserName: "microsoftedge"
src:
- "Tests/IntegrationTests/Fixtures/1Dimension/*.e2e.js"
platformName: "Windows 10"
screenResolution: "1280x1024"
- name: "One dimensional Tests in Firefox on MacOS"
# todo use chrome here and fix ci https://github.com/neos/neos-ui/issues/3591
- name: "One dimensional Tests on Firefox on Windows"
browserName: "firefox"
src:
- "Tests/IntegrationTests/Fixtures/1Dimension/*.e2e.js"
platformName: "Windows 10"
screenResolution: "1280x1024"
- name: "One dimensional Tests in Edge on MacOS"
browserName: "microsoftedge"
Copy link
Member

Choose a reason for hiding this comment

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

why not chrome? ^^

Copy link
Member Author

Choose a reason for hiding this comment

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

It was just a try, in safari we also have issues in the tests ;)

src:
- "Tests/IntegrationTests/Fixtures/1Dimension/*.e2e.js"
platformName: "macOS 13"
Expand Down
6 changes: 3 additions & 3 deletions .sauce/config2Dimension.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: testcafe
sauce:
region: us-west-1
concurrency: 1 # Controls how many suites are executed at the same time.
retries: 0
retries: 3
Copy link
Member

Choose a reason for hiding this comment

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

retries / smart retries dont work as far as i tried.

Copy link
Member Author

Choose a reason for hiding this comment

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

While testing the PR for 8.4 I had the case that one run failed and the retry succeeded. But did not enforce it after that.

metadata:
tags:
- e2e
Expand All @@ -16,8 +16,8 @@ testcafe:
# Controls what files are available in the context of a test run (unless explicitly excluded by .sauceignore).
rootDir: ./
suites:
- name: "Two dimensional Tests in Firefox on Windows"
browserName: "firefox"
- name: "Two dimensional Tests in Chrome on Windows"
browserName: "chrome"
src:
- "Tests/IntegrationTests/Fixtures/2Dimension/*.e2e.js"
platformName: "Windows 10"
Expand Down
28 changes: 7 additions & 21 deletions Tests/IntegrationTests/Fixtures/1Dimension/nodeTreePresets.e2e.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,6 @@ const SETTINGS_WITH_NODE_TREE_PRESETS = {
presets: {
'default': {
baseNodeType: 'Neos.Neos:Document,!Neos.TestNodeTypes:Document.Blog,!Neos.TestNodeTypes:Document.BlogArticle'
},
'blog': {
Copy link
Member

Choose a reason for hiding this comment

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

i think we should try to keep it and make it work on chrome. I dont know why it doesnt work in ci. Locally it works splendidly. We have to debug the http request

Copy link
Member Author

Choose a reason for hiding this comment

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

I had the issue also locally, and therefore I changed this and also did not see why we need to change it. But I was not involved in the change back then.

ui: {
icon: 'newspaper-o',
label: 'Show Blog only'
},
baseNodeType: 'Neos.TestNodeTypes:Document.Blog'
},
'blog-articles': {
ui: {
icon: 'file-text-o',
label: 'Show Blog Articles only'
},
baseNodeType: 'Neos.TestNodeTypes:Document.BlogArticle'
}
}
}
Expand Down Expand Up @@ -88,7 +74,7 @@ test('Node tree preset "default" removes all blog related nodes and only loads n
test('Node tree preset "blog" shows nothing but page [🗋 Blog]', async (t) => {
await t.click('#btn-ToggleDocumentTreeFilter');
await t.click('#neos-NodeTreeFilter');
await t.click(Selector('[role="button"]').withText('Show Blog only'));
await t.click(Selector('[role="button"]').withText('Blog'));

await t.expect(Page.treeNode.withExactText('Blog').exists)
.ok('[🗋 Blog] did not show up after switching to node tree preset "blog".');
Expand All @@ -97,7 +83,7 @@ test('Node tree preset "blog" shows nothing but page [🗋 Blog]', async (t) =>
test('In node tree preset "blog", page [🗋 Blog] has no toggle handle', async (t) => {
await t.click('#btn-ToggleDocumentTreeFilter');
await t.click('#neos-NodeTreeFilter');
await t.click(Selector('[role="button"]').withText('Show Blog only'));
await t.click(Selector('[role="button"]').withText('Blog'));

await t.expect(Page.getToggleChildrenButtonOf('Blog').exists)
.notOk('[🗋 Blog] has a toggle handle, even though its children do not match the currently set filter in node tree preset "blog".');
Expand All @@ -106,7 +92,7 @@ test('In node tree preset "blog", page [🗋 Blog] has no toggle handle', async
test('Reloading the node tree while in preset "blog" results in nothing but page [🗋 Blog]', async (t) => {
await t.click('#btn-ToggleDocumentTreeFilter');
await t.click('#neos-NodeTreeFilter');
await t.click(Selector('[role="button"]').withText('Show Blog only'));
await t.click(Selector('[role="button"]').withText('Blog'));
await t.click('#neos-PageTree-RefreshPageTree');

await t.expect(Page.treeNode.withExactText('Blog').exists)
Expand All @@ -116,7 +102,7 @@ test('Reloading the node tree while in preset "blog" results in nothing but page
test('Node tree preset "blog-articles" shows page [🗋 Blog] and all articles beneath it', async (t) => {
await t.click('#btn-ToggleDocumentTreeFilter');
await t.click('#neos-NodeTreeFilter');
await t.click(Selector('[role="button"]').withText('Show Blog Articles only'));
await t.click(Selector('[role="button"]').withText('Blog Article'));

await t.expect(Page.treeNode.withExactText('Blog').exists)
.ok('[🗋 Blog] did not show up after switching to node tree preset "blog-articles".');
Expand All @@ -141,7 +127,7 @@ test('BUG #3816: Switching back from node tree preset "blog" does not affect loa

await t.click('#btn-ToggleDocumentTreeFilter');
await t.click('#neos-NodeTreeFilter');
await t.click(Selector('[role="button"]').withText('Show Blog only'));
await t.click(Selector('[role="button"]').withText('Blog'));
await t.expect(Page.treeNode.withExactText('Blog').exists)
.ok('[🗋 Blog] did not show up after switching to node tree preset "blog".');

Expand Down Expand Up @@ -192,7 +178,7 @@ test('BUG #2583: Searching the document tree does not break expansion in node tr
test('BUG #2800 1/2: Moving pages before/after in a filtered view does not lead to the disappearance of nodes', async (t) => {
await t.click('#btn-ToggleDocumentTreeFilter');
await t.click('#neos-NodeTreeFilter');
await t.click(Selector('[role="button"]').withText('Show Blog Articles only'));
await t.click(Selector('[role="button"]').withText('Blog Article'));

//
// Move Blog Article [🗋 Hello World!] before [🗋 Writing Blog Articles considered harmful]
Expand Down Expand Up @@ -232,7 +218,7 @@ test('BUG #2800 1/2: Moving pages before/after in a filtered view does not lead
test('BUG #2800 2/2: Moving pages into each other in a filtered view does not break expansion', async (t) => {
await t.click('#btn-ToggleDocumentTreeFilter');
await t.click('#neos-NodeTreeFilter');
await t.click(Selector('[role="button"]').withText('Show Blog Articles only'));
await t.click(Selector('[role="button"]').withText('Blog Article'));

//
// Move Blog Article [🗋 Hello World!] into [🗋 Writing Blog Articles considered harmful]
Expand Down
Loading