TASK: Adjust E2E tests to run testcafe with content editables

neos · Dec 5, 2024 · 81cc22b · 81cc22b
1 parent d12d30c
commit 81cc22b
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 25 deletions.
diff --git a/Tests/IntegrationTests/Fixtures/1Dimension/discarding.e2e.js b/Tests/IntegrationTests/Fixtures/1Dimension/discarding.e2e.js
@@ -78,7 +78,7 @@ test('Discarding: delete a document node and then discard deletion', async t =>
     await Page.goToPage(pageTitleToDelete);
     await t
         .switchToIframe('[name="neos-content-main"]')
-        .expect(Selector('.test-headline h1').withText(headlineOnDeletedPage).exists).ok('Navigated to the page and see the headline inline')
+        .expect(Selector('.neos-contentcollection').withText(headlineOnDeletedPage).exists).ok('Navigated to the page and see the headline inline')
         .switchToMainWindow();
 
     subSection('Delete that page');

diff --git a/Tests/IntegrationTests/Fixtures/1Dimension/richTextEditor.e2e.js b/Tests/IntegrationTests/Fixtures/1Dimension/richTextEditor.e2e.js
@@ -1,6 +1,6 @@
 import {Selector} from 'testcafe';
 import {ReactSelector} from 'testcafe-react-selectors';
-import {beforeEach, checkPropTypes} from './../../utils.js';
+import {beforeEach, checkPropTypes, typeTextInline} from './../../utils.js';
 import {Page} from './../../pageModel';
 
 /* global fixture:true */
@@ -17,8 +17,8 @@ test('Can crop an image', async t => {
     const ckeContent = await Selector('.ck-content p');
     await t
         .click(rteInspectorEditor.findReact('Button'));
+    await typeTextInline(t, ckeContent, testContent, false);
     await t
-        .typeText(ckeContent, testContent)
         .wait(400)
         .click(Selector('#neos-Inspector-Apply'));
     await Page.waitForIframeLoading(t);

diff --git a/Tests/IntegrationTests/Fixtures/1Dimension/syncing.e2e.js b/Tests/IntegrationTests/Fixtures/1Dimension/syncing.e2e.js
@@ -1,6 +1,12 @@
 import {Selector} from 'testcafe';
 import {ReactSelector, waitForReact} from 'testcafe-react-selectors';
-import {checkPropTypes, adminUserOnOneDimensionTestSite, editorUserOnOneDimensionTestSite} from './../../utils.js';
+import {
+    checkPropTypes,
+    adminUserOnOneDimensionTestSite,
+    editorUserOnOneDimensionTestSite,
+    typeTextInline,
+    subSection
+} from './../../utils.js';
 import {
     Page,
     PublishDropDown
@@ -11,8 +17,6 @@ import {
 fixture`Syncing`
     .afterEach(() => checkPropTypes());
 
-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 => {
     await prepareContentElementConflictBetweenAdminAndEditor(t);
     await chooseDiscardAllAsResolutionStrategy(t);
@@ -137,29 +141,34 @@ async function prepareContentElementConflictBetweenAdminAndEditor(t) {
             .ok('[🗋 Sync Demo #3] cannot be found in the document tree of user "editor".');
     });
 
-
     //
     // Login as "admin" again
     //
     await as(t, adminUserOnOneDimensionTestSite, async () => {
         //
         // Create a headline node in [🗋 Sync Demo #3]
         //
+        subSection('Create a headline node in the document');
         await Page.goToPage('Sync Demo #3');
         await t
-            .switchToIframe(contentIframeSelector)
-            .click(Selector('.neos-contentcollection'))
-            .click(Selector('#neos-InlineToolbar-AddNode'))
-            .switchToMainWindow()
+            .switchToMainWindow();
+
+        await openContentTree(t);
+
+        await t
+            .click(Page.treeNode.withText('Content Collection (main)'))
+            .click(Selector('#neos-ContentTree-AddNode'))
             .click(Selector('button#into'))
-            .click(ReactSelector('NodeTypeItem').withProps({nodeType: {label: 'Headline_Test'}}))
-            .switchToIframe(contentIframeSelector)
-            .typeText(Selector('.test-headline h1'), 'Hello from Page "Sync Demo #3"!')
-            .wait(2000)
+            .click(ReactSelector('NodeTypeItem').withProps({nodeType: {label: 'Headline_Test'}}));
+        await Page.waitForIframeLoading(t);
+
+        subSection('Type something inside of it');
+        await typeTextInline(t, Selector('.test-headline [contenteditable="true"]').nth(-1), 'Hello from Page "Sync Demo #3"!');
+        await t
+            .expect(Selector('.neos-contentcollection').withText('Hello from Page "Sync Demo #3"!').exists).ok('Typed headline text exists')
             .switchToMainWindow();
     });
 
-
     //
     // Login as "editor" again
     //
@@ -175,7 +184,6 @@ async function prepareContentElementConflictBetweenAdminAndEditor(t) {
         await PublishDropDown.publishAll();
     });
 
-
     //
     // Login as "admin" again and visit [🗋 Sync Demo #3]
     //
@@ -198,16 +206,24 @@ async function prepareDocumentConflictBetweenAdminAndEditor(t) {
         await createDocumentNode(t, 'Home', 'into', 'This page will be deleted during sync');
         await PublishDropDown.publishAll();
 
+        subSection('Create a headline node in the document');
+        await Page.waitForIframeLoading(t);
+
+        await t
+            .switchToMainWindow();
+
+        await openContentTree(t);
+
         await t
-            .switchToIframe(contentIframeSelector)
-            .click(Selector('.neos-contentcollection'))
-            .click(Selector('#neos-InlineToolbar-AddNode'))
-            .switchToMainWindow()
+            .click(Page.treeNode.withText('Content Collection (main)'))
+            .click(Selector('#neos-ContentTree-AddNode'))
             .click(Selector('button#into'))
-            .click(ReactSelector('NodeTypeItem').withProps({nodeType: {label: 'Headline_Test'}}))
-            .switchToIframe(contentIframeSelector)
-            .doubleClick(Selector('.test-headline h1'))
-            .typeText(Selector('.test-headline h1'), 'This change will not be published.')
+            .click(ReactSelector('NodeTypeItem').withProps({nodeType: {label: 'Headline_Test'}}));
+        await Page.waitForIframeLoading(t);
+
+        subSection('Type something inside of it');
+        await typeTextInline(t, Selector('.test-headline').nth(-1), 'This change will not be published.');
+        await t
             .wait(2000)
             .switchToMainWindow();
     });
@@ -380,3 +396,12 @@ async function assertThatWeCannotSeePageInTree(t, pageTitle) {
     await t.expect(Page.treeNode.withExactText(pageTitle).exists)
         .notOk(`[🗋 ${pageTitle}] can still be found in the document tree of user "admin".`);
 }
+
+async function openContentTree(t) {
+    const contentTree = ReactSelector('ToggleContentTree');
+    const isPanelOpen = await contentTree.getReact(({props}) => props.isPanelOpen);
+
+    if (!isPanelOpen) {
+        await t.click(Selector('#neos-ContentTree-ToggleContentTree'));
+    }
+}