X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/142654bd7633e8d2e038d28a28a3954928766e68..cb320283ce44c2f31f2406e3c7de811689a7c9df:/cypress/integration/collection-panel.spec.js diff --git a/cypress/integration/collection-panel.spec.js b/cypress/integration/collection-panel.spec.js index c3f729f9f5..3e241cebbe 100644 --- a/cypress/integration/collection-panel.spec.js +++ b/cypress/integration/collection-panel.spec.js @@ -28,6 +28,39 @@ describe('Collection panel tests', function() { cy.clearLocalStorage(); }); + it('uses the property editor with vocabulary terms', function() { + cy.createCollection(adminUser.token, { + name: `Test collection ${Math.floor(Math.random() * 999999)}`, + owner_uuid: activeUser.user.uuid, + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"}) + .as('testCollection').then(function() { + cy.loginAs(activeUser); + cy.doSearch(`${this.testCollection.uuid}`); + + // Key: Color (IDTAGCOLORS) - Value: Magenta (IDVALCOLORS3) + cy.get('[data-cy=collection-properties-form]').within(() => { + cy.get('[data-cy=property-field-key]').within(() => { + cy.get('input').type('Color'); + }); + cy.get('[data-cy=property-field-value]').within(() => { + cy.get('input').type('Magenta'); + }); + cy.root().submit(); + }); + // Confirm proper vocabulary labels are displayed on the UI. + cy.get('[data-cy=collection-properties-panel]') + .should('contain', 'Color') + .and('contain', 'Magenta'); + // Confirm proper vocabulary IDs were saved on the backend. + cy.doRequest('GET', `/arvados/v1/collections/${this.testCollection.uuid}`) + .its('body').as('collection') + .then(function() { + expect(this.collection.properties).to.deep.equal( + {IDTAGCOLORS: 'IDVALCOLORS3'}); + }); + }); + }); + it('shows collection by URL', function() { cy.loginAs(activeUser); [true, false].map(function(isWritable) { @@ -50,7 +83,8 @@ describe('Collection panel tests', function() { head_uuid: this.sharedGroup.uuid, tail_uuid: activeUser.user.uuid }) - cy.visit(`/collections/${this.testCollection.uuid}`); + cy.doSearch(`${this.testCollection.uuid}`); + // Check that name & uuid are correct. cy.get('[data-cy=collection-info-panel]') .should('contain', this.testCollection.name) @@ -92,8 +126,10 @@ describe('Collection panel tests', function() { // Check that the file listing show both read & write operations cy.get('[data-cy=collection-files-panel]').within(() => { cy.root().should('contain', 'bar'); - cy.get('[data-cy=upload-button]') - .should(`${isWritable ? '' : 'not.'}contain`, 'Upload data'); + if (isWritable) { + cy.get('[data-cy=upload-button]') + .should(`${isWritable ? '' : 'not.'}contain`, 'Upload data'); + } }); cy.get('[data-cy=collection-files-panel]') .contains('bar').rightclick(); @@ -137,14 +173,14 @@ describe('Collection panel tests', function() { manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"}) .as('testCollection').then(function() { cy.loginAs(activeUser); - cy.visit(`/collections/${this.testCollection.uuid}`); + cy.doSearch(`${this.testCollection.uuid}`); + const nameTransitions = [ ['bar', '&'], ['&', 'foo'], ['foo', '&'], ['&', 'I ❤️ ⛵️'], - ['I ❤️ ⛵️', ' baz'], - [' baz', ' '] // Must be the last case as cy.contains(' ') doesn't work + ['I ❤️ ⛵️', '...'] ]; nameTransitions.forEach(([from, to]) => { cy.get('[data-cy=collection-files-panel]') @@ -174,7 +210,8 @@ describe('Collection panel tests', function() { manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"}) .as('testCollection').then(function() { cy.loginAs(activeUser); - cy.visit(`/collections/${this.testCollection.uuid}`); + cy.doSearch(`${this.testCollection.uuid}`); + // Rename 'bar' to 'subdir/foo' cy.get('[data-cy=collection-files-panel]') .contains('bar').rightclick(); @@ -212,7 +249,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,28 +258,11 @@ describe('Collection panel tests', function() { manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"}) .as('testCollection').then(function() { cy.loginAs(activeUser); - cy.visit(`/collections/${this.testCollection.uuid}`); - const illegalNamesFromBackend = ['.', '..']; - illegalNamesFromBackend.forEach((name) => { - cy.get('[data-cy=collection-files-panel]') - .contains('bar').rightclick(); - cy.get('[data-cy=context-menu]') - .contains('Rename') - .click(); - cy.get('[data-cy=form-dialog]') - .should('contain', 'Rename') - .within(() => { - cy.get('input').type(`{selectall}{backspace}${name}`); - }); - cy.get('[data-cy=form-submit-btn]').click(); - cy.get('[data-cy=form-dialog]') - .should('contain', 'Rename') - .within(() => { - cy.contains('Could not rename'); - }); - cy.get('[data-cy=form-cancel-btn]').click(); - }); + cy.doSearch(`${this.testCollection.uuid}`); + const illegalNamesFromUI = [ + ['.', "Name cannot be '.' or '..'"], + ['..', "Name cannot be '.' or '..'"], ['', 'This field is required'], [' ', 'Leading/trailing whitespaces not allowed'], [' foo', 'Leading/trailing whitespaces not allowed'], @@ -260,7 +280,6 @@ describe('Collection panel tests', function() { .within(() => { cy.get('input').type(`{selectall}{backspace}${name}`); }); - cy.get('[data-cy=form-cancel-btn]').focus(); cy.get('[data-cy=form-dialog]') .should('contain', 'Rename') .within(() => { @@ -289,6 +308,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. @@ -313,11 +333,139 @@ describe('Collection panel tests', function() { }); // Check the old version displays as what it is. cy.loginAs(activeUser) - cy.visit(`/collections/${oldVersionUuid}`); + cy.doSearch(`${oldVersionUuid}`); + 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); cy.get('[data-cy=collection-files-panel]').should('contain', 'bar'); }); }); + + it('uses the collection version browser to view a previous version', function() { + const colName = `Test Collection ${Math.floor(Math.random() * 999999)}`; + + // Creates the collection using the admin token so we can set up + // a bogus manifest text without block signatures. + 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.doSearch(`${this.collection.uuid}`); + + 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'); + cy.get('[data-cy=collection-info-panel]').should('contain', colName); + cy.get('[data-cy=collection-files-panel]').should('contain', 'foo').and('contain', 'bar'); + + // Modify collection, expect version number change + cy.get('[data-cy=collection-files-panel]').contains('foo').rightclick(); + cy.get('[data-cy=context-menu]').contains('Remove').click(); + cy.get('[data-cy=confirmation-dialog]').should('contain', 'Removing file'); + cy.get('[data-cy=confirmation-dialog-ok-btn]').click(); + cy.get('[data-cy=collection-version-number]').should('contain', '2'); + cy.get('[data-cy=collection-files-panel]').should('not.contain', 'foo').and('contain', 'bar'); + + // Click on version number, check version browser. Click on past version. + cy.get('[data-cy=collection-version-browser]').should('not.exist'); + cy.get('[data-cy=collection-version-number]').contains('2').click(); + cy.get('[data-cy=collection-version-browser]') + .should('contain', 'Nr').and('contain', 'Size').and('contain', 'Date') + .within(() => { + // Version 1: 6 bytes in size + cy.get('[data-cy=collection-version-browser-select-1]') + .should('contain', '1').and('contain', '6 B'); + // Version 2: 3 bytes in size (one file removed) + cy.get('[data-cy=collection-version-browser-select-2]') + .should('contain', '2').and('contain', '3 B'); + cy.get('[data-cy=collection-version-browser-select-3]') + .should('not.exist'); + cy.get('[data-cy=collection-version-browser-select-1]') + .click(); + }); + 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-version-number]').should('contain', '1'); + cy.get('[data-cy=collection-info-panel]').should('contain', colName); + 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', 'Restore 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]') + .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', '2'); + cy.get('[data-cy=collection-info-panel]').should('contain', colName); + 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', 'Restore 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(); + cy.get('[data-cy=form-dialog]') + .should('contain', 'Edit Collection') + .within(() => { + // appends some text + cy.get('input').first().type(' renamed'); + }); + cy.get('[data-cy=form-submit-btn]').click(); + 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', '3'); + cy.get('[data-cy=collection-info-panel]').should('contain', colName + ' renamed'); + cy.get('[data-cy=collection-files-panel]') + .should('not.contain', 'foo').and('contain', 'bar'); + 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('not.contain', 'Add to favorites') + .and('contain', 'Make a copy') + .and('not.contain', 'Edit collection'); + cy.get('body').click(); + + // Restore 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('Restore version').click(); + cy.get('[data-cy=confirmation-dialog]').should('contain', 'Restore version'); + cy.get('[data-cy=confirmation-dialog-ok-btn]').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'); + }); + }); })