Merge remote-tracking branch 'origin/9.0' into feature/4726-extract-w…

…orkspace-metadata-and-user-assignment-to-neos
neos · Oct 9, 2024 · a899f13 · a899f13
2 parents 3b752f6 + 0ee6844
commit a899f13
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 86 deletions.
diff --git a/.sauce/config.yml b/.sauce/config.yml
@@ -24,13 +24,13 @@ suites:
       - "Tests/IntegrationTests/Fixtures/*/*.e2e.js"
     platformName: "Windows 10"
     screenResolution: "1280x1024"
-  - name: "Tests in Firefox on MacOS"
-    # todo use chrome here and fix ci https://github.com/neos/neos-ui/issues/3591
-    browserName: "firefox"
-    src:
-      - "Tests/IntegrationTests/Fixtures/*/*.e2e.js"
-    platformName: "macOS 13"
-    screenResolution: "1440x900"
+  # todo use chrome here and fix ci https://github.com/neos/neos-ui/issues/3591 (but even firefox fails in ci)
+  # - name: "Tests in Firefox on MacOS"
+  #   browserName: "firefox"
+  #   src:
+  #     - "Tests/IntegrationTests/Fixtures/*/*.e2e.js"
+  #   platformName: "macOS 13"
+  #   screenResolution: "1440x900"
 npm:
   dependencies:
     - testcafe-react-selectors

diff --git a/Tests/IntegrationTests/Fixtures/1Dimension/syncing.e2e.js b/Tests/IntegrationTests/Fixtures/1Dimension/syncing.e2e.js
@@ -11,6 +11,8 @@ import {
 fixture`Syncing`
     .afterEach(() => checkPropTypes());
 
+fixture.skip`TODO Tests are flaky and create catchup errors rendering following tests also kaput: https://github.com/neos/neos-ui/pull/3769#pullrequestreview-2332466270`;
+
 const contentIframeSelector = Selector('[name="neos-content-main"]', {timeout: 2000});
 
 test('Syncing: Create a conflict state between two editors and choose "Discard all" as a resolution strategy during rebase', async t => {

diff --git a/Tests/IntegrationTests/Fixtures/2Dimension/switchingSites.e2e.js b/Tests/IntegrationTests/Fixtures/2Dimension/switchingSites.e2e.js
@@ -20,15 +20,15 @@ test('Switching from Neos.Test.OneDimension to Neos.Test.TwoDimensions and back'
 
     subSection('Switch to Neos.Test.TwoDimensions via main menu');
     await t.click(Selector('#neos-MenuToggler'));
-    await t.click(Selector('[href*="twodimensions"]'));
+    await t.click(Selector('[href*="twodimensions"] button'));
 
     await t.expect(getUrl()).contains('twodimensions.localhost', 'Switch to Neos.Test.TwoDimensions was successful');
 
     subSection('Switch back to Neos.Test.OneDimension via main menu');
     await waitForReact(30000);
     await Page.goToPage('Home');
     await t.click(Selector('#neos-MenuToggler'));
-    await t.click(Selector('[href*="onedimension"]'));
+    await t.click(Selector('[href*="onedimension"] button'));
 
     await t.expect(getUrl()).contains('onedimension.localhost', 'Switch to Neos.Test.OneDimension was successful');
 });
@@ -45,15 +45,15 @@ test('Switching from Neos.Test.TwoDimensions to Neos.Test.OneDimension and back'
 
     subSection('Switch to Neos.Test.OneDimension via main menu');
     await t.click(Selector('#neos-MenuToggler'));
-    await t.click(Selector('[href*="onedimension"]'));
+    await t.click(Selector('[href*="onedimension"] button'));
 
     await t.expect(getUrl()).contains('onedimension.localhost', 'Switch to Neos.Test.OneDimension was successful');
 
     subSection('Switch back to Neos.Test.TwoDimensions via main menu');
     await waitForReact(30000);
     await Page.goToPage('Home');
     await t.click(Selector('#neos-MenuToggler'));
-    await t.click(Selector('[href*="twodimensions"]'));
+    await t.click(Selector('[href*="twodimensions"] button'));
 
     await t.expect(getUrl()).contains('twodimensions.localhost', 'Switch to Neos.Test.TwoDimensions was successful');
 });
diff --git a/packages/neos-ui-ckeditor5-bindings/src/plugins/neosPlaceholder.js b/packages/neos-ui-ckeditor5-bindings/src/plugins/neosPlaceholder.js