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.

Sign up for GitHub

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

Jump to bottom

BUGFIX: Make e2e tests run via docker again #3275

Merged
merged 2 commits into from
Nov 28, 2022
Merged

BUGFIX: Make e2e tests run via docker again #3275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
502ade9
BUGFIX: Make e2e tests with docker run again
Sebobo Nov 26, 2022
9249271
TASK: Make selectbox test run more reliably
Sebobo Nov 26, 2022
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
1 change: 1 addition & 0 deletions Tests/IntegrationTests/Fixtures/1Dimension/selectBoxes.e2e.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ test('SelectBox opens below and breaks out of the creation dialog if there\'s en

test('SelectBox opens above in creation dialog if there\'s not enough space below.', async t => {
await t
.resizeWindow(1200, 768)
mhsdesign marked this conversation as resolved.
Show resolved Hide resolved
.click(Selector('#neos-PageTree-AddNode'))
.click(ReactSelector('NodeTypeItem').withText('SelectBox opens above'))
.click(ReactSelector('NodeCreationDialog SelectBox'));
Expand Down
5 changes: 4 additions & 1 deletion Tests/IntegrationTests/TestDistribution/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"description": "Neos test distribution. Change this number if you need to break CircleCI's cache: 14",
"config": {
"vendor-dir": "Packages/Libraries",
"bin-dir": "bin"
"bin-dir": "bin",
"allow-plugins": {
"neos/composer-plugin": true
}
Sebobo marked this conversation as resolved.
Show resolved Hide resolved
},
"minimum-stability": "dev",
"require": {
Expand Down
5 changes: 5 additions & 0 deletions Tests/IntegrationTests/e2e-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ echo "##########################################################################
echo "# Install dependencies... #"
echo "#############################################################################"
dc exec -T php bash <<-'BASH'
cd /usr/src/app
sudo chown -R docker:docker .
Sebobo marked this conversation as resolved.
Show resolved Hide resolved
cd TestDistribution
composer install
BASH
Expand Down Expand Up @@ -77,8 +79,11 @@ for fixture in $(pwd)/Tests/IntegrationTests/Fixtures/*/; do
# TODO: optimize this
cd TestDistribution
composer reinstall neos/test-nodetypes
composer reinstall neos/test-site
./flow flow:package:rescan > /dev/null
./flow flow:cache:flush > /dev/null
Comment on lines +82 to +86
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change is different to 5d9d09c
is there a reason for this?

(and will result in a merge conflict)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure why Markus did the change like he did and he didn't explain in his PR. So I just took the lines that were necessary to get it running again.
@markusguenther do you still remember?

I mean, why cache warmup when you run a command afterwards anyway and why show the config, etc.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had issues in the past with circle ci and then the tests failed on the package change. Just used the changes from the CI pipeline tests.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

im fine with merging as is, but when upmerging it we should ignore this change and keep 8.2 different?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can also adjust it to do the same. Fine for me.

if ./flow site:list | grep -q 'Node name'; then
./flow site:prune '*' > /dev/null
fi
Expand Down