Merge pull request #3627 from neos/task/stabilizeLocalE2ETests

TASK: stabilize local bare metal e2e tests inside neos dev collection

.circleci/config.yml

@@ -100,7 +100,7 @@ jobs:
           ./flow flow:cache:flush
           ./flow flow:cache:warmup
           ./flow doctrine:migrate
-          ./flow user:create --username=admin --password=password --first-name=John --last-name=Doe --roles=Administrator
+          ./flow user:create --username=admin --password=admin --first-name=John --last-name=Doe --roles=Administrator
       - run:
           name: Start flow server
           command: /home/circleci/app/flow server:run --port 8081

Tests/IntegrationTests/Fixtures/1Dimension/discarding.e2e.js

@@ -18,7 +18,7 @@ test('Discarding: create multiple nodes nested within each other and then discar
     await t
         .click(Selector('#neos-PageTree-AddNode'))
         .click(ReactSelector('InsertModeSelector').find('#into'))
-        .click(ReactSelector('NodeTypeItem'))
+        .click(ReactSelector('NodeTypeItem').find('button>span>span').withText('Page_Test'))
         .typeText(Selector('#neos-NodeCreationDialog-Body input'), pageTitleToCreate)
         .click(Selector('#neos-NodeCreationDialog-CreateNew'));
     await Page.waitForIframeLoading();
@@ -27,7 +27,7 @@ test('Discarding: create multiple nodes nested within each other and then discar
     await t
         .click(Selector('#neos-PageTree-AddNode'))
         .click(ReactSelector('InsertModeSelector').find('#into'))
-        .click(ReactSelector('NodeTypeItem'))
+        .click(ReactSelector('NodeTypeItem').find('button>span>span').withText('Page_Test'))
         .typeText(Selector('#neos-NodeCreationDialog-Body input'), pageTitleToCreate)
         .click(Selector('#neos-NodeCreationDialog-CreateNew'));
     await Page.waitForIframeLoading();
@@ -46,7 +46,7 @@ test('Discarding: create a document node and then discard it', async t => {
     subSection('Create a document node');
     await t
         .click(Selector('#neos-PageTree-AddNode'))
-        .click(ReactSelector('NodeTypeItem'))
+        .click(ReactSelector('NodeTypeItem').find('button>span>span').withText('Page_Test'))
         .typeText(Selector('#neos-NodeCreationDialog-Body input'), pageTitleToCreate)
         .click(Selector('#neos-NodeCreationDialog-CreateNew'))
         .expect(Page.treeNode.withText(pageTitleToCreate).exists).ok('Node with the given title appeared in the tree')
@@ -102,7 +102,7 @@ test('Discarding: create a content node and then discard it', async t => {
         .click(Selector('#neos-ContentTree-ToggleContentTree'))
         .click(Page.treeNode.withText('Content Collection (main)'))
         .click(Selector('#neos-ContentTree-AddNode'))
-        .click(ReactSelector('NodeTypeItem').find('button>span>span').withText('Headline'));
+        .click(ReactSelector('NodeTypeItem').find('button>span>span').withText('Headline_Test'));
     await Page.waitForIframeLoading(t);
     await t
         .switchToIframe('[name="neos-content-main"]')

Tests/IntegrationTests/Fixtures/2Dimension/switchingSites.e2e.js

@@ -13,7 +13,7 @@ test('Switching from Neos.Test.OneDimension to Neos.Test.TwoDimensions and back'
     await t.navigateTo('http://onedimension.localhost:8081/neos');
     await t
         .typeText('#username', 'admin')
-        .typeText('#password', 'password')
+        .typeText('#password', 'admin')
         .click('button.neos-login-btn');
     await waitForReact(30000);
     await Page.goToPage('Home');
@@ -38,7 +38,7 @@ test('Switching from Neos.Test.TwoDimensions to Neos.Test.OneDimension and back'
     await t.navigateTo('http://twodimensions.localhost:8081/neos');
     await t
         .typeText('#username', 'admin')
-        .typeText('#password', 'password')
+        .typeText('#password', 'admin')
         .click('button.neos-login-btn');
     await waitForReact(30000);
     await Page.goToPage('Home');

Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.Test.OneDimension/Configuration/Settings.yaml

@@ -30,3 +30,10 @@ Neos:
         contentDimensions:
           resolver:
             factoryClassName: Neos\Neos\FrontendRouting\DimensionResolution\Resolver\AutoUriPathResolverFactory
+
+    userInterface:
+      navigateComponent:
+        nodeTree:
+          # must be at least 3, so when moving document nodes into each other
+          # they will still be shown and we can assert this
+          loadingDepth: 3

Tests/IntegrationTests/e2e-docker.sh

@@ -53,7 +53,7 @@ dc exec -T php bash <<-'BASH'
     ./flow flow:cache:flush
     ./flow flow:cache:warmup
     ./flow doctrine:migrate
-    ./flow user:create --username=admin --password=password --first-name=John --last-name=Doe --roles=Administrator || true
+    ./flow user:create --username=admin --password=admin --first-name=John --last-name=Doe --roles=Administrator || true
 
     ./flow cr:setup --content-repository onedimension
     ./flow site:create neos-test-onedimension Neos.Test.OneDimension Neos.TestNodeTypes:Document.Page

Tests/IntegrationTests/start-neos-dev-instance.sh

@@ -40,7 +40,7 @@ dc exec -T php bash <<-'BASH'
     ./flow flow:cache:flush
     ./flow flow:cache:warmup
     ./flow doctrine:migrate
-    ./flow user:create --username=admin --password=password --first-name=John --last-name=Doe --roles=Administrator || true
+    ./flow user:create --username=admin --password=admin --first-name=John --last-name=Doe --roles=Administrator || true
 BASH
 
 echo ""

Tests/IntegrationTests/utils.js

@@ -5,7 +5,7 @@ import {PublishDropDown, Page} from './pageModel';
 export const subSection = name => console.log('\x1b[33m%s\x1b[0m', ' - ' + name);
 
 const adminUserName = 'admin';
-const adminPassword = 'password';
+const adminPassword = 'admin';
 
 export const getUrl = ClientFunction(() => window.location.href);