improve e2e configuration (#5752)

* improve e2e configuration

* fix login

* fix login

* use storage

* fix

* default oauth

* improve share file test and add baseShareUrl init in e2e

* some click script better usage

e2e/content-services/share-file/share-file.e2e.ts

@@ -172,7 +172,6 @@ describe('Share file', () => {
             await shareDialog.clickShareLinkButton();
             const sharedLink = await shareDialog.getShareLink();
             await BrowserActions.closeMenuAndDialogs();
-            await notificationHistoryPage.checkNotifyContains('Link copied to the clipboard');
             await BrowserActions.getUrl(sharedLink);
             await viewerPage.checkFileNameIsDisplayed(pngFileModel.name);
         });
@@ -184,13 +183,11 @@ describe('Share file', () => {
             await shareDialog.clickShareLinkButton();
             const sharedLink = await shareDialog.getShareLink();
             await shareDialog.clickCloseButton();
-            await notificationHistoryPage.checkNotifyContains('Link copied to the clipboard');
             await contentServicesPage.clickShareButton();
             await shareDialog.checkDialogIsDisplayed();
             await shareDialog.clickShareLinkButton();
             const secondSharedLink = await shareDialog.getShareLink();
             await BrowserActions.closeMenuAndDialogs();
-            await notificationHistoryPage.checkNotifyContains('Link copied to the clipboard');
             await expect(sharedLink).toEqual(secondSharedLink);
             await BrowserActions.getUrl(sharedLink);
             await viewerPage.checkFileNameIsDisplayed(pngFileModel.name);

e2e/content-services/sso/sso-download-directive-component.e2e.ts

@@ -75,7 +75,6 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
                 browser.params.testConfig.appConfig.oauth2.host,
                 browser.params.testConfig.appConfig.identityHost, false, true, browser.params.testConfig.appConfig.oauth2.clientId);
 
-            await loginSsoPage.clickOnSSOButton();
             await loginSsoPage.loginSSOIdentityService(acsUser.email, acsUser.password);
 
             await navigationBarPage.clickContentServicesButton();

e2e/core/auth-guard/auth-guard-sso.e2e.ts

@@ -29,7 +29,7 @@ describe('Auth Guard SSO', () => {
             browser.params.testConfig.appConfig.oauth2.host,
             browser.params.testConfig.appConfig.identityHost,
             false, true, browser.params.testConfig.appConfig.oauth2.clientId);
-        await loginSSOPage.clickOnSSOButton();
+
         await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
         await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/cloud/simple-app');
         await browser.sleep(1000);

e2e/core/login/login-sso/login-sso.e2e.ts

@@ -39,7 +39,6 @@ describe('Login component - SSO', () => {
             await settingsPage.setProviderEcmSso(browser.params.testConfig.appConfig.ecmHost,
                 browser.params.testConfig.appConfig.oauth2.host,
                 browser.params.testConfig.appConfig.identityHost, false, true, browser.params.testConfig.appConfig.oauth2.clientId);
-            await loginSSOPage.clickOnSSOButton();
             await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
         });
 

e2e/core/login/login-sso/logout-sso.e2e.ts

@@ -29,7 +29,6 @@ describe('Logout component - SSO', () => {
         await settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
             browser.params.testConfig.appConfig.oauth2.host,
             browser.params.testConfig.appConfig.identityHost, false, true, browser.params.testConfig.appConfig.oauth2.clientId, '/login');
-        await loginSSOPage.clickOnSSOButton();
         await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
         await navigationBarPage.clickLogoutButton();
 

e2e/core/user-info-component-cloud.e2e.ts

@@ -44,8 +44,6 @@ describe('User Info - SSO', () => {
             browser.params.testConfig.appConfig.oauth2.host,
             browser.params.testConfig.appConfig.identityHost, false, true, browser.params.testConfig.appConfig.oauth2.clientId);
 
-        await loginSSOPage.clickOnSSOButton();
-
         await loginSSOPage.loginSSOIdentityService(identityUser.email, identityUser.password);
     });
 

e2e/pages/adf/content-services.page.ts

@@ -685,7 +685,7 @@ export class ContentServicesPage {
     async selectItemWithCheckbox(itemName: string): Promise<void> {
         const item: ElementFinder = element(by.css(`adf-datatable-row[aria-label="${itemName}"] mat-checkbox .mat-checkbox-input`));
         await BrowserVisibility.waitUntilElementIsVisible(item);
-        await BrowserActions.click(item);
+        await BrowserActions.clickScript(item);
     }
 
     async unSelectItemWithCheckbox(itemName: string): Promise<void> {

e2e/pages/adf/demo-shell/process-services/tasks-cloud-demo.page.ts

@@ -162,9 +162,7 @@ export class TasksCloudDemoPage {
     }
 
     async clickStartNewTaskButton() {
-        await BrowserVisibility.waitUntilElementIsClickable(this.createButton);
         await BrowserActions.click(this.createButton);
-        await BrowserVisibility.waitUntilElementIsClickable(this.newTaskButton);
         await BrowserActions.click(this.newTaskButton);
     }
 

e2e/pages/adf/dialog/share-dialog.page.ts

@@ -24,7 +24,7 @@ export class ShareDialogPage {
     togglePage = new TogglePage();
     dateTimePickerPage = new DateTimePickerPage();
     shareDialog = element(by.css('adf-share-dialog'));
-    dialogTitle = element(by.css('[data-automation-id="adf-share-dialog-title"]'));
+    dialogTitle = element.all(by.css('[data-automation-id="adf-share-dialog-title"]')).first();
     shareToggle = element(by.css('[data-automation-id="adf-share-toggle"] label'));
     expireToggle = element(by.css(`[data-automation-id="adf-expire-toggle"] label`));
     shareToggleChecked = element(by.css('mat-dialog-container mat-slide-toggle.mat-checked'));

e2e/pages/adf/permissions.page.ts

@@ -67,7 +67,7 @@ export class PermissionsPage {
 
     async clickUserOrGroup(name): Promise<void> {
         const userOrGroupName: ElementFinder = element(by.cssContainingText('mat-list-option .mat-list-text', name));
-        await BrowserActions.click(userOrGroupName);
+        await BrowserActions.clickScript(userOrGroupName);
         await BrowserActions.click(this.addButton);
     }
 

e2e/pages/adf/process-services/task-details.page.ts

@@ -408,7 +408,7 @@ export class TaskDetailsPage {
     }
 
     async clickCompleteFormTask(): Promise<void> {
-        await BrowserActions.click(this.completeFormTask);
+        await BrowserActions.clickScript(this.completeFormTask);
     }
 
     async getEmptyTaskDetailsMessage(): Promise<string> {

e2e/test.config.js

@@ -27,6 +27,9 @@ const HR_USER_PASSWORD = process.env.HR_USER_PASSWORD || "defaulthruserpassword"
 const USERNAME_ADF = process.env.USERNAME_ADF || "defaultuser";
 const PASSWORD_ADF = process.env.PASSWORD_ADF || "defaultuserpassword";
 
+const REDIRECT_URI = process.env.REDIRECT_URI || "/";
+const REDIRECT_URI_LOGOUT = process.env.REDIRECT_URI_LOGOUT || "/logout";
+
 const SCREENSHOT_URL = process.env.SCREENSHOT_URL || HOST;
 const SCREENSHOT_PASSWORD = process.env.SCREENSHOT_PASSWORD || process.env.PASSWORD_ADF;
 const SCREENSHOT_USERNAME = process.env.SCREENSHOT_USERNAME || process.env.USERNAME_ADF;
@@ -46,8 +49,12 @@ const appConfig = {
         "secret": "",
         "implicitFlow": true,
         "silentLogin": true,
-        "redirectUri": "/",
-        "redirectUriLogout": "/logout"
+        "redirectUri": REDIRECT_URI,
+        "redirectUriLogout": REDIRECT_URI_LOGOUT,
+        "publicUrls": [
+            "**/preview/s/*",
+            "**/settings"
+        ]
     }
 };