From: Lucas Di Pentima <lucas@di-pentima.com.ar>
Date: Wed, 25 Nov 2020 17:53:29 +0000 (-0300)
Subject: 17098: Merge branch 'master' into 17098-old-version-as-head
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/eda7767bc88b7a2a3dc582af47417937ff4de38a?hp=-c

17098: Merge branch 'master' into 17098-old-version-as-head

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>
---

eda7767bc88b7a2a3dc582af47417937ff4de38a
diff --combined cypress/integration/collection-panel.spec.js
index 59b80e6770,377f11d9c9..9c5c656a06
--- a/cypress/integration/collection-panel.spec.js
+++ b/cypress/integration/collection-panel.spec.js
@@@ -352,13 -352,6 +352,13 @@@ describe('Collection panel tests', func
              cy.get('[data-cy=collection-files-panel]')
                  .should('contain', 'foo').and('contain', 'bar');
  
 +            // Check that only old collection action are available on context menu
 +            cy.get('[data-cy=collection-panel-options-btn]').click();
 +            cy.get('[data-cy=context-menu]')
 +                .should('contain', 'Recover version')
 +                .and('not.contain', 'Add to favorites');
 +            cy.get('body').click(); // Collapse the menu avoiding details panel expansion
 +
              // Click on "head version" link, confirm that it's the latest version.
              cy.get('[data-cy=collection-info-panel]').contains('head version').click();
              cy.get('[data-cy=collection-info-panel]')
@@@ -369,11 -362,6 +369,11 @@@
              cy.get('[data-cy=collection-files-panel]').
                  should('not.contain', 'foo').and('contain', 'bar');
  
 +            // Check that old collection action isn't available on context menu
 +            cy.get('[data-cy=collection-panel-options-btn]').click()
 +            cy.get('[data-cy=context-menu]').should('not.contain', 'Recover version')
 +            cy.get('body').click(); // Collapse the menu avoiding details panel expansion
 +
              // Make another change, confirm new version.
              cy.get('[data-cy=collection-panel-options-btn]').click();
              cy.get('[data-cy=context-menu]').contains('Edit collection').click();
@@@ -394,18 -382,20 +394,33 @@@
              cy.get('[data-cy=collection-version-browser-select-3]')
                  .should('contain', '3').and('contain', '3 B');
  
+             // Check context menus on version browser
+             cy.get('[data-cy=collection-version-browser-select-3]').rightclick()
+             cy.get('[data-cy=context-menu]')
+                 .should('contain', 'Add to favorites')
+                 .and('contain', 'Make a copy')
+                 .and('contain', 'Edit collection');
+             cy.get('body').click();
+             // (and now an old version...)
+             cy.get('[data-cy=collection-version-browser-select-1]').rightclick()
+             cy.get('[data-cy=context-menu]')
 -                .should('contain', 'Add to favorites')
++                .should('not.contain', 'Add to favorites')
+                 .and('contain', 'Make a copy')
+                 .and('not.contain', 'Edit collection');
+             cy.get('body').click();
++
 +            // Recover first version
 +            cy.get('[data-cy=collection-version-browser]').within(() => {
 +                cy.get('[data-cy=collection-version-browser-select-1]').click();
 +            });
 +            cy.get('[data-cy=collection-panel-options-btn]').click()
 +            cy.get('[data-cy=context-menu]').contains('Recover version').click();
 +            cy.get('[data-cy=collection-info-panel]')
 +                .should('not.contain', 'This is an old version');
 +            cy.get('[data-cy=collection-version-number]').should('contain', '4');
 +            cy.get('[data-cy=collection-info-panel]').should('contain', colName);
 +            cy.get('[data-cy=collection-files-panel]')
 +                .should('contain', 'foo').and('contain', 'bar');
          });
      });
  })