@jahia/cypress 1.0.4 → 1.0.5

package/dist/page-object/baseComponent.d.ts

@@ -1,18 +1,9 @@
 /// <reference types="cypress" />
 import Chainable = Cypress.Chainable;
-export declare function getElement(selector: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Chainable<JQuery>;
-export declare function get<Component extends BaseComponent>(C: {
+export declare type ComponentType<Component> = {
     new (p: Chainable<JQuery>, assertion?: (s: JQuery) => void): Component;
     defaultSelector: string;
-}, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component;
-export declare function getByRole<Component extends BaseComponent>(C: {
-    new (p: Chainable<JQuery>, assertion?: (s: JQuery) => void): Component;
-    defaultSelector: string;
-}, role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component;
-export declare function getByContent<Component extends BaseComponent>(c: {
-    new (p: Chainable<JQuery>, assertion?: (s: JQuery) => void): Component;
-    defaultSelector: string;
-}, content: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component;
+};
 export declare class BaseComponent {
     static count: number;
     element: Chainable<JQuery>;

package/dist/page-object/baseComponent.js

@@ -1,30 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.BaseComponent = exports.getByContent = exports.getByRole = exports.get = exports.getElement = void 0;
-function getElement(selector, parent, assertion) {
-    var chainable = parent ? parent.get().find(selector) : cy.get(selector);
-    if (assertion) {
-        return chainable.should(assertion);
-    }
-    return chainable;
-}
-exports.getElement = getElement;
-function get(C, parent, assertion) {
-    return new C(getElement(C.defaultSelector, parent, assertion), assertion);
-}
-exports.get = get;
-function getByRole(C, role, parent, assertion) {
-    return new C(getElement(C.defaultSelector + "[data-sel-role=\"" + role + "\"]", parent, assertion), assertion);
-}
-exports.getByRole = getByRole;
-function getByContent(c, content, parent, assertion) {
-    var chainable = getElement(c.defaultSelector, parent).should('contains', content).contains(content);
-    if (assertion) {
-        chainable = chainable.should(assertion);
-    }
-    return new c(chainable, assertion);
-}
-exports.getByContent = getByContent;
+exports.BaseComponent = void 0;
 var BaseComponent = /** @class */ (function () {
     function BaseComponent(element, assertion) {
         this.id = BaseComponent.count++;

package/dist/page-object/html/iframe.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="cypress" />
+import { BaseComponent } from "../baseComponent";
+import Chainable = Cypress.Chainable;
+export declare class IFrame extends BaseComponent {
+    static defaultSelector: string;
+    private body;
+    constructor(element: Chainable<JQuery>, assertion?: (s: JQuery) => void);
+    getBody(): Chainable<JQuery>;
+    enter(): void;
+}

package/dist/page-object/html/iframe.js

@@ -0,0 +1,46 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+exports.IFrame = void 0;
+var baseComponent_1 = require("../baseComponent");
+var IFrame = /** @class */ (function (_super) {
+    __extends(IFrame, _super);
+    function IFrame(element, assertion) {
+        var _this = _super.call(this, element, assertion) || this;
+        _this.get()
+            .should(function (f) {
+            var fr = f[0];
+            expect(fr.contentWindow.location.href).not.equals('about:blank');
+            expect(fr.contentWindow.document.readyState).equals('complete');
+            expect(fr.contentDocument.body).not.be.empty;
+        })
+            .its('0.contentDocument.body').as('framebody' + _this.id);
+        return _this;
+    }
+    IFrame.prototype.getBody = function () {
+        return cy.get('@framebody' + this.id);
+    };
+    IFrame.prototype.enter = function () {
+        this.get().then(function (f) {
+            var fr = f[0];
+            cy.visit(fr.contentWindow.location.href);
+        });
+    };
+    IFrame.defaultSelector = 'iframe';
+    return IFrame;
+}(baseComponent_1.BaseComponent));
+exports.IFrame = IFrame;

package/dist/page-object/html/index.d.ts

@@ -0,0 +1 @@
+export * from './iframe';

package/dist/page-object/html/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+exports.__esModule = true;
+__exportStar(require("./iframe"), exports);

package/dist/page-object/iframe.d.ts

@@ -3,7 +3,6 @@ import { BaseComponent } from "./baseComponent";
 import Chainable = Cypress.Chainable;
 export declare class IFrame extends BaseComponent {
     static defaultSelector: string;
-    static get(parent?: BaseComponent): IFrame;
     private body;
     constructor(element: Chainable<JQuery>, assertion?: (s: JQuery) => void);
     getBody(): Chainable<JQuery>;

package/dist/page-object/iframe.js

@@ -31,9 +31,6 @@ var IFrame = /** @class */ (function (_super) {
             .its('0.contentDocument.body').as('framebody' + _this.id);
         return _this;
     }
-    IFrame.get = function (parent) {
-        return baseComponent_1.get(IFrame, parent);
-    };
     IFrame.prototype.getBody = function () {
         return cy.get('@framebody' + this.id);
     };

package/dist/page-object/index.d.ts

@@ -1,4 +1,6 @@
 export * from './baseComponent';
 export * from './basePage';
-export * from './iframe';
+export * from './html';
+export * from './material';
 export * from './moonstone';
+export * from './utils';

package/dist/page-object/index.js

@@ -12,5 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 exports.__esModule = true;
 __exportStar(require("./baseComponent"), exports);
 __exportStar(require("./basePage"), exports);
-__exportStar(require("./iframe"), exports);
+__exportStar(require("./html"), exports);
+__exportStar(require("./material"), exports);
 __exportStar(require("./moonstone"), exports);
+__exportStar(require("./utils"), exports);

package/dist/page-object/material/index.d.ts

@@ -0,0 +1,2 @@
+export * from './muiinput';
+export * from './muiradio';

package/dist/page-object/material/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+exports.__esModule = true;
+__exportStar(require("./muiinput"), exports);
+__exportStar(require("./muiradio"), exports);

package/dist/page-object/material/muiinput.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="cypress" />
+import { BaseComponent } from "../baseComponent";
+import TypeOptions = Cypress.TypeOptions;
+export declare class MUIInput extends BaseComponent {
+    static defaultSelector: string;
+    clear(): MUIInput;
+    type(text: string, options?: Partial<TypeOptions>): MUIInput;
+}

package/dist/page-object/material/muiinput.js

@@ -0,0 +1,36 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+exports.MUIInput = void 0;
+var baseComponent_1 = require("../baseComponent");
+var MUIInput = /** @class */ (function (_super) {
+    __extends(MUIInput, _super);
+    function MUIInput() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    MUIInput.prototype.clear = function () {
+        this.get().clear();
+        return this;
+    };
+    MUIInput.prototype.type = function (text, options) {
+        this.get().type(text, options);
+        return this;
+    };
+    MUIInput.defaultSelector = 'div';
+    return MUIInput;
+}(baseComponent_1.BaseComponent));
+exports.MUIInput = MUIInput;

package/dist/page-object/material/muiradio.d.ts

@@ -0,0 +1,5 @@
+import { BaseComponent } from "../baseComponent";
+export declare class MUIRadio extends BaseComponent {
+    static defaultSelector: string;
+    click(): MUIRadio;
+}

package/dist/page-object/material/muiradio.js

@@ -0,0 +1,32 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+exports.MUIRadio = void 0;
+var baseComponent_1 = require("../baseComponent");
+var MUIRadio = /** @class */ (function (_super) {
+    __extends(MUIRadio, _super);
+    function MUIRadio() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    MUIRadio.prototype.click = function () {
+        this.get().click();
+        return this;
+    };
+    MUIRadio.defaultSelector = 'label';
+    return MUIRadio;
+}(baseComponent_1.BaseComponent));
+exports.MUIRadio = MUIRadio;

package/dist/page-object/moonstone/accordion.d.ts

@@ -3,7 +3,6 @@ import { BaseComponent } from "../baseComponent";
 import Chainable = Cypress.Chainable;
 export declare class Accordion extends BaseComponent {
     static defaultSelector: string;
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): Accordion;
     click(itemName: string): Accordion;
     listItems(): Chainable<string[]>;
     getContent(): Chainable<JQuery>;

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

@@ -22,9 +22,6 @@ var Accordion = /** @class */ (function (_super) {
     function Accordion() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    Accordion.get = function (parent, assertion) {
-        return baseComponent_1.get(Accordion, parent, assertion);
-    };
     Accordion.prototype.click = function (itemName) {
         this.get().find("section.moonstone-accordionItem header[aria-controls=\"" + itemName + "\"]").click();
         return this;

package/dist/page-object/moonstone/button.d.ts

@@ -1,8 +1,5 @@
-/// <reference types="cypress" />
 import { BaseComponent } from "../baseComponent";
 export declare class Button extends BaseComponent {
     static defaultSelector: string;
-    static getByContent(content: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Button;
-    static getByRole(role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Button;
     click(): Button;
 }

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

@@ -22,12 +22,6 @@ var Button = /** @class */ (function (_super) {
     function Button() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    Button.getByContent = function (content, parent, assertion) {
-        return baseComponent_1.getByContent(Button, content, parent, assertion);
-    };
-    Button.getByRole = function (role, parent, assertion) {
-        return baseComponent_1.getByRole(Button, role, parent, assertion);
-    };
     Button.prototype.click = function () {
         this.get().click();
         return this;

package/dist/page-object/moonstone/dropdown.d.ts

@@ -1,7 +1,5 @@
-/// <reference types="cypress" />
 import { BaseComponent } from "../baseComponent";
 export declare class Dropdown extends BaseComponent {
     static defaultSelector: string;
-    static getByRole(role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Dropdown;
     select(item: string): Dropdown;
 }

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

@@ -18,17 +18,15 @@ exports.__esModule = true;
 exports.Dropdown = void 0;
 var baseComponent_1 = require("../baseComponent");
 var menu_1 = require("./menu");
+var utils_1 = require("../utils");
 var Dropdown = /** @class */ (function (_super) {
     __extends(Dropdown, _super);
     function Dropdown() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    Dropdown.getByRole = function (role, parent, assertion) {
-        return baseComponent_1.getByRole(Dropdown, role, parent, assertion);
-    };
     Dropdown.prototype.select = function (item) {
         this.get().click();
-        menu_1.Menu.get(this).select(item);
+        utils_1.getComponent(menu_1.Menu).select(item);
         return this;
     };
     Dropdown.defaultSelector = '.moonstone-dropdown_container';

package/dist/page-object/moonstone/index.d.ts

@@ -2,8 +2,6 @@ export * from './accordion';
 export * from './button';
 export * from './dropdown';
 export * from './menu';
-export * from './muiinput';
-export * from './muiradio';
 export * from './pagination';
 export * from './primaryNav';
 export * from './secondaryNav';

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

@@ -14,9 +14,6 @@ __exportStar(require("./accordion"), exports);
 __exportStar(require("./button"), exports);
 __exportStar(require("./dropdown"), exports);
 __exportStar(require("./menu"), exports);
-// export * from './muidialog'
-__exportStar(require("./muiinput"), exports);
-__exportStar(require("./muiradio"), exports);
 __exportStar(require("./pagination"), exports);
 __exportStar(require("./primaryNav"), exports);
 __exportStar(require("./secondaryNav"), exports);

package/dist/page-object/moonstone/menu.d.ts

@@ -1,8 +1,6 @@
-/// <reference types="cypress" />
 import { BaseComponent } from "../baseComponent";
 export declare class Menu extends BaseComponent {
     static defaultSelector: string;
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): Menu;
     select(item: string): Menu;
     selectByRole(item: string): Menu;
 }

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

@@ -22,9 +22,6 @@ var Menu = /** @class */ (function (_super) {
     function Menu() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    Menu.get = function (parent, assertion) {
-        return baseComponent_1.get(Menu, parent, assertion);
-    };
     Menu.prototype.select = function (item) {
         this.get().find(".moonstone-menuItem").should("contain", item).contains(item).trigger('click');
         return this;

package/dist/page-object/moonstone/muiinput.d.ts

@@ -3,7 +3,6 @@ import { BaseComponent } from "../baseComponent";
 import TypeOptions = Cypress.TypeOptions;
 export declare class MUIInput extends BaseComponent {
     static defaultSelector: string;
-    static getByRole(role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): MUIInput;
     clear(): MUIInput;
     type(text: string, options?: Partial<TypeOptions>): MUIInput;
 }

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

@@ -22,9 +22,6 @@ var MUIInput = /** @class */ (function (_super) {
     function MUIInput() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    MUIInput.getByRole = function (role, parent, assertion) {
-        return baseComponent_1.getByRole(MUIInput, role, parent, assertion);
-    };
     MUIInput.prototype.clear = function () {
         this.get().clear();
         return this;
@@ -33,7 +30,7 @@ var MUIInput = /** @class */ (function (_super) {
         this.get().type(text, options);
         return this;
     };
-    MUIInput.defaultSelector = 'input';
+    MUIInput.defaultSelector = 'div';
     return MUIInput;
 }(baseComponent_1.BaseComponent));
 exports.MUIInput = MUIInput;

package/dist/page-object/moonstone/muiradio.d.ts

@@ -1,7 +1,5 @@
-/// <reference types="cypress" />
 import { BaseComponent } from "../baseComponent";
 export declare class MUIRadio extends BaseComponent {
     static defaultSelector: string;
-    static getByRole(role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): MUIRadio;
     click(): MUIRadio;
 }

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

@@ -22,9 +22,6 @@ var MUIRadio = /** @class */ (function (_super) {
     function MUIRadio() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    MUIRadio.getByRole = function (role, parent, assertion) {
-        return baseComponent_1.getByRole(MUIRadio, role, parent, assertion);
-    };
     MUIRadio.prototype.click = function () {
         this.get().click();
         return this;

package/dist/page-object/moonstone/pagination.d.ts

@@ -1,9 +1,7 @@
-/// <reference types="cypress" />
 import { BaseComponent } from "../baseComponent";
 import Chainable = Cypress.Chainable;
 export declare class Pagination extends BaseComponent {
     static defaultSelector: string;
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): Pagination;
     clickNextPage(): Pagination;
     clickPreviousPage(): Pagination;
     getTotalRows(): Chainable<number>;

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

@@ -18,20 +18,18 @@ exports.__esModule = true;
 exports.Pagination = void 0;
 var baseComponent_1 = require("../baseComponent");
 var button_1 = require("./button");
+var utils_1 = require("../utils");
 var Pagination = /** @class */ (function (_super) {
     __extends(Pagination, _super);
     function Pagination() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    Pagination.get = function (parent, assertion) {
-        return baseComponent_1.get(Pagination, parent, assertion);
-    };
     Pagination.prototype.clickNextPage = function () {
-        button_1.Button.getByRole('table-pagination-button-next-page', this).click();
+        utils_1.getComponentByRole(button_1.Button, 'table-pagination-button-next-page', this).click();
         return this;
     };
     Pagination.prototype.clickPreviousPage = function () {
-        button_1.Button.getByRole('table-pagination-button-previous-page', this).click();
+        utils_1.getComponentByRole(button_1.Button, 'table-pagination-button-previous-page', this).click();
         return this;
     };
     Pagination.prototype.getTotalRows = function () {

package/dist/page-object/moonstone/primaryNav.d.ts

@@ -1,9 +1,7 @@
-/// <reference types="cypress" />
 import { BaseComponent } from "../baseComponent";
 import Chainable = Cypress.Chainable;
 export declare class PrimaryNav extends BaseComponent {
     static defaultSelector: string;
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): PrimaryNav;
     click(itemName: string): void;
     listItems(): Chainable<string[]>;
 }

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

@@ -22,9 +22,6 @@ var PrimaryNav = /** @class */ (function (_super) {
     function PrimaryNav() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    PrimaryNav.get = function (parent, assertion) {
-        return baseComponent_1.get(PrimaryNav, parent, assertion);
-    };
     PrimaryNav.prototype.click = function (itemName) {
         this.get().find(".moonstone-primaryNavItem[role=\"" + itemName + "\"]").click();
     };

package/dist/page-object/moonstone/secondaryNav.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="cypress" />
 import { BaseComponent } from "../baseComponent";
 export declare class SecondaryNav extends BaseComponent {
     static defaultSelector: string;
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): SecondaryNav;
 }

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

@@ -22,9 +22,6 @@ var SecondaryNav = /** @class */ (function (_super) {
     function SecondaryNav() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    SecondaryNav.get = function (parent, assertion) {
-        return baseComponent_1.get(SecondaryNav, parent, assertion);
-    };
     SecondaryNav.defaultSelector = '.moonstone-secondaryNav_wrapper';
     return SecondaryNav;
 }(baseComponent_1.BaseComponent));

package/dist/page-object/moonstone/table.d.ts

@@ -3,15 +3,11 @@ import { BaseComponent } from "../baseComponent";
 import { Menu } from "./menu";
 export declare class Table extends BaseComponent {
     static defaultSelector: string;
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): Table;
     getRows(assertion?: (s: JQuery) => void): TableRow;
     getRowByIndex(i: number, assertion?: (s: JQuery) => void): TableRow;
     getRowByContent(content: string, assertion?: (s: JQuery) => void): TableRow;
 }
 export declare class TableRow extends BaseComponent {
     static defaultSelector: string;
-    static get(parent: Table, assertion?: (s: JQuery) => void): TableRow;
-    static getByIndex(parent: Table, i: number, assertion?: (s: JQuery) => void): TableRow;
-    static getByContent(parent: Table, content: string, assertion?: (s: JQuery) => void): TableRow;
     contextMenu(): Menu;
 }

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

@@ -18,22 +18,20 @@ exports.__esModule = true;
 exports.TableRow = exports.Table = void 0;
 var baseComponent_1 = require("../baseComponent");
 var menu_1 = require("./menu");
+var utils_1 = require("../utils");
 var Table = /** @class */ (function (_super) {
     __extends(Table, _super);
     function Table() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    Table.get = function (parent, assertion) {
-        return baseComponent_1.get(Table, parent, assertion);
-    };
     Table.prototype.getRows = function (assertion) {
-        return TableRow.get(this, assertion);
+        return utils_1.getComponent(TableRow, this, assertion);
     };
     Table.prototype.getRowByIndex = function (i, assertion) {
-        return TableRow.getByIndex(this, i, assertion);
+        return utils_1.getComponentByIndex(TableRow, i, this, assertion);
     };
     Table.prototype.getRowByContent = function (content, assertion) {
-        return TableRow.getByContent(this, content, assertion);
+        return utils_1.getComponentByContent(TableRow, content, this, assertion);
     };
     Table.defaultSelector = '.moonstone-Table';
     return Table;
@@ -44,18 +42,9 @@ var TableRow = /** @class */ (function (_super) {
     function TableRow() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    TableRow.get = function (parent, assertion) {
-        return baseComponent_1.get(TableRow, parent, assertion);
-    };
-    TableRow.getByIndex = function (parent, i, assertion) {
-        return new TableRow(baseComponent_1.getElement(this.defaultSelector + ":nth-child(" + i + ")", parent, assertion));
-    };
-    TableRow.getByContent = function (parent, content, assertion) {
-        return baseComponent_1.getByContent(TableRow, content, parent, assertion);
-    };
     TableRow.prototype.contextMenu = function () {
         this.get().rightclick();
-        return new menu_1.Menu(baseComponent_1.getElement('#menuHolder .moonstone-menu:not(.moonstone-hidden)'));
+        return utils_1.getComponentBySelector(menu_1.Menu, '#menuHolder .moonstone-menu:not(.moonstone-hidden)');
     };
     TableRow.defaultSelector = '.moonstone-TableBody .moonstone-TableRow';
     return TableRow;

package/dist/page-object/utils.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="cypress" />
+import { Table } from "./moonstone";
+import { BaseComponent, ComponentType } from "./baseComponent";
+import Chainable = Cypress.Chainable;
+export declare function getElement(selector: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Chainable<JQuery>;
+export declare function getComponentBySelector<Component>(C: ComponentType<Component>, selector: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component;
+export declare function getComponent<Component>(C: ComponentType<Component>, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component;
+export declare function getComponentByIndex<Component>(C: ComponentType<Component>, i: number, parent: Table, assertion?: (s: JQuery) => void): Component;
+export declare function getComponentByRole<Component>(C: ComponentType<Component>, role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component;
+export declare function getComponentByAttr<Component>(C: ComponentType<Component>, attr: string, value: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component;
+export declare function getComponentByContent<Component>(c: ComponentType<Component>, content: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component;

package/dist/page-object/utils.js

@@ -0,0 +1,39 @@
+"use strict";
+exports.__esModule = true;
+exports.getComponentByContent = exports.getComponentByAttr = exports.getComponentByRole = exports.getComponentByIndex = exports.getComponent = exports.getComponentBySelector = exports.getElement = void 0;
+function getElement(selector, parent, assertion) {
+    var chainable = parent ? parent.get().find(selector) : cy.get(selector);
+    if (assertion) {
+        return chainable.should(assertion);
+    }
+    return chainable;
+}
+exports.getElement = getElement;
+function getComponentBySelector(C, selector, parent, assertion) {
+    return new C(getElement(selector, parent, assertion), assertion);
+}
+exports.getComponentBySelector = getComponentBySelector;
+function getComponent(C, parent, assertion) {
+    return getComponentBySelector(C, C.defaultSelector, parent, assertion);
+}
+exports.getComponent = getComponent;
+function getComponentByIndex(C, i, parent, assertion) {
+    return getComponentBySelector(C, C.defaultSelector + ":nth-child(" + i + ")", parent, assertion);
+}
+exports.getComponentByIndex = getComponentByIndex;
+function getComponentByRole(C, role, parent, assertion) {
+    return getComponentBySelector(C, C.defaultSelector + "[data-sel-role=\"" + role + "\"]", parent, assertion);
+}
+exports.getComponentByRole = getComponentByRole;
+function getComponentByAttr(C, attr, value, parent, assertion) {
+    return getComponentBySelector(C, C.defaultSelector + "[" + attr + "=\"" + value + "\"]", parent, assertion);
+}
+exports.getComponentByAttr = getComponentByAttr;
+function getComponentByContent(c, content, parent, assertion) {
+    var chainable = getElement(c.defaultSelector, parent).should('contains', content).contains(content);
+    if (assertion) {
+        chainable = chainable.should(assertion);
+    }
+    return new c(chainable, assertion);
+}
+exports.getComponentByContent = getComponentByContent;

package/package.json

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

package/src/page-object/baseComponent.ts

@@ -1,28 +1,6 @@
 import Chainable = Cypress.Chainable;
 
-export function getElement(selector: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Chainable<JQuery> {
-    const chainable = parent ? parent.get().find(selector) : cy.get(selector);
-    if (assertion) {
-        return chainable.should(assertion)
-    }
-    return chainable;
-}
-
-export function get<Component extends BaseComponent>(C: { new(p: Chainable<JQuery>, assertion?: (s: JQuery) => void): Component, defaultSelector: string }, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component {
-    return new C(getElement(C.defaultSelector, parent, assertion), assertion)
-}
-
-export function getByRole<Component extends BaseComponent>(C: { new(p: Chainable<JQuery>, assertion?: (s: JQuery) => void): Component, defaultSelector: string }, role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component {
-    return new C(getElement(`${C.defaultSelector}[data-sel-role="${role}"]`, parent, assertion), assertion)
-}
-
-export function getByContent<Component extends BaseComponent>(c: { new(p: Chainable<JQuery>, assertion?: (s: JQuery) => void): Component, defaultSelector: string }, content: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component {
-    let chainable = getElement(c.defaultSelector, parent).should('contains', content).contains(content);
-    if (assertion) {
-        chainable = chainable.should(assertion)
-    }
-    return new c(chainable, assertion)
-}
+export type ComponentType<Component> = { new(p: Chainable<JQuery>, assertion?: (s: JQuery) => void): Component, defaultSelector: string };
 
 export class BaseComponent {
     static count = 0

package/src/page-object/{iframe.ts → html/iframe.ts}

@@ -1,13 +1,9 @@
-import {BaseComponent, get} from "./baseComponent"
+import {BaseComponent} from "../baseComponent"
 import Chainable = Cypress.Chainable;
 
 export class IFrame extends BaseComponent {
     static defaultSelector = 'iframe'
 
-    static get(parent?: BaseComponent): IFrame {
-        return get(IFrame, parent)
-    }
-
     private body: JQuery<HTMLElement>
 
     constructor(element: Chainable<JQuery>, assertion?: (s: JQuery) => void) {

package/src/page-object/html/index.ts

@@ -0,0 +1 @@
+export * from './iframe'

package/src/page-object/index.ts

@@ -1,4 +1,6 @@
 export * from './baseComponent'
 export * from './basePage'
-export * from './iframe'
+export * from './html'
+export * from './material'
 export * from './moonstone'
+export * from './utils'

package/src/page-object/material/index.ts

@@ -0,0 +1,2 @@
+export * from './muiinput'
+export * from './muiradio'

package/src/page-object/{moonstone → material}/muiinput.ts

@@ -1,12 +1,8 @@
-import {BaseComponent, getByRole} from "../baseComponent"
+import {BaseComponent} from "../baseComponent"
 import TypeOptions = Cypress.TypeOptions;
 
 export class MUIInput extends BaseComponent {
-    static defaultSelector = 'input'
-
-    static getByRole(role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): MUIInput {
-        return getByRole(MUIInput, role, parent, assertion)
-    }
+    static defaultSelector = 'div'
 
     clear(): MUIInput {
         this.get().clear()

package/src/page-object/material/muiradio.ts

@@ -0,0 +1,13 @@
+import {BaseComponent} from "../baseComponent"
+
+
+export class MUIRadio extends BaseComponent {
+    static defaultSelector = 'label'
+
+    click(): MUIRadio {
+        this.get().click()
+        return this
+    }
+
+}
+

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

@@ -1,13 +1,9 @@
-import {BaseComponent, get} from "../baseComponent"
+import {BaseComponent} from "../baseComponent"
 import Chainable = Cypress.Chainable;
 
 export class Accordion extends BaseComponent {
     static defaultSelector = '.moonstone-accordion'
 
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): Accordion {
-        return get(Accordion, parent, assertion)
-    }
-
     click(itemName: string): Accordion {
         this.get().find(`section.moonstone-accordionItem header[aria-controls="${itemName}"]`).click()
         return this

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

@@ -1,17 +1,9 @@
-import {BaseComponent, getByContent, getByRole} from "../baseComponent"
+import {BaseComponent} from "../baseComponent"
 
 
 export class Button extends BaseComponent {
     static defaultSelector = '.moonstone-button'
 
-    static getByContent(content: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Button {
-        return getByContent(Button, content, parent, assertion)
-    }
-
-    static getByRole(role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Button {
-        return getByRole(Button, role, parent, assertion)
-    }
-
     click(): Button {
         this.get().click()
         return this

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

@@ -1,17 +1,14 @@
-import {BaseComponent, getByRole} from "../baseComponent"
+import {BaseComponent} from "../baseComponent"
 import {Menu} from "./menu";
+import {getComponent} from "../utils";
 
 
 export class Dropdown extends BaseComponent {
     static defaultSelector = '.moonstone-dropdown_container'
 
-    static getByRole(role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Dropdown {
-        return getByRole(Dropdown, role, parent, assertion)
-    }
-
     select(item: string): Dropdown {
         this.get().click()
-        Menu.get(this).select(item)
+        getComponent(Menu).select(item)
         return this
     }
 

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

@@ -2,9 +2,6 @@ export * from './accordion'
 export * from './button'
 export * from './dropdown'
 export * from './menu'
-// export * from './muidialog'
-export * from './muiinput'
-export * from './muiradio'
 export * from './pagination'
 export * from './primaryNav'
 export * from './secondaryNav'

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

@@ -1,13 +1,8 @@
-import {BaseComponent, get} from "../baseComponent"
-
+import {BaseComponent} from "../baseComponent"
 
 export class Menu extends BaseComponent {
     static defaultSelector = '.moonstone-menu'
 
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): Menu {
-        return get(Menu, parent, assertion)
-    }
-
     select(item: string): Menu {
         this.get().find(`.moonstone-menuItem`).should("contain", item).contains(item).trigger('click')
         return this

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

@@ -1,22 +1,18 @@
-import {BaseComponent, get} from "../baseComponent"
+import {BaseComponent} from "../baseComponent"
 import {Button} from "./button";
 import Chainable = Cypress.Chainable;
-
+import {getComponentByRole} from "../utils";
 
 export class Pagination extends BaseComponent {
     static defaultSelector = '.moonstone-tablePagination'
 
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): Pagination {
-        return get(Pagination, parent, assertion)
-    }
-
     clickNextPage(): Pagination {
-        Button.getByRole('table-pagination-button-next-page', this).click()
+        getComponentByRole(Button, 'table-pagination-button-next-page', this).click()
         return this
     }
 
     clickPreviousPage(): Pagination {
-        Button.getByRole('table-pagination-button-previous-page', this).click()
+        getComponentByRole(Button, 'table-pagination-button-previous-page', this).click()
         return this
     }
 

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

@@ -1,13 +1,9 @@
-import {BaseComponent, get} from "../baseComponent"
+import {BaseComponent} from "../baseComponent"
 import Chainable = Cypress.Chainable;
 
 export class PrimaryNav extends BaseComponent {
     static defaultSelector = '.moonstone-primaryNav'
 
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): PrimaryNav {
-        return get(PrimaryNav, parent, assertion)
-    }
-
     click(itemName: string): void {
         this.get().find(`.moonstone-primaryNavItem[role="${itemName}"]`).click()
     }

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

@@ -1,9 +1,5 @@
-import {BaseComponent, get} from "../baseComponent"
+import {BaseComponent} from "../baseComponent"
 
 export class SecondaryNav extends BaseComponent{
     static defaultSelector = '.moonstone-secondaryNav_wrapper'
-
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): SecondaryNav {
-        return get(SecondaryNav, parent, assertion)
-    }
 }

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

@@ -1,44 +1,29 @@
-import {BaseComponent, get, getByContent, getElement} from "../baseComponent"
+import {BaseComponent} from "../baseComponent"
 import {Menu} from "./menu"
+import {getComponent, getComponentByContent, getComponentByIndex, getComponentBySelector} from "../utils";
 
 export class Table extends BaseComponent {
     static defaultSelector = '.moonstone-Table'
 
-    static get(parent?: BaseComponent, assertion?: (s: JQuery) => void): Table {
-        return get(Table, parent, assertion)
-    }
-
     getRows(assertion?: (s: JQuery) => void): TableRow {
-        return TableRow.get(this, assertion)
+        return getComponent(TableRow, this, assertion)
     }
 
     getRowByIndex(i: number, assertion?: (s: JQuery) => void): TableRow {
-        return TableRow.getByIndex(this, i, assertion)
+        return getComponentByIndex(TableRow, i, this, assertion)
     }
 
     getRowByContent(content: string, assertion?: (s: JQuery) => void): TableRow {
-        return TableRow.getByContent(this, content, assertion)
+        return getComponentByContent(TableRow, content, this, assertion)
     }
 }
 
 export class TableRow extends BaseComponent {
     static defaultSelector = '.moonstone-TableBody .moonstone-TableRow'
 
-    static get(parent: Table, assertion?: (s: JQuery) => void): TableRow {
-        return get(TableRow, parent, assertion)
-    }
-
-    static getByIndex(parent: Table, i: number, assertion?: (s: JQuery) => void): TableRow {
-        return new TableRow(getElement(`${this.defaultSelector}:nth-child(${i})`, parent, assertion))
-    }
-
-    static getByContent(parent: Table, content: string, assertion?: (s: JQuery) => void): TableRow {
-        return getByContent(TableRow, content, parent, assertion)
-    }
-
     contextMenu(): Menu {
         this.get().rightclick()
-        return new Menu(getElement('#menuHolder .moonstone-menu:not(.moonstone-hidden)'))
+        return getComponentBySelector(Menu, '#menuHolder .moonstone-menu:not(.moonstone-hidden)')
     }
 
 }

package/src/page-object/utils.ts

@@ -0,0 +1,39 @@
+import {Table} from "./moonstone";
+import {BaseComponent, ComponentType} from "./baseComponent";
+import Chainable = Cypress.Chainable;
+
+export function getElement(selector: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Chainable<JQuery> {
+    const chainable = parent ? parent.get().find(selector) : cy.get(selector);
+    if (assertion) {
+        return chainable.should(assertion)
+    }
+    return chainable;
+}
+
+export function getComponentBySelector<Component>(C: ComponentType<Component>, selector: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component {
+    return new C(getElement(selector, parent, assertion), assertion)
+}
+
+export function getComponent<Component>(C: ComponentType<Component>, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component {
+    return getComponentBySelector(C, C.defaultSelector, parent, assertion)
+}
+
+export function getComponentByIndex<Component>(C: ComponentType<Component>, i: number, parent: Table, assertion?: (s: JQuery) => void): Component {
+    return getComponentBySelector(C, `${C.defaultSelector}:nth-child(${i})`, parent, assertion)
+}
+
+export function getComponentByRole<Component >(C: ComponentType<Component>, role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component {
+    return getComponentBySelector(C, `${C.defaultSelector}[data-sel-role="${role}"]`, parent, assertion)
+}
+
+export function getComponentByAttr<Component>(C: ComponentType<Component>, attr: string, value: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component {
+    return getComponentBySelector(C, `${C.defaultSelector}[${attr}="${value}"]`, parent, assertion)
+}
+
+export function getComponentByContent<Component>(c: ComponentType<Component>, content: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): Component {
+    let chainable = getElement(c.defaultSelector, parent).should('contains', content).contains(content);
+    if (assertion) {
+        chainable = chainable.should(assertion)
+    }
+    return new c(chainable, assertion)
+}

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

@@ -1,17 +0,0 @@
-import {BaseComponent, getByRole} from "../baseComponent"
-
-
-export class MUIRadio extends BaseComponent {
-    static defaultSelector = 'label'
-
-    static getByRole(role: string, parent?: BaseComponent, assertion?: (s: JQuery) => void): MUIRadio {
-        return getByRole(MUIRadio, role, parent, assertion)
-    }
-
-    click(): MUIRadio {
-        this.get().click()
-        return this
-    }
-
-}
-