Use hash strategy in demo shell as the other apps (#6402)

* hash startegy

* use hash in e2e

* trigger build

* fix

* fix

* remove children router overwrite crazynes

* Update login.module.ts

* revert not needed changes

* some fixes

* fix

* remove fdescribe

* fix

* fix

* Update share-file.e2e.ts

* Update lock-file.e2e.ts

* Update share-file.e2e.ts

* some fix

* some other fixes

* username as id

* fix after rebase

* username

* fix usernamee

* Fix the errorComponent

* Attempt to fix unit test - to check

* * Fixed circular dependency error while building adf-testing package

* * Fixed failing UT

* fix

* use username

* some fixes

* some fix

* fix

Co-authored-by: Maurizio Vitale <maurizio.vitale@alfresco.com>
Co-authored-by: Vito Albano <vitoalbano@vitoalbano-mbp-0120.local>
Co-authored-by: sivakumar414ram <siva.kumar@muraai.com>
This commit is contained in:
Eugenio Romano
2020-12-16 18:46:56 +00:00
committed by GitHub
parent 3734151338
commit 1c51b2a1a6
195 changed files with 1774 additions and 1460 deletions

View File

@@ -19,6 +19,7 @@ import { Locator, by, element, ElementFinder, browser } from 'protractor';
import { DataTableComponentPage } from '../../core/pages/data-table-component.page';
import { BrowserVisibility } from '../../core/utils/browser-visibility';
import { BrowserActions } from '../../core/utils/browser-actions';
import { Logger } from '../../core/utils/logger';
export class DocumentListPage {
@@ -66,6 +67,7 @@ export class DocumentListPage {
}
async clickOnActionMenu(content: string): Promise<void> {
Logger.log(`Click action menu ${content}`);
await BrowserActions.closeMenuAndDialogs();
const row = this.dataTable.getRow('Display name', content);
await BrowserActions.click(row.element(this.optionButton));

View File

@@ -17,6 +17,7 @@
import { browser, by, element } from 'protractor';
import { BrowserActions } from '../../core/utils/browser-actions';
import { BrowserVisibility } from '../../core/utils/browser-visibility';
export class LikePage {
@@ -24,8 +25,8 @@ export class LikePage {
likeButton = element(by.css(`.adf-like-grey`));
unlikeButton = element(by.css(`.adf-like-select`));
async getLikeCounter(): Promise<string> {
return BrowserActions.getText(this.likeCounter);
async checkLikeCounter(counter: number): Promise<void> {
await BrowserVisibility.waitUntilElementHasText(this.likeCounter, counter);
}
async clickLike(): Promise<void> {

View File

@@ -31,9 +31,9 @@ export class RatePage {
await BrowserActions.click(ratedStar);
}
async getRatingCounter(): Promise<string> {
async checkRatingCounter(rating: number): Promise<void> {
const ratingsCounter = element(by.css(`div[id="adf-rating-counter"]`));
return BrowserActions.getText(ratingsCounter);
await BrowserVisibility.waitUntilElementHasText(ratingsCounter, rating);
}
async isStarRated(rateValue: number): Promise<void> {

View File

@@ -76,9 +76,9 @@ export class GroupIdentityService {
Logger.log(`Data ${JSON.stringify(data)}`);
return data[0];
return data[0]; Logger.error('Group not found');
} catch (error) {
Logger.error('Group not found');
}
};

View File

@@ -49,7 +49,7 @@ export class UsersActions {
if (this.api.apiService.isEcmConfiguration() || (this.api.apiService.isEcmBpmConfiguration())) {
Logger.log(`Create user ECM ${user.email}`);
await this.api.apiService.core.peopleApi.addPerson({
id: user.email,
id: user.username,
email: user.email,
firstName: user.firstName,
lastName: user.lastName,

View File

@@ -18,6 +18,7 @@
import { element, by, ElementFinder } from 'protractor';
import { BrowserVisibility } from '../../utils/browser-visibility';
import { BrowserActions } from '../../utils/browser-actions';
import { Logger } from '../../utils/logger';
export class DropdownPage {
@@ -33,6 +34,7 @@ export class DropdownPage {
}
async selectOption(option: string): Promise<void> {
Logger.log(`Select dropdown option ${option}`);
await BrowserVisibility.waitUntilElementIsVisible(element.all(by.cssContainingText('mat-option span.mat-option-text', option)).first());
const optionElement = element.all(by.cssContainingText('mat-option span.mat-option-text', option)).first();
await BrowserActions.click(optionElement);

View File

@@ -32,8 +32,7 @@ export class NotificationHistoryPage {
}
async checkNotificationIsPresent(text: string): Promise<void> {
const notificationLisText = await BrowserActions.getText(this.notificationList);
await expect(notificationLisText).toContain(text);
await BrowserVisibility.waitUntilElementHasText(this.notificationList, text);
}
async checkNotificationIsNotPresent(text: string): Promise<void> {

View File

@@ -631,11 +631,11 @@ export class ViewerPage {
}
async checkOverlayViewerIsDisplayed(): Promise<void> {
await BrowserVisibility.waitUntilElementIsVisible(this.viewer.element(by.css('div[class*="adf-viewer-overlay-container"]')));
await BrowserVisibility.waitUntilElementIsVisible(element(by.css('div[class*="adf-viewer-overlay-container"]')));
}
async checkInlineViewerIsDisplayed(): Promise<void> {
await BrowserVisibility.waitUntilElementIsVisible(this.viewer.element(by.css('div[class*="adf-viewer-inline-container"]')));
await BrowserVisibility.waitUntilElementIsVisible(element(by.css('div[class*="adf-viewer-inline-container"]')));
}
async checkTabHasNoIcon(index: number): Promise<void> {

View File

@@ -193,7 +193,7 @@ export class BrowserActions {
}
static async closeMenuAndDialogs(): Promise<void> {
Logger.info(`close Menu And Dialogs`);
Logger.info(`Close Menu And Dialogs`);
const container = element(by.css('div.cdk-overlay-backdrop.cdk-overlay-transparent-backdrop.cdk-overlay-backdrop-showing'));
await browser.actions().sendKeys(protractor.Key.ESCAPE).perform();

View File

@@ -20,8 +20,8 @@ import { Logger } from './logger';
export class BrowserVisibility {
static NOT_VISIBLE_DEFAULT_TIMEOUT = BrowserVisibility.getNoVisibleTimeout() ? browser.params.testConfig.timeouts.no_visible_timeout : 20000;
static DEFAULT_TIMEOUT = BrowserVisibility.getVisibleTimeout() ? browser.params.testConfig.timeouts.visible_timeout : 20000;
static NOT_VISIBLE_DEFAULT_TIMEOUT = BrowserVisibility.getNoVisibleTimeout() ? browser.params.testConfig.timeouts.no_visible_timeout : 10000;
static DEFAULT_TIMEOUT = BrowserVisibility.getVisibleTimeout() ? browser.params.testConfig.timeouts.visible_timeout : 10000;
static getVisibleTimeout() {
if (browser && browser.params && browser.params.testConfig && browser.params.testConfig.timeouts) {

View File

@@ -63,7 +63,7 @@ export class ApplicationsUtil {
await this.api.getInstance().activiti.appsApi.deployAppDefinitions({ appDefinitions: [{ id: publishApp.appDefinition.id }] });
return appCreated;
} catch (error) {
Logger.error('Import Publish Deploy Application - Service error, Response: ', JSON.parse(JSON.stringify(error)).response.text);
Logger.error('Import Publish Deploy Application - Service error, Response: ', JSON.stringify(error));
}
}