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

TASK: further fix e2e test cases for Neos 9 #3872

Merged
merged 1 commit into from
Oct 29, 2024
Merged

TASK: further fix e2e test cases for Neos 9 #3872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions Tests/IntegrationTests/docker-compose.neos-dev-instance.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ services:
# Enable GD
PHP_EXTENSION_GD: 1
COMPOSER_CACHE_DIR: /home/circleci/.composer/cache
DB_HOST: db

db:
image: mariadb:10.11
environment:
MYSQL_DATABASE: neos
MYSQL_ROOT_PASSWORD: not_a_real_password
ports:
- 13309:3306
command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
volumes:
composer_cache:
2 changes: 1 addition & 1 deletion Tests/IntegrationTests/pageModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class PublishDropDown {

static publishDropdownDiscardAll = ReactSelector('PublishDropDown ContextDropDownContents').find('button').withText('Discard all');

static publishDropdownPublishAll = ReactSelector('PublishDropDown ShallowDropDownContents').find('button').withText('Publish all');
static publishDropdownPublishAll = ReactSelector('PublishDropDown ContextDropDownContents').find('button').withText('Publish all');
Copy link
Member

Choose a reason for hiding this comment

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

i dont get that one but whatever :D


static async discardAll() {
const $discardAllBtn = Selector(this.publishDropdownDiscardAll);
Expand Down
9 changes: 7 additions & 2 deletions Tests/IntegrationTests/start-neos-dev-instance.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ dc exec -T php bash <<-'BASH'
./flow flow:cache:warmup
./flow doctrine:migrate
./flow user:create --username=admin --password=admin --first-name=John --last-name=Doe --roles=Administrator || true
./flow user:create --username=editor --password=editor --first-name=Some --last-name=FooBarEditor --roles=Editor || true
BASH

echo ""
Expand Down Expand Up @@ -68,7 +69,11 @@ dc exec -T php bash <<-BASH
if ./flow site:list | grep -q 'Node name'; then
./flow site:prune '*'
fi
./flow site:import --package-key=Neos.TestSite
./flow cr:setup
./flow cr:setup --content-repository onedimension
./flow cr:setup --content-repository twodimensions
./flow cr:import --content-repository onedimension Packages/Sites/Neos.Test.OneDimension/Resources/Private/Content
./flow site:create neos-test-onedimension Neos.Test.OneDimension Neos.TestNodeTypes:Document.HomePage
./flow resource:publish
BASH

Expand All @@ -85,5 +90,5 @@ dc exec -T php bash <<-'BASH'

# enable changes of the Neos.TestNodeTypes outside of the container to appear in the container via sym link to mounted volume
rm -rf /usr/src/app/TestDistribution/Packages/Application/Neos.TestNodeTypes
ln -s /usr/src/neos-ui/Tests/IntegrationTests/SharedNodeTypesPackage/ /usr/src/app/TestDistribution/Packages/Application/Neos.TestNodeTypes
ln -s /usr/src/neos-ui/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.TestNodeTypes /usr/src/app/TestDistribution/Packages/Application/Neos.TestNodeTypes
BASH
2 changes: 1 addition & 1 deletion packages/neos-ui/src/Containers/PrimaryToolbar/DimensionSwitcher/DimensionSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const searchOptions = (searchTerm, processedSelectBoxOptions) =>
}))
export default class DimensionSelector extends PureComponent {
static propTypes = {
icon: PropTypes.string.isRequired,
icon: PropTypes.string,
dimensionLabel: PropTypes.string.isRequired,
presets: PropTypes.object.isRequired,
activePreset: PropTypes.string.isRequired,
Expand Down
Loading