ci: enable custom runs (#70)

* feat: extract user variable * fix: using # in aliases to avoid file deletion * fix: added preinstall step * fix: package name * fix: jira service * lodash replaced with deepmerge * import replaced by const * remove _ * test * wdio * revert * remove local service * fix * define jiraService * change selector * fix * fix * removes log line * fix * test * tesr * wdio.conf * test * test * test * test * fix * test * define jira servrice * test te * test * test * isEnabled * fix * clean up
dhis2 · Mar 24, 2021 · 89cbc5f · 89cbc5f
1 parent 7b7d849
commit 89cbc5f
Show file tree

Hide file tree

Showing 21 changed files with 80 additions and 342 deletions.
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "@wdio/spec-reporter": "^6.8.1",
     "@wdio/sync": "^6.10.4",
     "chromedriver": "^86.0.0",
+    "deepmerge": "^4.2.2",
     "moment": "^2.27.0",
     "wdio-applitools-cucumber-service": "^1.0.6",
     "wdio-chromedriver-service": "^6.0.4",
@@ -33,11 +34,12 @@
     "request": "^2.88.0"
   },
   "_moduleAliases": {
-    "@support": "./support",
-    "@page_objects": "./page_objects"
+    "#support": "./support",
+    "#page_objects": "./page_objects"
   },
   "_moduleAliasIgnoreWarning": true,
   "scripts": {
+    "preinstall": "command -v link-module-alias && link-module-alias clean || true",
     "postinstall": "link-module-alias",
     "lint": "./node_modules/eslint/bin/eslint.js . --fix",
     "browserstack": "./node_modules/.bin/wdio wdio.remote.conf.js",

diff --git a/page_objects/Dashboard.js b/page_objects/Dashboard.js
@@ -1,5 +1,5 @@
 import Page from './Page';
-import { waitForElementToExist, waitForVisible } from '@support/wait';
+import { waitForElementToExist, waitForVisible } from '#support/wait';
 
 class Dashboard extends Page {
   get headerDiv () { return browser.$('[data-test="dashboards-bar"]'); }

diff --git a/page_objects/Login.js b/page_objects/Login.js
@@ -1,5 +1,5 @@
 import Page from './Page';
-import { waitForElementToExist, waitForVisible } from '@support/wait';
+import { waitForElementToExist, waitForVisible } from '#support/wait';
 
 class Login extends Page {
   get loginForm () { return browser.$('#loginForm'); }

diff --git a/page_objects/capture/CaptureHeaderBar.js b/page_objects/capture/CaptureHeaderBar.js
@@ -1,5 +1,5 @@
 import Page from '../Page'
-import { waitForWindowToLoad } from '@support/wait'
+import { waitForWindowToLoad } from '#support/wait'
 
 class CaptureHeaderBar extends Page {
   get newEventButton() {

diff --git a/page_objects/capture/CaptureIndexPage.js b/page_objects/capture/CaptureIndexPage.js
@@ -1,5 +1,5 @@
 import Page from '../Page'
-import { waitForWindowToLoad, waitForElementToExist } from '@support/wait'
+import { waitForWindowToLoad, waitForElementToExist } from '#support/wait'
 
 class CaptureIndexPage extends Page {
   get orgUnits() {
@@ -32,7 +32,7 @@ class CaptureIndexPage extends Page {
   }
 
   selectProgram(name) {
-    waitForElementToExist('#program-selector .Select-placeholder');
+    waitForElementToExist(browser.$('#program-selector .Select-placeholder'));
     browser.$('#program-selector .Select-placeholder').click();
     browser.$('.Select-menu-outer').$('//*[contains(text(), "' + name + '")]').click();
 

diff --git a/page_objects/capture/CaptureNewEventForm.js b/page_objects/capture/CaptureNewEventForm.js
@@ -1,5 +1,5 @@
 import Page from '../Page'
-import { waitForWindowToLoad, waitForVisible, waitForClickable } from '@support/wait'
+import { waitForWindowToLoad, waitForVisible, waitForClickable } from '#support/wait'
 import CaptureCommentsSection from './CaptureCommentsSection';
 var moment = require('moment');
 

diff --git a/page_objects/capture/CaptureViewEventPage.js b/page_objects/capture/CaptureViewEventPage.js
@@ -1,5 +1,5 @@
 import Page from '../Page'
-import { waitForWindowToLoad} from '@support/wait';
+import { waitForWindowToLoad} from '#support/wait';
 class CaptureViewEventPage extends Page {
   open(eventId) {
     super.open('dhis-web-capture/#/viewEvent?viewEventId=' + eventId);

diff --git a/services/wdio-jira-integration-service.js b/services/wdio-jira-integration-service.js
@@ -8,7 +8,7 @@ class WdioJiraService {
   }
 
   _configure() {
-    if (!this.options.isEnabled) {
+    if (!this.options.isEnabled || this.options.isEnabled == 'false') {
       return;
     }
 

diff --git a/step_definitions/Then.js b/step_definitions/Then.js
@@ -1,5 +1,5 @@
 import { Then } from 'cucumber';
-import { checkTitle } from '@support/check';
+import { checkTitle } from '#support/check';
 
 Then(
   /^I expect that the title is( not)* "([^"]*)?"$/,

diff --git a/step_definitions/dhis2/apps/analyticsApps.js b/step_definitions/dhis2/apps/analyticsApps.js
@@ -1,7 +1,7 @@
-import { getFilteredConsoleLog, getConsoleLog, saveScreenshot } from '@support/action';
-import { waitForVisible, waitForWindowToLoad } from '@support/wait';
+import { getFilteredConsoleLog, getConsoleLog, saveScreenshot } from '#support/action';
+import { waitForVisible, waitForWindowToLoad } from '#support/wait';
 import { Given, Then } from 'cucumber';
-import { reportStep } from '@support/reporting'
+import { reportStep } from '#support/reporting'
 
 let listOfFavorites = [];
 let appName = '';

diff --git a/step_definitions/dhis2/apps/apps.js b/step_definitions/dhis2/apps/apps.js
@@ -1,7 +1,7 @@
-import { getConsoleLog, getFilteredConsoleLog, saveScreenshot } from '@support/action';
-import { waitForVisible, waitForWindowToLoad } from '@support/wait';
+import { getConsoleLog, getFilteredConsoleLog, saveScreenshot } from '#support/action';
+import { waitForVisible, waitForWindowToLoad } from '#support/wait';
 import { Given, Then } from 'cucumber';
-import { reportStep } from '@support/reporting'
+import { reportStep } from '#support/reporting'
 
 const listOfApps = ['dhis-web-dataentry/index.action', 'dhis-web-approval/index.action'];
 Given(/^I have a list of installed core apps$/, () => {

diff --git a/step_definitions/dhis2/capture/capture.js b/step_definitions/dhis2/capture/capture.js
@@ -1,6 +1,6 @@
 import { Given, Then, When } from 'cucumber';
-import { captureHeaderBar, captureIndexPage, captureNewEventForm, captureViewEventPage, captureCommentsSection } from '@page_objects/capture';
-import { waitForWindowToLoad } from '@support/wait';
+import { captureHeaderBar, captureIndexPage, captureNewEventForm, captureViewEventPage, captureCommentsSection } from '#page_objects/capture';
+import { waitForWindowToLoad } from '#support/wait';
 
 Given(/^I open the capture app/, () => {
   captureIndexPage.open();

diff --git a/step_definitions/dhis2/dashboard/dashboard.js b/step_definitions/dhis2/dashboard/dashboard.js
@@ -1,9 +1,9 @@
-import { dashboardPage } from '@page_objects/Dashboard';
-import { isVisible } from '@support/check';
-import { getConsoleLog, getFilteredConsoleLog, saveScreenshot } from '@support/action';
-import { waitForElementToExist, waitForWindowToLoad } from '@support/wait';
+import { dashboardPage } from '#page_objects/Dashboard';
+import { isVisible } from '#support/check';
+import { getConsoleLog, getFilteredConsoleLog, saveScreenshot } from '#support/action';
+import { waitForElementToExist, waitForWindowToLoad } from '#support/wait';
 import { Then } from 'cucumber';
-import { reportStep } from '@support/reporting'
+import { reportStep } from '#support/reporting'
 
 Then(
   /^I expect that header is visible$/,

diff --git a/step_definitions/dhis2/given.js b/step_definitions/dhis2/given.js
@@ -1,29 +1,30 @@
 import { Given } from 'cucumber';
 
-import { isVisible}  from '@support/check';
-import { waitForVisible } from '@support/wait';
+import { isVisible}  from '#support/check';
+import { waitForVisible } from '#support/wait';
 
-import { login } from '@support/action';
-import { dashboardPage } from '@page_objects/Dashboard';
+import { login } from '#support/action';
+import { dashboardPage } from '#page_objects/Dashboard';
 
-  Given(
-    /^I am logged in$/,
-    () => {
-      // login as standard user
-      login('system', 'System123');
-      waitForVisible(dashboardPage.mainPageDiv);
-      isVisible(dashboardPage.mainPageDiv);
-    }
-  );
+Given(
+  /^I am logged in$/,
+  () => {
+    // login as standard user
+    login(browser.config.superUser, browser.config.superUserPassword);
+    waitForVisible(dashboardPage.mainPageDiv);
+    isVisible(dashboardPage.mainPageDiv);
+  }
+);
 
-  Given(
-    /^I am authenticated$/,
-    () => {
-      login('system', 'System123');
+Given(
+  /^I am authenticated$/,
+  () => {
+    login(browser.config.superUser, browser.config.superUserPassword);
+
+    browser.waitUntil(() => {
+      const url = browser.getUrl();
+      return url.indexOf('dhis-web') > -1 && url.indexOf('#') > -1 && url.indexOf('login.action') === -1;
+    }, 10000);
+  }
+);
 
-      browser.waitUntil(() => {
-        const url = browser.getUrl();
-        return url.indexOf('dhis-web') > -1 && url.indexOf('#') > -1 && url.indexOf('login.action') === -1;
-      }, 10000);
-    }
-  );
diff --git a/step_definitions/dhis2/then.js b/step_definitions/dhis2/then.js
@@ -1,9 +1,9 @@
 import { Then } from 'cucumber';
-import { isVisible}  from '@support/check';
-import { waitForElementToExist } from '@support/wait';
-import { logout } from '@support/action';
-import { loginPage } from '@page_objects/Login';
-import { dashboardPage } from '@page_objects/Dashboard';
+import { isVisible}  from '#support/check';
+import { waitForElementToExist } from '#support/wait';
+import { logout } from '#support/action';
+import { loginPage } from '#page_objects/Login';
+import { dashboardPage } from '#page_objects/Dashboard';
 
   Then(
     /^I should( not)? be authenticated$/,

diff --git a/step_definitions/dhis2/when.js b/step_definitions/dhis2/when.js
@@ -1,4 +1,4 @@
-import { login}  from '@support/action';
+import { login}  from '#support/action';
 import { When } from 'cucumber';
 
 When(

diff --git a/support/action/dhis2/login.js b/support/action/dhis2/login.js
@@ -1,4 +1,4 @@
-import { loginPage } from '@page_objects/Login';
+import { loginPage } from '#page_objects/Login';
 
 module.exports = (username, password) => {
   loginPage.doLogin(username, password);

diff --git a/support/reporting/reportStep.js b/support/reporting/reportStep.js
@@ -1,4 +1,4 @@
-import { saveScreenshot } from '@support/action';
+import { saveScreenshot } from '#support/action';
 import fs from 'fs';
 
 module.exports = (stepName, expectedResult, status, allureContent) => {

diff --git a/support/wait/waitForWindowToLoad.js b/support/wait/waitForWindowToLoad.js
@@ -17,7 +17,6 @@ module.exports = () => {
 
     if (newSource === source) {
       if (retries <= 0) {
-        console.log('finished waiting')
         return true;
       }
       retries--;

diff --git a/wdio.conf.js b/wdio.conf.js
@@ -5,6 +5,8 @@ const drivers = {
   chrome: { version: '88.0.4324.96' }, // https://chromedriver.chromium.org/
 }
 exports.config = {
+  superUser: process.env.SUPER_USER || 'system',
+  superUserPassword: process.env.SUPER_USER_PASSWORD || 'System123',
   //
   // ====================
   // Runner Configuration
@@ -94,7 +96,7 @@ exports.config = {
 
   services: [
     [ jiraService, {
-      isEnabled: true,
+      isEnabled: process.env.JIRA_ENABLED || true,
       instanceUrl: "https://jira.dhis2.org",
       username: process.env.JIRA_USERNAME,
       password: process.env.JIRA_PASSWORD,
@@ -285,6 +287,15 @@ exports.config = {
   // Suites
   // ======
   suites: {
+    smoke: [
+      './features/apps/dataVisualiser.feature',
+      './features/apps/eventVisualiser.feature',
+      './features/apps/eventsReport.feature',
+      './features/apps/maps.feature',
+      './features/apps/pivotTables.feature',
+      './features/apps/apps.feature',
+      './features/dashboardPage.feature'
+    ],
     login: [
       './features/loginPage.feature'
     ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ class WdioJiraService { @@
       }
       _configure() {
-        if (!this.options.isEnabled) {
+        if (!this.options.isEnabled || this.options.isEnabled == 'false') {
           return;
         }
@@ Expand Down @@