[ACA-1843] tomcat e2e runs (#674)

* tomcat environment

* disable artifact deployment for now

* travis settings update

* protractor settings

* protractor settings

* e2e fixes

* e2e fixes

* [ACA-1842] fix library dialog

* cleanup travis settings

* disable test (bug raised)

* fix after rebase

* fix after rebase

e2e/configs.ts

@@ -29,7 +29,7 @@ export const BROWSER_RESOLUTION_HEIGHT = 800;
 export const BROWSER_WAIT_TIMEOUT = 10000;
 
 // Application configs
-export const APP_HOST = 'http://localhost:4000';
+export const USE_HASH_STRATEGY = true;
 
 // Repository configs
 export const REPO_API_HOST = 'http://localhost:8080';

e2e/pages/page.ts

@@ -31,11 +31,9 @@ import {
   promise,
   ExpectedConditions as EC
 } from 'protractor';
-import { BROWSER_WAIT_TIMEOUT } from './../configs';
+import { BROWSER_WAIT_TIMEOUT, USE_HASH_STRATEGY } from './../configs';
 
 export abstract class Page {
-  private static USE_HASH_STRATEGY = true;
-
   private locators = {
     app: by.css('app-root'),
     layout: by.css('app-layout'),
@@ -69,8 +67,8 @@ export abstract class Page {
   }
 
   load(relativeUrl: string = ''): promise.Promise<void> {
-    const hash = Page.USE_HASH_STRATEGY ? '/#' : '';
-    const path = `${hash}${this.url}${relativeUrl}`;
+    const hash = USE_HASH_STRATEGY ? '/#' : '';
+    const path = `${browser.baseUrl}${hash}${this.url}${relativeUrl}`;
 
     return browser.get(path);
   }

e2e/suites/authentication/login.test.ts

@@ -29,6 +29,7 @@ import { APP_ROUTES } from '../../configs';
 import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
 import { Utils } from '../../utilities/utils';
 import { RepoClient } from '../../utilities/repo-client/repo-client';
+import { navigate } from '../../utilities/browser-utils';
 
 describe('Login', () => {
   const peopleApi = new RepoClient().people;
@@ -128,11 +129,12 @@ describe('Login', () => {
       expect(browser.getCurrentUrl()).toContain(APP_ROUTES.PERSONAL_FILES);
     });
 
-    it('redirects to Home Page when navigating to the Login page while already logged in - [C213107]', async () => {
+    xit('redirects to Home Page when navigating to the Login page while already logged in - [C213107]', async () => {
       const { username } = johnDoe;
 
       await loginPage.loginWith(username);
-      await browser.get(APP_ROUTES.LOGIN);
+
+      await navigate(APP_ROUTES.LOGIN);
       expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.PERSONAL_FILES);
     });
 
@@ -189,7 +191,7 @@ describe('Login', () => {
     });
 
     it('unauthenticated user is redirected to Login page - [C213106]', async () => {
-      await browser.get(APP_ROUTES.PERSONAL_FILES);
+      await navigate(APP_ROUTES.PERSONAL_FILES);
       expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.LOGIN);
     });
 

e2e/utilities/browser-utils.ts

@@ -0,0 +1,39 @@
+/*!
+ * @license
+ * Alfresco Example Content Application
+ *
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { browser } from 'protractor';
+import { USE_HASH_STRATEGY } from '../configs';
+
+export async function navigate(relativePath: string) {
+  const path = [
+    browser.baseUrl,
+    browser.baseUrl.endsWith('/') ? '' : '/',
+    USE_HASH_STRATEGY ? '#' : '',
+    relativePath.startsWith('/') ? '' : '/',
+    relativePath
+  ].join('');
+
+  return browser.get(path);
+}