@jahia/cypress 3.17.3 → 3.17.5

package/dist/page-object/moonstone/menu.js

@@ -24,21 +24,24 @@ var Menu = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     Menu.prototype.submenu = function (item, menu) {
-        this.get().find('.moonstone-menuItem').contains(item).should('be.visible').realHover();
+        this.get().find('.moonstone-menuItem').contains(item).scrollIntoView().should('be.visible');
+        this.get().find('.moonstone-menuItem').contains(item).realHover();
         return utils_1.getComponentByRole(Menu, menu);
     };
     Menu.prototype.shouldHaveItem = function (item) {
-        this.get().find('.moonstone-menuItem').contains(item).should('be.visible');
+        this.get().find('.moonstone-menuItem').contains(item).scrollIntoView().should('be.visible');
     };
     Menu.prototype.shouldNotHaveItem = function (item) {
         this.get().find('.moonstone-menuItem').contains(item).should('not.exist');
     };
     Menu.prototype.select = function (item) {
-        this.get().find('.moonstone-menuItem').contains(item).should('be.visible').trigger('click');
+        this.get().find('.moonstone-menuItem').contains(item).scrollIntoView().should('be.visible');
+        this.get().find('.moonstone-menuItem').contains(item).trigger('click');
         return this;
     };
     Menu.prototype.selectByRole = function (item) {
-        this.get().find(".moonstone-menuItem[data-sel-role=\"" + item + "\"]").should('be.visible').trigger('click');
+        this.get().find(".moonstone-menuItem[data-sel-role=\"" + item + "\"]").scrollIntoView().should('be.visible');
+        this.get().find(".moonstone-menuItem[data-sel-role=\"" + item + "\"]").trigger('click');
         return this;
     };
     Menu.defaultSelector = '.moonstone-menu:not(.moonstone-hidden)';

package/dist/support/fixture.js

@@ -25,7 +25,7 @@ var fixture = function (originalCommand, fixtureParam) {
                 encoding = args[0];
             }
             try {
-                cy.readFile('./node_modules/@jahia/cypress/fixtures/' + fixtureParam, encoding, { log: false, timeout: 1000 });
+                cy.readFile('./node_modules/@jahia/cypress/fixtures/' + fixtureParam, encoding, { log: false, timeout: 2000 });
             }
             catch (e) {
                 console.log(e);

package/dist/utils/JahiaPlatformHelper.d.ts

@@ -0,0 +1 @@
+export declare const getJahiaVersion: () => Cypress.Chainable;

package/dist/utils/JahiaPlatformHelper.js

@@ -0,0 +1,13 @@
+"use strict";
+exports.__esModule = true;
+exports.getJahiaVersion = void 0;
+var getJahiaVersion = function () {
+    return cy.apollo({
+        fetchPolicy: 'no-cache',
+        queryFile: 'graphql/jcr/query/getJahiaVersion.graphql'
+    }).then(function (result) {
+        var _a;
+        return (_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.admin.jahia.version;
+    });
+};
+exports.getJahiaVersion = getJahiaVersion;

package/dist/utils/index.d.ts

@@ -4,3 +4,4 @@ export * from './SiteHelper';
 export * from './UsersHelper';
 export * from './VanityUrlHelper';
 export * from './ClusterHelper';
+export * from './JahiaPlatformHelper';

package/dist/utils/index.js

@@ -16,3 +16,4 @@ __exportStar(require("./SiteHelper"), exports);
 __exportStar(require("./UsersHelper"), exports);
 __exportStar(require("./VanityUrlHelper"), exports);
 __exportStar(require("./ClusterHelper"), exports);
+__exportStar(require("./JahiaPlatformHelper"), exports);

package/fixtures/graphql/jcr/query/getJahiaVersion.graphql

@@ -0,0 +1,12 @@
+query {
+    admin {
+        jahia {
+            version {
+              release
+              build
+              buildDate
+              isSnapshot
+            }
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "3.17.3",
+  "version": "3.17.5",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts"

package/src/page-object/moonstone/menu.ts

@@ -5,12 +5,13 @@ export class Menu extends BaseComponent {
     static defaultSelector = '.moonstone-menu:not(.moonstone-hidden)'
 
     submenu(item: string, menu: string): Menu {
-        this.get().find('.moonstone-menuItem').contains(item).should('be.visible').realHover();
+        this.get().find('.moonstone-menuItem').contains(item).scrollIntoView().should('be.visible');
+        this.get().find('.moonstone-menuItem').contains(item).realHover();
         return getComponentByRole(Menu, menu);
     }
 
     shouldHaveItem(item: string):void {
-        this.get().find('.moonstone-menuItem').contains(item).should('be.visible');
+        this.get().find('.moonstone-menuItem').contains(item).scrollIntoView().should('be.visible');
     }
 
     shouldNotHaveItem(item: string):void {
@@ -18,12 +19,14 @@ export class Menu extends BaseComponent {
     }
 
     select(item: string): Menu {
-        this.get().find('.moonstone-menuItem').contains(item).should('be.visible').trigger('click');
+        this.get().find('.moonstone-menuItem').contains(item).scrollIntoView().should('be.visible');
+        this.get().find('.moonstone-menuItem').contains(item).trigger('click');
         return this;
     }
 
     selectByRole(item: string): Menu {
-        this.get().find(`.moonstone-menuItem[data-sel-role="${item}"]`).should('be.visible').trigger('click');
+        this.get().find(`.moonstone-menuItem[data-sel-role="${item}"]`).scrollIntoView().should('be.visible');
+        this.get().find(`.moonstone-menuItem[data-sel-role="${item}"]`).trigger('click');
         return this;
     }
 }

package/src/support/fixture.ts

@@ -16,7 +16,7 @@ export const fixture = function (originalCommand: ((...args: any[]) => any), fix
             }
 
             try {
-                cy.readFile('./node_modules/@jahia/cypress/fixtures/' + fixtureParam, encoding, {log: false, timeout: 1000});
+                cy.readFile('./node_modules/@jahia/cypress/fixtures/' + fixtureParam, encoding, {log: false, timeout: 2000});
             } catch (e) {
                 console.log(e);
             }

package/src/utils/JahiaPlatformHelper.ts

@@ -0,0 +1,8 @@
+export const getJahiaVersion = (): Cypress.Chainable => {
+    return cy.apollo({
+        fetchPolicy: 'no-cache',
+        queryFile: 'graphql/jcr/query/getJahiaVersion.graphql'
+    }).then(result => {
+        return result?.data?.admin.jahia.version;
+    });
+};

package/src/utils/index.ts

@@ -4,3 +4,4 @@ export * from './SiteHelper';
 export * from './UsersHelper';
 export * from './VanityUrlHelper';
 export * from './ClusterHelper';
+export * from './JahiaPlatformHelper';