17109: Hopefully fixes several integration test flakyness issues.

[arvados-workbench2.git] / cypress / integration / collection-panel.spec.js

diff --git a/cypress/integration/collection-panel.spec.js b/cypress/integration/collection-panel.spec.js
index 980c55056530bea82c80e4dc0bb2713e2d2f6f97..f70fe691ad4f2c5999b07a6eee9abe6f6c006a1c 100644 (file)
--- a/cypress/integration/collection-panel.spec.js
+++ b/cypress/integration/collection-panel.spec.js
@@ -51,6 +51,10 @@ describe('Collection panel tests', function() {
                         tail_uuid: activeUser.user.uuid
                     })
                     cy.visit(`/collections/${this.testCollection.uuid}`);
+
+                    cy.get('[data-cy=linear-progress]').should('exist');
+                    cy.get('[data-cy=linear-progress]').should('not.exist');
+
                     // Check that name & uuid are correct.
                     cy.get('[data-cy=collection-info-panel]')
                         .should('contain', this.testCollection.name)
@@ -138,6 +142,10 @@ describe('Collection panel tests', function() {
         .as('testCollection').then(function() {
             cy.loginAs(activeUser);
             cy.visit(`/collections/${this.testCollection.uuid}`);
+
+            cy.get('[data-cy=linear-progress]').should('exist');
+            cy.get('[data-cy=linear-progress]').should('not.exist');
+
             const nameTransitions = [
                 ['bar', '&'],
                 ['&', 'foo'],
@@ -174,6 +182,10 @@ describe('Collection panel tests', function() {
         .as('testCollection').then(function() {
             cy.loginAs(activeUser);
             cy.visit(`/collections/${this.testCollection.uuid}`);
+
+            cy.get('[data-cy=linear-progress]').should('exist');
+            cy.get('[data-cy=linear-progress]').should('not.exist');
+
             // Rename 'bar' to 'subdir/foo'
             cy.get('[data-cy=collection-files-panel]')
                 .contains('bar').rightclick();
@@ -211,7 +223,7 @@ describe('Collection panel tests', function() {
         });
     });
 
-    it('tries to rename a file with an illegal names', function() {
+    it('tries to rename a file with illegal names', function() {
         // Creates the collection using the admin token so we can set up
         // a bogus manifest text without block signatures.
         cy.createCollection(adminUser.token, {
@@ -221,6 +233,10 @@ describe('Collection panel tests', function() {
         .as('testCollection').then(function() {
             cy.loginAs(activeUser);
             cy.visit(`/collections/${this.testCollection.uuid}`);
+
+            cy.get('[data-cy=linear-progress]').should('exist');
+            cy.get('[data-cy=linear-progress]').should('not.exist');
+
             const illegalNamesFromUI = [
                 ['.', "Name cannot be '.' or '..'"],
                 ['..', "Name cannot be '.' or '..'"],
@@ -269,6 +285,7 @@ describe('Collection panel tests', function() {
         cy.createCollection(adminUser.token, {
             name: colName,
             owner_uuid: activeUser.user.uuid,
+            preserve_version: true,
             manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"})
         .as('originalVersion').then(function() {
             // Change the file name to create a new version.
@@ -294,6 +311,10 @@ describe('Collection panel tests', function() {
             // Check the old version displays as what it is.
             cy.loginAs(activeUser)
             cy.visit(`/collections/${oldVersionUuid}`);
+
+            cy.get('[data-cy=linear-progress]').should('exist');
+            cy.get('[data-cy=linear-progress]').should('not.exist');
+
             cy.get('[data-cy=collection-info-panel]').should('contain', 'This is an old version');
             cy.get('[data-cy=read-only-icon]').should('exist');
             cy.get('[data-cy=collection-info-panel]').should('contain', colName);
@@ -309,11 +330,16 @@ describe('Collection panel tests', function() {
         cy.createCollection(adminUser.token, {
             name: colName,
             owner_uuid: activeUser.user.uuid,
+            preserve_version: true,
             manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo 0:3:bar\n"})
         .as('collection').then(function() {
             // Visit collection, check basic information
             cy.loginAs(activeUser)
             cy.visit(`/collections/${this.collection.uuid}`);
+
+            cy.get('[data-cy=linear-progress]').should('exist');
+            cy.get('[data-cy=linear-progress]').should('not.exist');
+
             cy.get('[data-cy=collection-info-panel]').should('not.contain', 'This is an old version');
             cy.get('[data-cy=read-only-icon]').should('not.exist');
             cy.get('[data-cy=collection-version-number]').should('contain', '1');