TASK: Fix e2e tests (#2928)

neos · Jul 27, 2021 · b3255f9 · b3255f9
1 parent 050e58b
commit b3255f9
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 24 deletions.
diff --git a/Tests/IntegrationTests/Fixtures/1Dimension/createNewNodes.e2e.js b/Tests/IntegrationTests/Fixtures/1Dimension/createNewNodes.e2e.js
@@ -158,7 +158,7 @@ test('Supports secondary inspector view for element editors', async t => {
     await t.switchToMainWindow();
 
     await t
-        .click(imageEditor.findReact('IconButton').withProps('icon', 'crop'));
+        .click(imageEditor.find('button[title="Crop"]'));
     const initialLeftOffset = await imageEditor.find('img').getStyleProperty('left');
 
     await t

diff --git a/Tests/IntegrationTests/Fixtures/1Dimension/inspector.e2e.js b/Tests/IntegrationTests/Fixtures/1Dimension/inspector.e2e.js
@@ -25,6 +25,7 @@ test("Can edit the page title via inspector", async t => {
         .typeText(InspectorTitleProperty, "-привет!")
         .expect(InspectorTitleProperty.value)
         .eql("Home-привет!")
+        .wait(200)
         .click(Selector("#neos-UriPathSegmentEditor-sync"))
         .expect(InspectorUriPathSegmentProperty.value)
         .eql("home-privet")

diff --git a/packages/neos-ui/src/Containers/App.js b/packages/neos-ui/src/Containers/App.js
@@ -35,7 +35,7 @@ const App = ({globalRegistry, menu}) => {
 };
 App.propTypes = {
     globalRegistry: PropTypes.object.isRequired,
-    menu: PropTypes.object.isRequired
+    menu: PropTypes.oneOfType([PropTypes.object, PropTypes.array]).isRequired
 };
 
 export default App;
diff --git a/packages/neos-ui/src/Containers/Drawer/index.js b/packages/neos-ui/src/Containers/Drawer/index.js
@@ -33,25 +33,28 @@ export default class Drawer extends PureComponent {
 
         containerRegistry: PropTypes.object.isRequired,
 
-        menuData: PropTypes.objectOf(
-            PropTypes.shape({
-                icon: PropTypes.string,
-                label: PropTypes.string.isRequired,
-                uri: PropTypes.string.isRequired,
-                target: PropTypes.string,
-
-                children: PropTypes.arrayOf(
-                    PropTypes.shape({
-                        icon: PropTypes.string,
-                        label: PropTypes.string.isRequired,
-                        uri: PropTypes.string,
-                        target: PropTypes.string,
-                        isActive: PropTypes.bool.isReqired,
-                        skipI18n: PropTypes.bool.isReqired
-                    })
-                )
-            })
-        ).isRequired
+        menuData: PropTypes.oneOfType([
+            PropTypes.objectOf(
+                PropTypes.shape({
+                    icon: PropTypes.string,
+                    label: PropTypes.string.isRequired,
+                    uri: PropTypes.string.isRequired,
+                    target: PropTypes.string,
+
+                    children: PropTypes.arrayOf(
+                        PropTypes.shape({
+                            icon: PropTypes.string,
+                            label: PropTypes.string.isRequired,
+                            uri: PropTypes.string,
+                            target: PropTypes.string,
+                            isActive: PropTypes.bool.isReqired,
+                            skipI18n: PropTypes.bool.isReqired
+                        })
+                    )
+                })
+            ),
+            PropTypes.array
+        ]).isRequired
     };
 
     state = {

diff --git a/packages/neos-ui/src/Containers/Modals/NodeVariantCreationDialog/index.js b/packages/neos-ui/src/Containers/Modals/NodeVariantCreationDialog/index.js
@@ -31,7 +31,7 @@ export default class NodeVariantCreationDialog extends PureComponent {
     static propTypes = {
         isOpen: PropTypes.bool.isRequired,
         numberOfParentNodesToBeCreated: PropTypes.number,
-        contentDimensions: PropTypes.object.isRequired,
+        contentDimensions: PropTypes.oneOfType([PropTypes.object, PropTypes.array]).isRequired,
         activePresets: PropTypes.object.isRequired,
         documentNode: PropTypes.object.isRequired,
 

diff --git a/packages/neos-ui/src/Containers/PrimaryToolbar/DimensionSwitcher/index.js b/packages/neos-ui/src/Containers/PrimaryToolbar/DimensionSwitcher/index.js
@@ -120,7 +120,7 @@ class DimensionSelector extends PureComponent {
 }))
 export default class DimensionSwitcher extends PureComponent {
     static propTypes = {
-        contentDimensions: PropTypes.object.isRequired,
+        contentDimensions: PropTypes.oneOfType([PropTypes.object, PropTypes.array]).isRequired,
         activePresets: PropTypes.object.isRequired,
         allowedPresets: PropTypes.object.isRequired,
         selectPreset: PropTypes.func.isRequired,

diff --git a/packages/neos-ui/src/Containers/Root.js b/packages/neos-ui/src/Containers/Root.js
@@ -36,7 +36,7 @@ Root.propTypes = {
     store: PropTypes.object.isRequired,
     globalRegistry: PropTypes.object.isRequired,
     configuration: PropTypes.object.isRequired,
-    menu: PropTypes.object.isRequired,
+    menu: PropTypes.oneOfType([PropTypes.object, PropTypes.array]).isRequired,
     routes: PropTypes.object.isRequired
 };