Merge branch '21507-long-project-title-wrap'

[arvados.git] / services / workbench2 / cypress / e2e / banner-tooltip.cy.js

diff --git a/services/workbench2/cypress/e2e/banner-tooltip.cy.js b/services/workbench2/cypress/e2e/banner-tooltip.cy.js
index 295bc380c3d20ed716da34f9240f41fb11bf192b..1a93d83f3138057954ed79c650e8e24ac1a69d2c 100644 (file)
--- a/services/workbench2/cypress/e2e/banner-tooltip.cy.js
+++ b/services/workbench2/cypress/e2e/banner-tooltip.cy.js
@@ -15,52 +15,78 @@ describe('Banner / tooltip tests', function () {
         cy.getUser('admin', 'Admin', 'User', true, true)
             .as('adminUser').then(function () {
                 adminUser = this.adminUser;
-            }
-            );
+            });
         cy.getUser('collectionuser1', 'Collection', 'User', false, true)
             .as('activeUser').then(function () {
                 activeUser = this.activeUser;
             });
-            cy.on('uncaught:exception', (err, runnable) => {console.error(err)});
     });
 
     beforeEach(function () {
-        cy.clearCookies();
-        cy.clearLocalStorage();
+        cy.on('uncaught:exception', (err, runnable, promise) => {
+            Cypress.log({ message: `Application Error: ${err}`});
+            if (promise) {
+                return false;
+            }
+        });
+
+        cy.createCollection(adminUser.token, {
+            name: `BannerTooltipTest${Math.floor(Math.random() * 999999)}`,
+            owner_uuid: adminUser.user.uuid,
+        }).as('bannerCollection');
+
+        cy.getAll('@bannerCollection').then(function ([bannerCollection]) {
+            collectionUUID=bannerCollection.uuid;
+
+            cy.loginAs(adminUser);
+
+            cy.goToPath(`/collections/${bannerCollection.uuid}`);
+
+            cy.get('[data-cy=upload-button]').click();
+
+            cy.fixture('files/banner.html').as('banner');
+            cy.fixture('files/tooltips.txt').as('tooltips');
+
+            cy.getAll('@banner', '@tooltips').then(([banner, tooltips]) => {
+                cy.get('[data-cy=drag-and-drop]').upload(banner, 'banner.html', false);
+                cy.get('[data-cy=drag-and-drop]').upload(tooltips, 'tooltips.json', false);
+            });
+
+            cy.get('[data-cy=form-submit-btn]').click();
+            cy.get('[data-cy=form-submit-btn]').should('not.exist');
+            cy.get('[data-cy=collection-files-right-panel]')
+                .should('contain', 'banner.html');
+            cy.get('[data-cy=collection-files-right-panel]')
+                .should('contain', 'tooltips.json');
+
+            cy.intercept({ method: 'GET', url: '**/arvados/v1/config?nocache=*' }, (req) => {
+                req.reply((res) => {
+                    res.body.Workbench.BannerUUID = collectionUUID;
+                });
+            });
+        });
     });
 
     it('should re-show the banner', () => {
-        setupTheEnvironment();
-
         cy.loginAs(adminUser);
 
-        cy.wait(2000);
-
         cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
 
-        cy.get('[title=Notifications]').click();
+        cy.get('[title=Notifications]').click({ force: true });
         cy.get('li').contains('Restore Banner').click();
 
-        cy.wait(2000);
-
         cy.get('[data-cy=confirmation-dialog-ok-btn]').should('be.visible');
     });
 
 
     it('should show tooltips and remove tooltips as localStorage key is present', () => {
-        setupTheEnvironment();
-
         cy.loginAs(adminUser);
 
-        cy.wait(2000);
-
         cy.get('[data-cy=side-panel-tree]').then(($el) => {
             const el = $el.get(0) //native DOM element
             expect(el._tippy).to.exist;
         });
 
-        cy.wait(2000);
-
         cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
 
         cy.get('[title=Notifications]').click();
@@ -71,45 +97,4 @@ describe('Banner / tooltip tests', function () {
             expect(el._tippy).to.be.undefined;
         });
     });
-
-    const setupTheEnvironment = () => {
-            cy.createCollection(adminUser.token, {
-                name: `BannerTooltipTest${Math.floor(Math.random() * 999999)}`,
-                owner_uuid: adminUser.user.uuid,
-            }).as('bannerCollection');
-
-            cy.getAll('@bannerCollection')
-                .then(function ([bannerCollection]) {
-
-                    collectionUUID=bannerCollection.uuid;
-
-                    cy.loginAs(adminUser);
-
-                    cy.goToPath(`/collections/${bannerCollection.uuid}`);
-
-                    cy.get('[data-cy=upload-button]').click();
-
-                    cy.fixture('files/banner.html').as('banner');
-                    cy.fixture('files/tooltips.txt').as('tooltips');
-
-                    cy.getAll('@banner', '@tooltips')
-                        .then(([banner, tooltips]) => {
-                            cy.get('[data-cy=drag-and-drop]').upload(banner, 'banner.html', false);
-                            cy.get('[data-cy=drag-and-drop]').upload(tooltips, 'tooltips.json', false);
-                        });
-
-                    cy.get('[data-cy=form-submit-btn]').click();
-                    cy.get('[data-cy=form-submit-btn]').should('not.exist');
-                    cy.get('[data-cy=collection-files-right-panel]')
-                        .contains('banner.html').should('exist');
-                    cy.get('[data-cy=collection-files-right-panel]')
-                        .contains('tooltips.json').should('exist');
-
-                        cy.intercept({ method: 'GET', url: '**/arvados/v1/config?nocache=*' }, (req) => {
-                            req.reply((res) => {
-                                res.body.Workbench.BannerUUID = collectionUUID;
-                            });
-                        });
-                });
-    }
-});
+});
\ No newline at end of file