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-Tag: 2.1.2~24^2~5
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/eda7767bc88b7a2a3dc582af47417937ff4de38a

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 --cc cypress/integration/collection-panel.spec.js
index 59b80e67,377f11d9..9c5c656a
--- a/cypress/integration/collection-panel.spec.js
+++ b/cypress/integration/collection-panel.spec.js
@@@ -394,18 -382,20 +394,33 @@@ describe('Collection panel tests', func
              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');
          });
      });
  })