fix

Alfresco · Sep 17, 2020 · bcd6650 · bcd6650
1 parent 56fba57
commit bcd6650
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -59,7 +59,7 @@ jobs:
             - ./scripts/lint.sh
             - ./scripts/travis/release/release-npm.sh
             - ./scripts/travis/release/release-docker.sh
-            
+
           after_success:
             - ./scripts/travis/release/release-docker.sh
             - ./scripts/ci/utils/artifact-to-s3.sh -a ./dist/demo-shell -o "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2"

diff --git a/e2e/content-services/directives/delete-directive.e2e.ts b/e2e/content-services/directives/delete-directive.e2e.ts
@@ -109,6 +109,7 @@ describe('Delete Directive', () => {
     });
 
     describe('Handling multiselection', () => {
+
         beforeEach(async () => {
             await uploadActions.uploadFile(txtFileModel.location, txtFileModel.name, baseFolderUploaded.entry.id);
             await uploadActions.uploadFile(file0BytesModel.location, file0BytesModel.name, baseFolderUploaded.entry.id);

diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js
@@ -97,7 +97,8 @@ let specExists = function (listSpecs) {
 specs();
 
 exports.config = {
-    allScriptsTimeout: TIMEOUT,
+
+    allScriptsTimeout: 30000,
 
     specs: arraySpecs,
 
@@ -154,13 +155,14 @@ exports.config = {
         resources: RESOURCES
     },
 
-    framework: 'jasmine2',
+    framework: 'jasmine',
 
     getPageTimeout: 90000,
 
     jasmineNodeOpts: {
         showColors: true,
-        defaultTimeoutInterval: 120000,
+        defaultTimeoutInterval: 180000,
+        includeStackTrace: true,
         print: () => {
         },
         ...smartRunner.withOptionalExclusions(

diff --git a/lib/testing/src/lib/core/pages/viewer.page.ts b/lib/testing/src/lib/core/pages/viewer.page.ts
@@ -114,19 +114,32 @@ export class ViewerPage {
         await this.waitTillContentLoaded();
     }
 
+
     async waitTillContentLoaded(): Promise<void> {
         await browser.sleep(500);
 
-        try {
-            if (await element(by.tagName('mat-spinner')).isPresent()) {
-                Logger.log('wait datatable loading spinner disappear');
-                await BrowserVisibility.waitUntilElementIsNotPresent(element(by.tagName('mat-spinner')));
-            } else {
-                Logger.log('wait datatable loading spinner is present');
+        if (this.isSpinnerPresent()) {
+            Logger.log('wait spinner disappear');
+            await BrowserVisibility.waitUntilElementIsNotPresent(element(by.tagName('mat-spinner')));
+        } else {
+            try {
+                Logger.log('wait spinner is present');
                 await BrowserVisibility.waitUntilElementIsPresent(element(by.tagName('mat-spinner')));
+            } catch (error) {
             }
+        }
+    }
+
+    private async isSpinnerPresent(): Promise<boolean> {
+        let isSpinnerPresent;
+
+        try {
+            isSpinnerPresent = await element(by.tagName('mat-spinner')).isDisplayed();
         } catch (error) {
+            isSpinnerPresent = false;
         }
+
+        return isSpinnerPresent;
     }
 
     async clearPageNumber(): Promise<void> {