From df16008b1a052e3f2edfbc58cfc68926d89b138c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Gu=CC=88nther?= Date: Fri, 27 Sep 2024 19:13:26 +0200 Subject: [PATCH 1/5] TASK: Remove complecity of renaming existing presets --- .../1Dimension/nodeTreePresets.e2e.js | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/Tests/IntegrationTests/Fixtures/1Dimension/nodeTreePresets.e2e.js b/Tests/IntegrationTests/Fixtures/1Dimension/nodeTreePresets.e2e.js index fc165ed3e6..6983ed3caa 100644 --- a/Tests/IntegrationTests/Fixtures/1Dimension/nodeTreePresets.e2e.js +++ b/Tests/IntegrationTests/Fixtures/1Dimension/nodeTreePresets.e2e.js @@ -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': { - 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' } } } @@ -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".'); @@ -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".'); @@ -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) @@ -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".'); @@ -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".'); @@ -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] @@ -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] From 4b4216c03bc2c35631b6c3327648f84df4890b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Gu=CC=88nther?= Date: Fri, 27 Sep 2024 19:14:39 +0200 Subject: [PATCH 2/5] TASK: Use Chrome on Mac --- .sauce/config1Dimension.yml | 4 ++-- .sauce/config2Dimension.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.sauce/config1Dimension.yml b/.sauce/config1Dimension.yml index f6eeb61ef0..496bd00db9 100644 --- a/.sauce/config1Dimension.yml +++ b/.sauce/config1Dimension.yml @@ -25,8 +25,8 @@ suites: screenResolution: "1280x1024" smartRetry: failedOnly: true - - name: "One dimensional Tests in Firefox on MacOS" - browserName: "firefox" + - name: "One dimensional Tests in Chrome on MacOS" + browserName: "chrome" src: - "Tests/IntegrationTests/Fixtures/1Dimension/*.e2e.js" platformName: "macOS 13" diff --git a/.sauce/config2Dimension.yml b/.sauce/config2Dimension.yml index 30bc6a38c2..66b4f3c41c 100644 --- a/.sauce/config2Dimension.yml +++ b/.sauce/config2Dimension.yml @@ -24,8 +24,8 @@ suites: screenResolution: "1280x1024" smartRetry: failedOnly: true - - name: "Two dimensional Tests in Firefox on MacOS" - browserName: "firefox" + - name: "Two dimensional Tests in Chrome on MacOS" + browserName: "chrome" src: - "Tests/IntegrationTests/Fixtures/2Dimension/*.e2e.js" platformName: "macOS 13" From 8f37ddd115754a7357aa69810459db4f61d162df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Gu=CC=88nther?= Date: Fri, 27 Sep 2024 19:17:54 +0200 Subject: [PATCH 3/5] TASK: Resolve conflicts --- .sauce/config1Dimension.yml | 4 ---- .sauce/config2Dimension.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.sauce/config1Dimension.yml b/.sauce/config1Dimension.yml index 496bd00db9..00d91b076b 100644 --- a/.sauce/config1Dimension.yml +++ b/.sauce/config1Dimension.yml @@ -23,16 +23,12 @@ suites: - "Tests/IntegrationTests/Fixtures/1Dimension/*.e2e.js" platformName: "Windows 10" screenResolution: "1280x1024" - smartRetry: - failedOnly: true - name: "One dimensional Tests in Chrome on MacOS" browserName: "chrome" src: - "Tests/IntegrationTests/Fixtures/1Dimension/*.e2e.js" platformName: "macOS 13" screenResolution: "1440x900" - smartRetry: - failedOnly: true npm: dependencies: - testcafe-react-selectors diff --git a/.sauce/config2Dimension.yml b/.sauce/config2Dimension.yml index 66b4f3c41c..2f1dbf1c70 100644 --- a/.sauce/config2Dimension.yml +++ b/.sauce/config2Dimension.yml @@ -22,16 +22,12 @@ suites: - "Tests/IntegrationTests/Fixtures/2Dimension/*.e2e.js" platformName: "Windows 10" screenResolution: "1280x1024" - smartRetry: - failedOnly: true - name: "Two dimensional Tests in Chrome on MacOS" browserName: "chrome" src: - "Tests/IntegrationTests/Fixtures/2Dimension/*.e2e.js" platformName: "macOS 13" screenResolution: "1440x900" - smartRetry: - failedOnly: true npm: dependencies: - testcafe-react-selectors From 6de3e09fa7b8528fcc351b4c965b1a4717bc4b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Gu=CC=88nther?= Date: Fri, 27 Sep 2024 19:54:13 +0200 Subject: [PATCH 4/5] TASK: Test just Chrome on Windows --- .sauce/config1Dimension.yml | 10 ++-------- .sauce/config2Dimension.yml | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.sauce/config1Dimension.yml b/.sauce/config1Dimension.yml index f6628e94b6..0ebdc0bdd6 100644 --- a/.sauce/config1Dimension.yml +++ b/.sauce/config1Dimension.yml @@ -18,18 +18,12 @@ 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 Chrome on Windows" + browserName: "chrome" src: - "Tests/IntegrationTests/Fixtures/1Dimension/*.e2e.js" platformName: "Windows 10" screenResolution: "1280x1024" - - name: "One dimensional Tests in Chrome on MacOS" - browserName: "chrome" - src: - - "Tests/IntegrationTests/Fixtures/1Dimension/*.e2e.js" - platformName: "macOS 13" - screenResolution: "1440x900" npm: dependencies: - testcafe-react-selectors diff --git a/.sauce/config2Dimension.yml b/.sauce/config2Dimension.yml index 80ebb74ad7..f64cb250ef 100644 --- a/.sauce/config2Dimension.yml +++ b/.sauce/config2Dimension.yml @@ -16,18 +16,12 @@ 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" screenResolution: "1280x1024" - - name: "Two dimensional Tests in Chrome on MacOS" - browserName: "chrome" - src: - - "Tests/IntegrationTests/Fixtures/2Dimension/*.e2e.js" - platformName: "macOS 13" - screenResolution: "1440x900" npm: dependencies: - testcafe-react-selectors From 99190711515990ea412bbd456464c6cef16b710e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Gu=CC=88nther?= Date: Fri, 27 Sep 2024 20:34:56 +0200 Subject: [PATCH 5/5] TASK: Test multiple browsers --- .sauce/config1Dimension.yml | 16 ++++++++++++++-- .sauce/config2Dimension.yml | 8 +++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.sauce/config1Dimension.yml b/.sauce/config1Dimension.yml index 0ebdc0bdd6..d683b4c972 100644 --- a/.sauce/config1Dimension.yml +++ b/.sauce/config1Dimension.yml @@ -18,12 +18,24 @@ 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 Chrome on Windows" - browserName: "chrome" + - 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 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" + src: + - "Tests/IntegrationTests/Fixtures/1Dimension/*.e2e.js" + platformName: "macOS 13" + screenResolution: "1440x900" npm: dependencies: - testcafe-react-selectors diff --git a/.sauce/config2Dimension.yml b/.sauce/config2Dimension.yml index f64cb250ef..427427e23b 100644 --- a/.sauce/config2Dimension.yml +++ b/.sauce/config2Dimension.yml @@ -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 metadata: tags: - e2e @@ -22,6 +22,12 @@ suites: - "Tests/IntegrationTests/Fixtures/2Dimension/*.e2e.js" platformName: "Windows 10" screenResolution: "1280x1024" + - name: "Two dimensional Tests in Chrome on MacOS" + browserName: "chrome" + src: + - "Tests/IntegrationTests/Fixtures/2Dimension/*.e2e.js" + platformName: "macOS 13" + screenResolution: "1440x900" npm: dependencies: - testcafe-react-selectors