X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/beacdc4d38efb1880aaa14e8b3985e683d14e457..9054e09b4751fb7dfb2fa8837f5febb8da5a7eb8:/cypress/integration/collection.spec.js diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js index 15170076..bf2375d0 100644 --- a/cypress/integration/collection.spec.js +++ b/cypress/integration/collection.spec.js @@ -43,7 +43,7 @@ describe('Collection panel tests', function () { cy.goToPath(`/collections/${testCollection.uuid}`); cy.get('[data-cy=collection-panel-options-btn]').click(); - cy.get('[data-cy=context-menu]').contains('Open as network folder or S3 bucket').click(); + cy.get('[data-cy=context-menu]').contains('Open with 3rd party client').click(); cy.get('[data-cy=download-button').click(); const filename = path.join(downloadsFolder, `${testCollection.name}.duck`); @@ -103,8 +103,7 @@ describe('Collection panel tests', function () { cy.doRequest('GET', `/arvados/v1/collections/${this.testCollection.uuid}`) .its('body').as('collection') .then(function () { - expect(this.collection.properties).to.deep.equal( - { IDTAGCOLORS: 'IDVALCOLORS3' }); + expect(this.collection.properties.IDTAGCOLORS).to.equal('IDVALCOLORS3'); }); }); }); @@ -179,6 +178,7 @@ describe('Collection panel tests', function () { } // Check that the file listing show both read & write operations cy.get('[data-cy=collection-files-panel]').within(() => { + cy.wait(1000); cy.root().should('contain', fileName); if (isWritable) { cy.get('[data-cy=upload-button]') @@ -268,7 +268,9 @@ describe('Collection panel tests', function () { cy.get('[data-cy=form-dialog]') .should('contain', 'Rename') .within(() => { - cy.get('input').type(`{selectall}{backspace}${to}`); + cy.get('input') + .type('{selectall}{backspace}') + .type(to, { parseSpecialCharSequences: false }); }); cy.get('[data-cy=form-submit-btn]').click(); cy.get('[data-cy=collection-files-panel]') @@ -278,7 +280,7 @@ describe('Collection panel tests', function () { }); }); - it('renames a file to a different directory', function () { + it.skip('renames a file to a different directory', function () { // Creates the collection using the admin token so we can set up // a bogus manifest text without block signatures. cy.createCollection(adminUser.token, { @@ -335,6 +337,71 @@ describe('Collection panel tests', function () { }); }); + it('renames a file to a different directory', function () { + // Creates the collection using the admin token so we can set up + // a bogus manifest text without block signatures. + 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.goToPath(`/collections/${this.testCollection.uuid}`); + + ['subdir', 'G%C3%BCnter\'s%20file', 'table%&?*2'].forEach((subdir) => { + cy.get('[data-cy=collection-files-panel]') + .contains('bar').rightclick({force: true}); + 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}${subdir}/foo`); + }); + cy.get('[data-cy=form-submit-btn]').click(); + cy.get('[data-cy=collection-files-panel]') + .should('not.contain', 'bar') + .and('contain', subdir); + cy.wait(1000); + cy.get('[data-cy=collection-files-panel]').contains(subdir).click(); + // Rename 'subdir/foo' to 'foo' + cy.wait(1000); + cy.get('[data-cy=collection-files-panel]') + .contains('foo').rightclick(); + cy.get('[data-cy=context-menu]') + .contains('Rename') + .click(); + cy.get('[data-cy=form-dialog]') + .should('contain', 'Rename') + .within(() => { + cy.get('input') + .should('have.value', `${subdir}/foo`) + .type(`{selectall}{backspace}bar`); + }); + cy.get('[data-cy=form-submit-btn]').click(); + + cy.wait(1000); + cy.get('[data-cy=collection-files-panel]') + .contains('Home') + .click(); + + cy.wait(2000); + cy.get('[data-cy=collection-files-panel]') + .should('contain', subdir) // empty dir kept + .and('contain', 'bar'); + + cy.get('[data-cy=collection-files-panel]') + .contains(subdir).rightclick(); + cy.get('[data-cy=context-menu]') + .contains('Remove') + .click(); + cy.get('[data-cy=confirmation-dialog-ok-btn]').click(); + }); + }); + }); + 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. @@ -430,6 +497,71 @@ describe('Collection panel tests', function () { }); }); + it('views & edits storage classes data', function () { + const colName= `Test Collection ${Math.floor(Math.random() * 999999)}`; + cy.createCollection(adminUser.token, { + name: colName, + owner_uuid: activeUser.user.uuid, + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:some-file\n", + }).as('collection').then(function () { + expect(this.collection.storage_classes_desired).to.deep.equal(['default']) + + cy.loginAs(activeUser) + cy.goToPath(`/collections/${this.collection.uuid}`); + + // Initial check: it should show the 'default' storage class + cy.get('[data-cy=collection-info-panel]') + .should('contain', 'Storage classes') + .and('contain', 'default') + .and('not.contain', 'foo') + .and('not.contain', 'bar'); + // Edit collection: add storage class 'foo' + 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') + .and('contain', 'Storage classes') + .and('contain', 'default') + .and('contain', 'foo') + .and('contain', 'bar') + .within(() => { + cy.get('[data-cy=checkbox-foo]').click(); + }); + cy.get('[data-cy=form-submit-btn]').click(); + cy.get('[data-cy=collection-info-panel]') + .should('contain', 'default') + .and('contain', 'foo') + .and('not.contain', 'bar'); + cy.doRequest('GET', `/arvados/v1/collections/${this.collection.uuid}`) + .its('body').as('updatedCollection') + .then(function () { + expect(this.updatedCollection.storage_classes_desired).to.deep.equal(['default', 'foo']); + }); + // Edit collection: remove storage class 'default' + 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') + .and('contain', 'Storage classes') + .and('contain', 'default') + .and('contain', 'foo') + .and('contain', 'bar') + .within(() => { + cy.get('[data-cy=checkbox-default]').click(); + }); + cy.get('[data-cy=form-submit-btn]').click(); + cy.get('[data-cy=collection-info-panel]') + .should('not.contain', 'default') + .and('contain', 'foo') + .and('not.contain', 'bar'); + cy.doRequest('GET', `/arvados/v1/collections/${this.collection.uuid}`) + .its('body').as('updatedCollection') + .then(function () { + expect(this.updatedCollection.storage_classes_desired).to.deep.equal(['foo']); + }); + }) + }); + it('uses the collection version browser to view a previous version', function () { const colName = `Test Collection ${Math.floor(Math.random() * 999999)}`; @@ -468,10 +600,14 @@ describe('Collection panel tests', function () { .within(() => { // Version 1: 6 bytes in size cy.get('[data-cy=collection-version-browser-select-1]') - .should('contain', '1').and('contain', '6 B'); + .should('contain', '1') + .and('contain', '6 B') + .and('contain', adminUser.user.uuid); // 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'); + .should('contain', '2') + .and('contain', '3 B') + .and('contain', activeUser.user.full_name); cy.get('[data-cy=collection-version-browser-select-3]') .should('not.exist'); cy.get('[data-cy=collection-version-browser-select-1]') @@ -566,21 +702,62 @@ describe('Collection panel tests', function () { // Create new collection cy.get('[data-cy=side-panel-button]').click(); cy.get('[data-cy=side-panel-new-collection]').click(); - const collName = `Test collection (${Math.floor(999999 * Math.random())})`; + // Name between brackets tests bugfix #17582 + const collName = `[Test collection (${Math.floor(999999 * Math.random())})]`; cy.get('[data-cy=form-dialog]') .should('contain', 'New collection') + .and('contain', 'Storage classes') + .and('contain', 'default') + .and('contain', 'foo') + .and('contain', 'bar') .within(() => { cy.get('[data-cy=parent-field]').within(() => { cy.get('input').should('have.value', 'Home project'); - }) + }); cy.get('[data-cy=name-field]').within(() => { cy.get('input').type(collName); - }) + }); + cy.get('[data-cy=checkbox-foo]').click(); }) cy.get('[data-cy=form-submit-btn]').click(); // Confirm that the user was taken to the newly created thing cy.get('[data-cy=form-dialog]').should('not.exist'); cy.get('[data-cy=breadcrumb-first]').should('contain', 'Projects'); cy.get('[data-cy=breadcrumb-last]').should('contain', collName); + cy.get('[data-cy=collection-info-panel]') + .should('contain', 'default') + .and('contain', 'foo') + .and('not.contain', 'bar'); + }); + + it('shows responsible person for collection if available', () => { + 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('testCollection1'); + + cy.createCollection(adminUser.token, { + name: `Test collection ${Math.floor(Math.random() * 999999)}`, + owner_uuid: adminUser.user.uuid, + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" + }) + .as('testCollection2').then(function (testCollection2) { + cy.shareWith(adminUser.token, activeUser.user.uuid, testCollection2.uuid, 'can_write'); + }); + + cy.getAll('@testCollection1', '@testCollection2') + .then(function ([testCollection1, testCollection2]) { + cy.loginAs(activeUser); + + cy.goToPath(`/collections/${testCollection1.uuid}`); + cy.get('[data-cy=responsible-person-wrapper]') + .contains(activeUser.user.uuid); + + cy.goToPath(`/collections/${testCollection2.uuid}`); + cy.get('[data-cy=responsible-person-wrapper]') + .contains(adminUser.user.uuid); + }); }); })