X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/645ea9356ef315154681d093cd6a42c1a8984e12..20063f6f7bb9ad7c6a9a0b49b3c5ba4b0abc532e:/cypress/integration/collection.spec.js?ds=sidebyside diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js index b3f06d10c8..308ce5f76b 100644 --- a/cypress/integration/collection.spec.js +++ b/cypress/integration/collection.spec.js @@ -40,18 +40,36 @@ describe('Collection panel tests', function () { }) .as('testCollection').then(function (testCollection) { cy.loginAs(activeUser); - cy.doSearch(`${testCollection.uuid}`); + 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=download-button').click(); const filename = path.join(downloadsFolder, `${testCollection.name}.duck`); - const expectedValue = 'ProtocoldavsProvideriterateGmbHUUIDzzzzz-4zz18-oehuaangyo2timvHostname0.0.0.0Port40041Usernamecollectionuser1Labels'; cy.readFile(filename, { timeout: 15000 }) - .then((str) => { - expect(str.replaceAll(' ', '').replaceAll('\n', ''), expectedValue); + .then((body) => { + const childrenCollection = Array.prototype.slice.call(Cypress.$(body).find('dict')[0].children); + const map = {}; + let i, j = 2; + + for (i=0; i < childrenCollection.length; i += j) { + map[childrenCollection[i].outerText] = childrenCollection[i + 1].outerText; + } + + cy.get('#simple-tabpanel-0').find('a') + .then((a) => { + const [host, port] = a.text().split('@')[1].split('/')[0].split(':'); + expect(map['Protocol']).to.equal('davs'); + expect(map['UUID']).to.equal(testCollection.uuid); + expect(map['Username']).to.equal(activeUser.user.username); + expect(map['Port']).to.equal(port); + expect(map['Hostname']).to.equal(host); + if (map['Path']) { + expect(map['Path']).to.equal(`/c=${testCollection.uuid}`); + } + }); }) .then(() => cy.task('clearDownload', { filename })); }); @@ -65,7 +83,7 @@ describe('Collection panel tests', function () { }) .as('testCollection').then(function () { cy.loginAs(activeUser); - cy.doSearch(`${this.testCollection.uuid}`); + cy.goToPath(`/collections/${this.testCollection.uuid}`); // Key: Color (IDTAGCOLORS) - Value: Magenta (IDVALCOLORS3) cy.get('[data-cy=resource-properties-form]').within(() => { @@ -85,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'); }); }); }); @@ -98,6 +115,7 @@ describe('Collection panel tests', function () { // on this loop may pass an assertion from the first iteration by looking // for the same file name. const fileName = isWritable ? 'bar' : 'foo'; + const subDirName = 'subdir'; cy.createGroup(adminUser.token, { name: 'Shared project', group_class: 'project', @@ -108,7 +126,7 @@ describe('Collection panel tests', function () { name: 'Test collection', owner_uuid: this.sharedGroup.uuid, properties: { someKey: 'someValue' }, - manifest_text: `. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n` + manifest_text: `. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n./${subDirName} 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n` }) .as('testCollection').then(function () { // Share the group with active user. @@ -118,7 +136,7 @@ describe('Collection panel tests', function () { head_uuid: this.sharedGroup.uuid, tail_uuid: activeUser.user.uuid }) - cy.doSearch(`${this.testCollection.uuid}`); + cy.goToPath(`/collections/${this.testCollection.uuid}`); // Check that name & uuid are correct. cy.get('[data-cy=collection-info-panel]') @@ -166,6 +184,7 @@ describe('Collection panel tests', function () { .should(`${isWritable ? '' : 'not.'}contain`, 'Upload data'); } }); + // Test context menus cy.get('[data-cy=collection-files-panel]') .contains(fileName).rightclick({ force: true }); cy.get('[data-cy=context-menu]') @@ -175,6 +194,15 @@ describe('Collection panel tests', function () { .and(`${isWritable ? '' : 'not.'}contain`, 'Rename') .and(`${isWritable ? '' : 'not.'}contain`, 'Remove'); cy.get('body').click(); // Collapse the menu + cy.get('[data-cy=collection-files-panel]') + .contains(subDirName).rightclick({ force: true }); + cy.get('[data-cy=context-menu]') + .should('not.contain', 'Download') + .and('contain', 'Open in new tab') + .and('contain', 'Copy to clipboard') + .and(`${isWritable ? '' : 'not.'}contain`, 'Rename') + .and(`${isWritable ? '' : 'not.'}contain`, 'Remove'); + cy.get('body').click(); // Collapse the menu // Hamburger 'more options' menu button cy.get('[data-cy=collection-files-panel-options-btn]') .click() @@ -184,16 +212,8 @@ describe('Collection panel tests', function () { cy.get('[data-cy=collection-files-panel-options-btn]') .click() cy.get('[data-cy=context-menu]') - // .should('contain', 'Download selected') .should(`${isWritable ? '' : 'not.'}contain`, 'Remove selected') cy.get('body').click(); // Collapse the menu - // File item 'more options' button - cy.get('[data-cy=file-item-options-btn') - .click() - cy.get('[data-cy=context-menu]') - .should('contain', 'Download') - .and(`${isWritable ? '' : 'not.'}contain`, 'Remove'); - cy.get('body').click(); // Collapse the menu }) }) }) @@ -214,7 +234,7 @@ describe('Collection panel tests', function () { }) .as('testCollection').then(function () { cy.loginAs(activeUser); - cy.doSearch(`${this.testCollection.uuid}`); + cy.goToPath(`/collections/${this.testCollection.uuid}`); const names = [ 'bar', // initial name already set @@ -247,7 +267,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]') @@ -267,7 +289,7 @@ describe('Collection panel tests', function () { }) .as('testCollection').then(function () { cy.loginAs(activeUser); - cy.doSearch(`${this.testCollection.uuid}`); + cy.goToPath(`/collections/${this.testCollection.uuid}`); ['subdir', 'G%C3%BCnter\'s%20file', 'table%&?*2'].forEach((subdir) => { cy.get('[data-cy=collection-files-panel]') @@ -324,7 +346,7 @@ describe('Collection panel tests', function () { }) .as('testCollection').then(function () { cy.loginAs(activeUser); - cy.doSearch(`${this.testCollection.uuid}`); + cy.goToPath(`/collections/${this.testCollection.uuid}`); const illegalNamesFromUI = [ ['.', "Name cannot be '.' or '..'"], @@ -400,7 +422,7 @@ describe('Collection panel tests', function () { }); // Check the old version displays as what it is. cy.loginAs(activeUser) - cy.doSearch(`${oldVersionUuid}`); + cy.goToPath(`/collections/${oldVersionUuid}`); cy.get('[data-cy=collection-info-panel]').should('contain', 'This is an old version'); cy.get('[data-cy=read-only-icon]').should('exist'); @@ -409,6 +431,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)}`; @@ -423,7 +510,7 @@ describe('Collection panel tests', function () { .as('collection').then(function () { // Visit collection, check basic information cy.loginAs(activeUser) - cy.doSearch(`${this.collection.uuid}`); + cy.goToPath(`/collections/${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'); @@ -539,13 +626,14 @@ describe('Collection panel tests', function () { it('creates new collection on home project', function () { cy.loginAs(activeUser); - cy.doSearch(`${activeUser.user.uuid}`); + cy.goToPath(`/projects/${activeUser.user.uuid}`); cy.get('[data-cy=breadcrumb-first]').should('contain', 'Projects'); cy.get('[data-cy=breadcrumb-last]').should('not.exist'); // 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') .within(() => { @@ -562,4 +650,35 @@ describe('Collection panel tests', function () { cy.get('[data-cy=breadcrumb-first]').should('contain', 'Projects'); cy.get('[data-cy=breadcrumb-last]').should('contain', collName); }); + + 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); + }); + }); })