Remove vagrant and add testing docker

2020-05-23 20:01:53 +02:00
parent 1e50da36e6
commit c366248434
32 changed files with 3635 additions and 115 deletions
--- a/test/frontend/cypress/commmon/ice-cypress-test.js
+++ b/test/frontend/cypress/commmon/ice-cypress-test.js
@@ -20,9 +20,14 @@ class IceCypressTest {
    cy.server().route('GET', `/${config.URL_PREFIX}/service.php*`).as('getElement');
    cy.get(`#${this.element} table tbody`).find('tr').first()
      .find(viewButtonSelector || `.center div img[${this.titleDataAttributeName}='View']`)
+      .should("be.visible")
      .click();

-    cy.wait('@getElement').its('status').should('be', config.DEFAULT_WAIT_TIME);
+    if (config.WAIT_ON_TIME) {
+      cy.wait(config.WAIT_TIME);
+    } else {
+      cy.wait('@getElement').its('status').should('be', config.DEFAULT_STATUS);
+    }
  }

  viewElementValidate(cy, validation = []) {
@@ -34,9 +39,14 @@ class IceCypressTest {
  editElement(cy, update, editButtonSelector = null) {
    cy.server().route('POST', `/${config.URL_PREFIX}/service.php*`).as('getElement');
    cy.get(`#${this.element} table tbody`).find('tr').first().find(editButtonSelector || `.center div img[${this.titleDataAttributeName}='Edit']`)
+      .should("be.visible")
      .click();

-    cy.wait('@getElement').its('status').should('be', config.DEFAULT_WAIT_TIME);
+    if (config.WAIT_ON_TIME) {
+      cy.wait(config.WAIT_TIME);
+    } else {
+      cy.wait('@getElement').its('status').should('be', config.DEFAULT_STATUS);
+    }

    update.forEach((item) => {
      cy.get(item[0]).clear().type(item[1]).should('have.value', item[1]);
@@ -44,14 +54,15 @@ class IceCypressTest {
  }

  select2Click(id, value) {
-    cy.get(`#s2id_${id}`).click();
+    cy.get(`#s2id_${id}`).should("be.visible").click();
    cy.focused().clear().type(value).should('have.value', value);
    cy.get('.select2-drop:visible').find('.select2-results li').first()
+      .should("be.visible")
      .click();
  }

  clickSave(cy) {
-    cy.get(`#${this.element}Form .saveBtn`).click();
+    cy.get(`#${this.element}Form .saveBtn`).should("be.visible").click();
  }

  editElementValidate(cy, validation = [], editButtonSelector) {
@@ -62,14 +73,23 @@ class IceCypressTest {
    }

    // Wait for data table response
-    cy.wait('@getAfterSave').its('status').should('be', config.DEFAULT_WAIT_TIME);
+    if (config.WAIT_ON_TIME) {
+      cy.wait(config.WAIT_TIME);
+    } else {
+      cy.wait('@getAfterSave').its('status').should('be', config.DEFAULT_STATUS);
+    }

    cy.server().route('POST', `/${config.URL_PREFIX}/service.php*`).as('getElementAfterSave');
    // Click on edit and wait
    cy.get(`#${this.element} table tbody`).find('tr').first().find(editButtonSelector || `.center div img[${this.titleDataAttributeName}='Edit']`)
+      .should("be.visible")
      .click();

-    cy.wait('@getElementAfterSave').its('status').should('be', config.DEFAULT_WAIT_TIME);
+    if (config.WAIT_ON_TIME) {
+      cy.wait(config.WAIT_TIME);
+    } else {
+      cy.wait('@getElementAfterSave').its('status').should('be', config.DEFAULT_STATUS);
+    }

    validation.forEach((item) => {
      cy.get(item[0]).then(element => expect(element.val()).eq(item[1]));
@@ -95,7 +115,11 @@ class IceCypressTest {
    cy.visit(`${config.BASE_URL}?${this.moduleUrl}`);

    // Wait for data table response
-    cy.wait('@get').its('status').should('be', config.DEFAULT_WAIT_TIME);
+    if (config.WAIT_ON_TIME) {
+      cy.wait(config.WAIT_TIME);
+    } else {
+      cy.wait('@get').its('status').should('be', config.DEFAULT_STATUS);
+    }
  }

  switchTab(cy, tabName = null) {
@@ -104,8 +128,12 @@ class IceCypressTest {
    } else {
      cy.server().route('POST', `/${config.URL_PREFIX}/service.php*`).as('getTab');
    }
-    cy.get(tabName || `#tab${this.element}`).click();
-    cy.wait('@getTab').its('status').should('be', config.DEFAULT_WAIT_TIME);
+    cy.get(tabName || `#tab${this.element}`).should("be.visible").click();
+    if (config.WAIT_ON_TIME) {
+      cy.wait(config.WAIT_TIME);
+    } else {
+      cy.wait('@getTab').its('status').should('be', config.DEFAULT_STATUS);
+    }
  }
 }

--- a/test/frontend/cypress/support/commands.js
+++ b/test/frontend/cypress/support/commands.js
@@ -27,12 +27,13 @@ const config = require('./config');
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

 Cypress.Commands.add('login', (user, password) => {
-  cy.visit(`${config.BASE_URL}login.php`);
+  cy.visit(`${config.BASE_URL}logout.php`);
  cy.get('#username').type(user).should('have.value', user);
  cy.get('#password').type(password).should('have.value', password);
  cy.get('.btn').first().click();
 });

 Cypress.Commands.add('resetDatabase', () => {
-  cy.exec('vagrant ssh -c \'cd /vagrant/core/robo; php robo.phar reset:db test; php robo.phar create:tables test; php robo.phar migrate:all test; php robo.phar execute:fixtures test\'');
+  cy.visit(`${config.BASE_URL}reset-db.php`);
+  //cy.exec('vagrant ssh -c \'cd /vagrant/core/robo; php robo.phar reset:db test; php robo.phar create:tables test; php robo.phar migrate:all test; php robo.phar execute:fixtures test\'');
 });
--- a/test/frontend/cypress/support/config.js
+++ b/test/frontend/cypress/support/config.js
@@ -1,13 +1,19 @@
-const BASE_URL = 'http://clients.icehrmpro.test/test/';
+const BASE_URL = 'http://icehrm:8090/app/';
+//const BASE_URL = 'http://clients.icehrmpro.test/test/';
+
 const DEFAULT_MAX_PAGE_SIZE = 15;
-const DEFAULT_WAIT_TIME = 500;
+const DEFAULT_STATUS = 200;
 const DEFAULT_USER_PASS = 'demouserpwd';
-const URL_PREFIX = 'test';
+const URL_PREFIX = 'app';
+const WAIT_ON_TIME = true;
+const WAIT_TIME = 500;

 module.exports = {
  BASE_URL,
  DEFAULT_MAX_PAGE_SIZE,
-  DEFAULT_WAIT_TIME,
+  DEFAULT_STATUS,
  DEFAULT_USER_PASS,
  URL_PREFIX,
+  WAIT_ON_TIME,
+  WAIT_TIME,
 };
--- a/test/frontend/cypress/support/index.js
+++ b/test/frontend/cypress/support/index.js
@@ -18,3 +18,9 @@ import './commands';

 // Alternatively you can use CommonJS syntax:
 // require('./commands')
+
+Cypress.on('uncaught:exception', (err, runnable) => {
+  // returning false here prevents Cypress from
+  // failing the test
+  return false
+});
--- a/test/frontend/package-lock.json
+++ b/test/frontend/package-lock.json
@@ -47,13 +47,19 @@
        "lodash.once": "^4.1.1"
      }
    },
+    "@types/sizzle": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
+      "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",
+      "dev": true
+    },
    "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+      "version": "6.12.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+      "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
      "dev": true,
      "requires": {
-        "fast-deep-equal": "^2.0.1",
+        "fast-deep-equal": "^3.1.1",
        "fast-json-stable-stringify": "^2.0.0",
        "json-schema-traverse": "^0.4.1",
        "uri-js": "^4.2.2"
@@ -120,9 +126,9 @@
      "dev": true
    },
    "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
+      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
      "dev": true
    },
    "balanced-match": {
@@ -328,13 +334,14 @@
      }
    },
    "cypress": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.4.1.tgz",
-      "integrity": "sha512-1HBS7t9XXzkt6QHbwfirWYty8vzxNMawGj1yI+Fu6C3/VZJ8UtUngMW6layqwYZzLTZV8tiDpdCNBypn78V4Dg==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.8.3.tgz",
+      "integrity": "sha512-I9L/d+ilTPPA4vq3NC1OPKmw7jJIpMKNdyfR8t1EXYzYCjyqbc59migOm1YSse/VRbISLJ+QGb5k4Y3bz2lkYw==",
      "dev": true,
      "requires": {
        "@cypress/listr-verbose-renderer": "0.4.1",
        "@cypress/xvfb": "1.2.4",
+        "@types/sizzle": "2.3.2",
        "arch": "2.1.1",
        "bluebird": "3.5.0",
        "cachedir": "1.3.0",
@@ -343,6 +350,7 @@
        "commander": "2.15.1",
        "common-tags": "1.8.0",
        "debug": "3.2.6",
+        "eventemitter2": "4.1.2",
        "execa": "0.10.0",
        "executable": "4.1.1",
        "extract-zip": "1.6.7",
@@ -361,6 +369,7 @@
        "request-progress": "3.0.0",
        "supports-color": "5.5.0",
        "tmp": "0.1.0",
+        "untildify": "3.0.3",
        "url": "0.11.0",
        "yauzl": "2.10.0"
      }
@@ -477,6 +486,12 @@
        "object.entries": "^1.1.0"
      }
    },
+    "eventemitter2": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-4.1.2.tgz",
+      "integrity": "sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU=",
+      "dev": true
+    },
    "execa": {
      "version": "0.10.0",
      "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
@@ -558,15 +573,15 @@
      "dev": true
    },
    "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
      "dev": true
    },
    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
      "dev": true
    },
    "fd-slicer": {
@@ -653,9 +668,9 @@
      }
    },
    "glob": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
      "dev": true,
      "requires": {
        "fs.realpath": "^1.0.0",
@@ -676,9 +691,9 @@
      }
    },
    "graceful-fs": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
-      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
      "dev": true
    },
    "har-schema": {
@@ -791,13 +806,10 @@
      "dev": true
    },
    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true
    },
    "is-fullwidth-code-point": {
      "version": "1.0.0",
@@ -828,9 +840,9 @@
      }
    },
    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
      "dev": true
    },
    "is-regex": {
@@ -1109,18 +1121,18 @@
      }
    },
    "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
      "dev": true
    },
    "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
      "dev": true,
      "requires": {
-        "mime-db": "1.40.0"
+        "mime-db": "1.44.0"
      }
    },
    "minimatch": {
@@ -1345,9 +1357,9 @@
      "dev": true
    },
    "psl": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
      "dev": true
    },
    "punycode": {
@@ -1375,9 +1387,9 @@
      "dev": true
    },
    "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
      "dev": true,
      "requires": {
        "core-util-is": "~1.0.0",
@@ -1497,9 +1509,9 @@
      "dev": true
    },
    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
      "dev": true
    },
    "slice-ansi": {
@@ -1661,6 +1673,12 @@
      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
      "dev": true
    },
+    "untildify": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
+      "integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
+      "dev": true
+    },
    "uri-js": {
      "version": "4.2.2",
      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -1695,9 +1713,9 @@
      "dev": true
    },
    "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
      "dev": true
    },
    "verror": {
--- a/test/frontend/package.json
+++ b/test/frontend/package.json
@@ -12,7 +12,7 @@
  "author": "",
  "license": "ISC",
  "devDependencies": {
-    "cypress": "^3.4.1",
+    "cypress": "^3.8.3",
    "eslint-config-airbnb": "^18.0.1"
  }
 }