Merge branch '20890-remove-wb1-switch' refs #20890

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

diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js
index a49c18db3181a90b5845acbe7e02461a991a0d81..69e484173f80aa8fdcda1f4a95c46d572b41ce1d 100644 (file)
--- a/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@ -389,6 +389,7 @@ describe('Collection panel tests', function () {
                     'table%&?*2',
                     'bar' // make sure we can go back to the original name as a last step
                 ];
+                cy.intercept({method: 'PUT', url: '**/arvados/v1/collections/*'}).as('renameRequest');
                 eachPair(names, (from, to) => {
                     cy.waitForDom().get('[data-cy=collection-files-panel]')
                         .contains(`${from}`).rightclick();
@@ -403,6 +404,7 @@ describe('Collection panel tests', function () {
                                 .type(to, { parseSpecialCharSequences: false });
                         });
                     cy.get('[data-cy=form-submit-btn]').click();
+                    cy.wait('@renameRequest');
                     cy.get('[data-cy=collection-files-panel]')
                         .should('not.contain', `${from}`)
                         .and('contain', `${to}`);
@@ -813,7 +815,7 @@ describe('Collection panel tests', function () {
                         cy.get('[data-cy=collection-version-browser-select-1]')
                             .should('contain', '1')
                             .and('contain', '6 B')
-                            .and('contain', adminUser.user.uuid);
+                            .and('contain', adminUser.user.full_name);
                         // Version 2: 3 bytes in size (one file removed)
                         cy.get('[data-cy=collection-version-browser-select-2]')
                             .should('contain', '2')
@@ -874,6 +876,7 @@ describe('Collection panel tests', function () {
                     .should('contain', '3').and('contain', '3 B');
 
                 // Check context menus on version browser
+                cy.waitForDom();
                 cy.get('[data-cy=collection-version-browser-select-3]').rightclick()
                 cy.get('[data-cy=context-menu]')
                     .should('contain', 'Add to favorites')
@@ -930,7 +933,9 @@ describe('Collection panel tests', function () {
 
                 cy.waitForDom().get('.layout-pane-primary', { timeout: 12000 }).contains('Projects').click();
 
-                cy.get('main').contains(`Files extracted from: ${this.collection.name}`).should('exist');
+                cy.waitForDom().get('main').contains(`Files extracted from: ${this.collection.name}`).click();
+                cy.get('[data-cy=collection-files-panel]')
+                        .and('contain', 'bar');
             });
     });
 
@@ -987,23 +992,36 @@ describe('Collection panel tests', function () {
                 cy.loginAs(activeUser)
                 cy.goToPath(`/collections/${sourceCollection.uuid}`);
 
-                cy.get('[data-cy=collection-files-panel]').within(() => {
+                // Select both files
+                cy.waitForDom().get('[data-cy=collection-files-panel]').within(() => {
                     cy.get('input[type=checkbox]').first().click();
+                    cy.get('input[type=checkbox]').last().click();
                 });
 
+                // Copy to separate collections
                 cy.get('[data-cy=collection-files-panel-options-btn]').click();
                 cy.get('[data-cy=context-menu]').contains('Copy selected into separate collections').click();
-
                 cy.get('[data-cy=form-dialog]').contains('Projects').click();
                 cy.get('[data-cy=form-submit-btn]').click();
 
+                // Verify created collections
                 cy.waitForDom().get('.layout-pane-primary', { timeout: 12000 }).contains('Projects').click();
-
-                // cy.goToPath(`/collections/${destinationCollection.uuid}`);
-
+                cy.get('main').contains(`File copied from collection ${sourceCollection.name}/foo`).click();
+                cy.get('[data-cy=collection-files-panel]')
+                        .and('contain', 'foo');
+                cy.get('.layout-pane-primary').contains('Projects').click();
                 cy.get('main').contains(`File copied from collection ${sourceCollection.name}/bar`).click();
                 cy.get('[data-cy=collection-files-panel]')
                         .and('contain', 'bar');
+
+                // Verify separate collection menu items not present when single file selected
+                // Wait for dom for collection to re-render
+                cy.waitForDom().get('[data-cy=collection-files-panel]').within(() => {
+                    cy.get('input[type=checkbox]').first().click();
+                });
+                cy.get('[data-cy=collection-files-panel-options-btn]').click();
+                cy.get('[data-cy=context-menu]').should('not.contain', 'Copy selected into separate collections');
+                cy.get('[data-cy=context-menu]').should('not.contain', 'Move selected into separate collections');
             });
     });
 
@@ -1091,20 +1109,24 @@ describe('Collection panel tests', function () {
                 cy.loginAs(activeUser)
                 cy.goToPath(`/collections/${sourceCollection.uuid}`);
 
+                // Select both files
                 cy.get('[data-cy=collection-files-panel]').within(() => {
                     cy.get('input[type=checkbox]').first().click();
+                    cy.get('input[type=checkbox]').last().click();
                 });
 
+                // Copy to separate collections
                 cy.get('[data-cy=collection-files-panel-options-btn]').click();
                 cy.get('[data-cy=context-menu]').contains('Move selected into separate collections').click();
-
                 cy.get('[data-cy=form-dialog]').contains('Projects').click();
                 cy.get('[data-cy=form-submit-btn]').click();
 
+                // Verify created collections
                 cy.waitForDom().get('.layout-pane-primary', { timeout: 12000 }).contains('Projects').click();
-
-                // cy.goToPath(`/collections/${destinationCollection.uuid}`);
-
+                cy.get('main').contains(`File moved from collection ${sourceCollection.name}/foo`).click();
+                cy.get('[data-cy=collection-files-panel]')
+                        .and('contain', 'foo');
+                cy.get('.layout-pane-primary').contains('Projects').click();
                 cy.get('main').contains(`File moved from collection ${sourceCollection.name}/bar`).click();
                 cy.get('[data-cy=collection-files-panel]')
                         .and('contain', 'bar');