Use the e2e lite-serve (#1390)

* Enable liteserve Fix ecmHost Enable browser open

* Be able to pass a different admin credentials

* use the e2e liteserve

* sync package-lock

* Update webdriver

* Replace the app.conf values before running e2e. Be able to run e2e on external env

* Remove dist mystake

* Remove the baseUrl from the contains

* Use the docker image

* stop postgresql before install

* Try the new strategy

* regenerate the package lock

* Wait for the content to go up

* Change travis with start.sh

* do not override the baseUrl

* Create a different docker compose for e2e

Co-authored-by: Adina Parpalita <adina.parpalita@ness.com>
This commit is contained in:
Maurizio Vitale
2020-04-02 09:21:44 +01:00
committed by GitHub
parent cb26102a99
commit b240909868
16 changed files with 947 additions and 559 deletions

View File

@@ -34,11 +34,6 @@ export const USE_HASH_STRATEGY = true;
// Repository configs
export const REPO_API_TENANT = '-default-';
// Admin details
export const ADMIN_USERNAME = 'admin';
export const ADMIN_PASSWORD = 'admin';
export const ADMIN_FULL_NAME = 'Administrator';
export const E2E_ROOT_PATH = __dirname;
// Dates

View File

@@ -26,7 +26,7 @@ import { browser, ExpectedConditions as EC } from 'protractor';
import { LoginComponent } from '../components/components';
import { Page } from './page';
import { ADMIN_USERNAME, ADMIN_PASSWORD, BROWSER_WAIT_TIMEOUT, APP_ROUTES } from '../configs';
import { BROWSER_WAIT_TIMEOUT, APP_ROUTES } from '../configs';
export class LoginPage extends Page {
login: LoginComponent = new LoginComponent(this.appRoot);
@@ -54,7 +54,7 @@ export class LoginPage extends Page {
async loginWithAdmin() {
await this.load();
return this.loginWith(ADMIN_USERNAME, ADMIN_PASSWORD);
return this.loginWith(browser.params.ADMIN_USERNAME, browser.params.ADMIN_PASSWORD);
}
async tryLoginWith(username: string, password?: string) {

View File

@@ -48,7 +48,7 @@ describe('Share a file', () => {
const viewer = new Viewer();
const page = new BrowsingPage();
const { dataTable, toolbar } = page;
const shareLinkPreUrl = `${browser.baseUrl}/#/preview/s/`;
const shareLinkPreUrl = `/#/preview/s/`;
const apis = {
admin: new RepoClient(),

View File

@@ -25,14 +25,13 @@
import { browser } from 'protractor';
import { AlfrescoApi } from '@alfresco/js-api';
import { RepoClientAuth } from '../repo-client-models';
export abstract class RepoApi {
alfrescoJsApi = new AlfrescoApi();
constructor(
private username: string = RepoClientAuth.DEFAULT_USERNAME,
private password: string = RepoClientAuth.DEFAULT_PASSWORD
private username: string = browser.params.ADMIN_USERNAME,
private password: string = browser.params.ADMIN_PASSWORD
) {
this.alfrescoJsApi.setConfig(browser.params.config);
}
@@ -47,6 +46,8 @@ export abstract class RepoApi {
protected handleError(message: string, response: any) {
console.log(`\n--- ${message} error :`);
console.log('\t>>> username: ', this.username);
console.log('\t>>> JSON: ', JSON.stringify(browser.params.config));
if ( response.status && response.response ) {
try {
console.log('\t>>> Status: ', response.status);

View File

@@ -1,39 +0,0 @@
/*!
* @license
* Alfresco Example Content Application
*
* Copyright (C) 2005 - 2020 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 {
ADMIN_USERNAME,
ADMIN_PASSWORD
} from '../../configs';
export class RepoClientAuth {
static DEFAULT_USERNAME: string = ADMIN_USERNAME;
static DEFAULT_PASSWORD: string = ADMIN_PASSWORD;
constructor(
public username: string = RepoClientAuth.DEFAULT_USERNAME,
public password: string = RepoClientAuth.DEFAULT_PASSWORD
) {}
}

View File

@@ -23,8 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
import { RepoClientAuth } from './repo-client-models';
import { browser } from 'protractor';
import { PeopleApi } from './apis/people/people-api';
import { NodesApi } from './apis/nodes/nodes-api';
import { CommentsApi } from './apis/comments/comments-api';
@@ -39,8 +38,8 @@ import { AuthenticationApi } from './apis/authentication/authentication-api';
export class RepoClient {
constructor(
private username: string = RepoClientAuth.DEFAULT_USERNAME,
private password: string = RepoClientAuth.DEFAULT_PASSWORD
private username: string = browser.params.ADMIN_USERNAME,
private password: string = browser.params.ADMIN_PASSWORD
) {}
private get auth() {