Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/8.2' into 8.3
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
#	packages/babel-preset-neos-ui/package.json
#	packages/build-essentials/package.json
#	packages/debug-reason-for-rendering/package.json
#	packages/jest-preset-neos-ui/package.json
#	packages/neos-ts-interfaces/package.json
#	packages/neos-ui-backend-connector/package.json
#	packages/neos-ui-ckeditor5-bindings/package.json
#	packages/neos-ui-constants/package.json
#	packages/neos-ui-containers/package.json
#	packages/neos-ui-contentrepository/package.json
#	packages/neos-ui-decorators/package.json
#	packages/neos-ui-editors/package.json
#	packages/neos-ui-extensibility/package.json
#	packages/neos-ui-guest-frame/package.json
#	packages/neos-ui-i18n/package.json
#	packages/neos-ui-inspector/package.json
#	packages/neos-ui-redux-store/package.json
#	packages/neos-ui-sagas/package.json
#	packages/neos-ui-validators/package.json
#	packages/neos-ui-views/package.json
#	packages/neos-ui/package.json
#	packages/positional-array-sorter/package.json
#	packages/react-proptypes/package.json
#	packages/react-ui-components/package.json
#	packages/utils-helpers/package.json
#	packages/utils-logger/package.json
#	packages/utils-redux/package.json
  • Loading branch information
markusguenther committed Jan 15, 2024
2 parents 56732e2 + bca536e commit 2204bb1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Tests/IntegrationTests/Fixtures/1Dimension/inspector.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ test('Can edit the page title via inspector', async t => {
await t
.click(InspectorTitleProperty)
.typeText(InspectorTitleProperty, '-2')
.click(Selector('[name="neos-content-main"]'))
.click(Selector('#neos-Inspector'), {offsetX: -400}) // hack to click into the iframe even with overlaying changes div in dom
.expect(Selector('#neos-UnappliedChangesDialog').exists)
.ok()
.click(Selector('#neos-UnappliedChangesDialog-resume'))
Expand All @@ -55,19 +55,19 @@ test('Can edit the page title via inspector', async t => {

subSection('Test unapplied changes dialog - discard');
await t
.click(Selector('[name="neos-content-main"]'))
.click(Selector('#neos-Inspector'), {offsetX: -400}) // hack to click into the iframe even with overlaying changes div in dom
.click(Selector('#neos-UnappliedChangesDialog-discard'))
.expect(InspectorTitleProperty.value)
.eql('Home-1');

subSection('Test unapplied changes dialog - apply');
await t
.typeText(InspectorTitleProperty, '-3')
.click(Selector('[name="neos-content-main"]'))
.click(Selector('#neos-Inspector'), {offsetX: -400}) // hack to click into the iframe even with overlaying changes div in dom
.click(Selector('#neos-UnappliedChangesDialog-apply'))
.expect(InspectorTitleProperty.value)
.eql('Home-1-3')
.click(Selector('[name="neos-content-main"]'))
.click(Selector('#neos-Inspector'), {offsetX: -400}) // hack to click into the iframe even with overlaying changes div in dom
.expect(Selector('#neos-UnappliedChangesDialog').exists)
.notOk();
});
Expand Down

0 comments on commit 2204bb1

Please sign in to comment.