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.

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: stabilize local bare metal e2e tests inside neos dev collection #3627

Merged
merged 5 commits into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Tests/IntegrationTests/Fixtures/1Dimension/discarding.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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')
Expand Down Expand Up @@ -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"]')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 0 additions & 22 deletions Tests/IntegrationTests/TestDistribution/setup.sh

This file was deleted.

2 changes: 1 addition & 1 deletion Tests/IntegrationTests/e2e-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Tests/IntegrationTests/start-neos-dev-instance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down
6 changes: 1 addition & 5 deletions Tests/IntegrationTests/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -39,10 +39,6 @@ export async function checkPropTypes() {
if (error[0] && error[0].search('Warning: Unsafe legacy lifecycles') >= 0) {
delete error[0];
}
// Quick fix to be able to use node 16 with testcafe @see https://github.com/DevExpress/testcafe/issues/7097
if (error[0] && error[0].search('hammerhead.js') >= 0) {
delete error[0];
}
if (error[0]) {
console.log('These console errors were the cause of the failed test:', error);
}
Expand Down
Loading