From 339a6e7a185ed4af4b07701f8733a4273e69a8b3 Mon Sep 17 00:00:00 2001 From: cristinaj Date: Wed, 22 May 2019 12:15:12 +0300 Subject: [PATCH] [ADF-4587] Fix e2e tests (#4757) * Fix user_info test * Removing duplication and hardcoded protocol * Fix linting and update script * Removing hardcoded protocol * Add protocol to scripts * Fix C260117 * Enable screenshots for cloud tests * Update process-services-cloud-e2e.sh --- e2e/core/user-info-component-cloud.e2e.ts | 3 --- e2e/lite-server-proxy.js | 2 +- e2e/proxy.conf.js | 4 ++-- e2e/restAPI/APIUtil.js | 4 +--- e2e/test.config.js | 8 ++++---- protractor.conf.js | 2 +- scripts/travis/e2e/content-services-e2e.sh | 2 +- scripts/travis/e2e/core-e2e.sh | 2 +- scripts/travis/e2e/insights-e2e.sh | 2 +- scripts/travis/e2e/process-services-cloud-e2e.sh | 4 ++-- scripts/travis/e2e/process-services-e2e.sh | 2 +- scripts/travis/e2e/search-e2e.sh | 2 +- 12 files changed, 16 insertions(+), 21 deletions(-) diff --git a/e2e/core/user-info-component-cloud.e2e.ts b/e2e/core/user-info-component-cloud.e2e.ts index 6bba6a1c22..d57467b40b 100644 --- a/e2e/core/user-info-component-cloud.e2e.ts +++ b/e2e/core/user-info-component-cloud.e2e.ts @@ -17,7 +17,6 @@ import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing'; import TestConfig = require('../test.config'); -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { UserInfoPage } from '@alfresco/adf-testing'; import { IdentityService, ApiService } from '@alfresco/adf-testing'; @@ -25,7 +24,6 @@ describe('User Info - SSO', () => { const settingsPage = new SettingsPage(); const loginSSOPage = new LoginSSOPage(); - const navigationBarPage = new NavigationBarPage(); const userInfoPage = new UserInfoPage(); let silentLogin, identityUser; let identityService: IdentityService; @@ -54,7 +52,6 @@ describe('User Info - SSO', () => { }); it('[C290066] Should display UserInfo when login using SSO', () => { - navigationBarPage.navigateToProcessServicesCloudPage(); userInfoPage.clickUserProfile(); expect(userInfoPage.getSsoHeaderTitle()).toEqual(identityUser.firstName + ' ' + identityUser.lastName); expect(userInfoPage.getSsoTitle()).toEqual(identityUser.firstName + ' ' + identityUser.lastName); diff --git a/e2e/lite-server-proxy.js b/e2e/lite-server-proxy.js index 77a2e6267c..c6abd9da6e 100644 --- a/e2e/lite-server-proxy.js +++ b/e2e/lite-server-proxy.js @@ -3,7 +3,7 @@ var HOST = process.env.URL_HOST_ADF; let proxy = require('http-proxy-middleware'); -let targetProxy = 'http://' + (PROXY_HOST_ADF || HOST); +let targetProxy = (PROXY_HOST_ADF || HOST); let fallback = require('connect-history-api-fallback'); module.exports = { diff --git a/e2e/proxy.conf.js b/e2e/proxy.conf.js index 2cddf1714a..ae5c6ec063 100644 --- a/e2e/proxy.conf.js +++ b/e2e/proxy.conf.js @@ -3,7 +3,7 @@ var HOST = process.env.URL_HOST_ADF; module.exports = { "/alfresco": { - "target": "http://" + (PROXY_HOST_ADF || HOST), + "target": (PROXY_HOST_ADF || HOST), "secure": false, "pathRewrite": { "^/alfresco/alfresco": "" @@ -18,7 +18,7 @@ module.exports = { } }, "/activiti-app": { - "target": "http://" + (PROXY_HOST_ADF || HOST), + "target": (PROXY_HOST_ADF || HOST), "secure": false, "pathRewrite": { "^/activiti-app/activiti-app": "" diff --git a/e2e/restAPI/APIUtil.js b/e2e/restAPI/APIUtil.js index 0116bb714e..c921f1eb2b 100644 --- a/e2e/restAPI/APIUtil.js +++ b/e2e/restAPI/APIUtil.js @@ -45,14 +45,12 @@ var APIUtils = function () { */ this.getBaseURL = function (application, urlComponentsParam) { var urlComponents = {}; - urlComponents.protocol = TestConfig[application].protocol; urlComponents.hostname = TestConfig[application].host; urlComponents.port = TestConfig[application].port; urlComponents.path = TestConfig[application].apiContextRoot; Object.assign(urlComponents, urlComponentsParam); - return url(urlComponents.protocol - + "://" + urlComponents.hostname + return url(urlComponents.hostname + (urlComponents.port !== "" ? ":" + urlComponents.port : ""), urlComponents.path); }; diff --git a/e2e/test.config.js b/e2e/test.config.js index 1e7365dd61..01bf605608 100644 --- a/e2e/test.config.js +++ b/e2e/test.config.js @@ -24,7 +24,7 @@ module.exports = { /** * base */ - url: "http://" + HOST, + url: HOST, /** * adf port @@ -51,7 +51,7 @@ module.exports = { */ adminPassword: PASSWORD, - hostBPM: "https://" + ( HOST_BPM || PROXY || HOST), + hostBPM: HOST_BPM || PROXY || HOST, clientIdSso: "alfresco", @@ -66,7 +66,7 @@ module.exports = { baseUrl = HOST; } - return `https://${baseUrl}/auth/realms/alfresco`; + return `${baseUrl}/auth/realms/alfresco`; }(), hostIdentity: function () { @@ -83,7 +83,7 @@ module.exports = { } - return `https://${baseUrl}/auth/admin/realms/alfresco`; + return `${baseUrl}/auth/admin/realms/alfresco`; }() }, diff --git a/protractor.conf.js b/protractor.conf.js index 98ce1eb569..e72db83817 100644 --- a/protractor.conf.js +++ b/protractor.conf.js @@ -175,7 +175,7 @@ exports.config = { directConnect: DIRECT_CONNECCT, - baseUrl: "http://" + HOST, + baseUrl: HOST, params: { config: { diff --git a/scripts/travis/e2e/content-services-e2e.sh b/scripts/travis/e2e/content-services-e2e.sh index 641f897dbb..79a9349d49 100755 --- a/scripts/travis/e2e/content-services-e2e.sh +++ b/scripts/travis/e2e/content-services-e2e.sh @@ -9,5 +9,5 @@ AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; if [[ $AFFECTED_LIBS =~ "content-services$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]]; then node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1; - ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder content-services --skip-lint --use-dist -b || exit 1; + ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder content-services --skip-lint --use-dist -b || exit 1; fi; diff --git a/scripts/travis/e2e/core-e2e.sh b/scripts/travis/e2e/core-e2e.sh index 65a80eafe0..edb424a229 100755 --- a/scripts/travis/e2e/core-e2e.sh +++ b/scripts/travis/e2e/core-e2e.sh @@ -10,5 +10,5 @@ if [[ $AFFECTED_LIBS =~ "core$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST then node ./scripts/check-env/check-ps-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1; node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1; - ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder core --skip-lint -save --use-dist -b || exit 1; + ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder core --skip-lint -save --use-dist -b || exit 1; fi; diff --git a/scripts/travis/e2e/insights-e2e.sh b/scripts/travis/e2e/insights-e2e.sh index b9cacd4f04..c5ed34d91c 100755 --- a/scripts/travis/e2e/insights-e2e.sh +++ b/scripts/travis/e2e/insights-e2e.sh @@ -9,5 +9,5 @@ AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; if [[ $AFFECTED_LIBS =~ "process-services-cloud$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]]; then node ./scripts/check-env/check-ps-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1; - ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder insights --skip-lint --use-dist || exit 1; + ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder insights --skip-lint --use-dist || exit 1; fi; diff --git a/scripts/travis/e2e/process-services-cloud-e2e.sh b/scripts/travis/e2e/process-services-cloud-e2e.sh index 229daa3fe1..eb742c3adb 100755 --- a/scripts/travis/e2e/process-services-cloud-e2e.sh +++ b/scripts/travis/e2e/process-services-cloud-e2e.sh @@ -8,6 +8,6 @@ AFFECTED_E2E="$(./scripts/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e")"; AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; if [[ $AFFECTED_LIBS =~ "process-services-cloud$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]]; then - node ./scripts/check-env/check-activiti-env.js --host "$E2E_HOST_BPM" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" --client 'activiti' || exit 1; - ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST_BPM" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder process-services-cloud --skip-lint --use-dist -b || exit 1; + node ./scripts/check-env/check-activiti-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" --client 'activiti' || exit 1; + ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" -host_sso "$E2E_HOST_IDENTITY" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" --folder process-services-cloud --skip-lint --use-dist -b -save || exit 1; fi; diff --git a/scripts/travis/e2e/process-services-e2e.sh b/scripts/travis/e2e/process-services-e2e.sh index 4645c59b40..e244ff89a9 100755 --- a/scripts/travis/e2e/process-services-e2e.sh +++ b/scripts/travis/e2e/process-services-e2e.sh @@ -9,5 +9,5 @@ AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; if [[ $AFFECTED_LIBS =~ "process-services$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]]; then node ./scripts/check-env/check-ps-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1; - ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder process-services --skip-lint --use-dist -b || exit 1; + ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder process-services --skip-lint --use-dist -b || exit 1; fi; diff --git a/scripts/travis/e2e/search-e2e.sh b/scripts/travis/e2e/search-e2e.sh index e2a9c45883..8538e2545c 100755 --- a/scripts/travis/e2e/search-e2e.sh +++ b/scripts/travis/e2e/search-e2e.sh @@ -9,5 +9,5 @@ AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; if [[ $AFFECTED_LIBS =~ "content-services$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]]; then node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1; - ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder search --skip-lint --use-dist -save -b || exit 1; + ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder search --skip-lint --use-dist -save -b || exit 1; fi;