X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/06eb8bc68a992559581124342faae0044f1b0406..a5c0b139afe945ea8126fa079556a50ab8ea24e8:/cypress/integration/collection.spec.js diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js index c509bfbf..af4aa2b0 100644 --- a/cypress/integration/collection.spec.js +++ b/cypress/integration/collection.spec.js @@ -75,7 +75,56 @@ describe('Collection panel tests', function () { }); }); - it('uses the property editor with vocabulary terms', function () { + it('attempts to use a preexisting name creating or updating a collection', function() { + const name = `Test collection ${Math.floor(Math.random() * 999999)}`; + cy.createCollection(adminUser.token, { + name: name, + owner_uuid: activeUser.user.uuid, + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" + }); + cy.loginAs(activeUser); + cy.goToPath(`/projects/${activeUser.user.uuid}`); + cy.get('[data-cy=breadcrumb-first]').should('contain', 'Projects'); + cy.get('[data-cy=breadcrumb-last]').should('not.exist'); + // Attempt to create new collection with a duplicate name + cy.get('[data-cy=side-panel-button]').click(); + cy.get('[data-cy=side-panel-new-collection]').click(); + cy.get('[data-cy=form-dialog]') + .should('contain', 'New collection') + .within(() => { + cy.get('[data-cy=name-field]').within(() => { + cy.get('input').type(name); + }); + cy.get('[data-cy=form-submit-btn]').click(); + }); + // Error message should display, allowing editing the name + cy.get('[data-cy=form-dialog]').should('exist') + .and('contain', 'Collection with the same name already exists') + .within(() => { + cy.get('[data-cy=name-field]').within(() => { + cy.get('input').type(' renamed'); + }); + cy.get('[data-cy=form-submit-btn]').click(); + }); + cy.get('[data-cy=form-dialog]').should('not.exist'); + // Attempt to rename the collection with the duplicate name + 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(() => { + cy.get('[data-cy=name-field]').within(() => { + cy.get('input') + .type('{selectall}{backspace}') + .type(name); + }); + cy.get('[data-cy=form-submit-btn]').click(); + }); + cy.get('[data-cy=form-dialog]').should('exist') + .and('contain', 'Collection with the same name already exists'); + }); + + it('uses the property editor (from edit dialog) with vocabulary terms', function () { cy.createCollection(adminUser.token, { name: `Test collection ${Math.floor(Math.random() * 999999)}`, owner_uuid: activeUser.user.uuid, @@ -87,14 +136,11 @@ describe('Collection panel tests', function () { cy.get('[data-cy=collection-info-panel') .should('contain', this.testCollection.name) - .and('not.contain', 'Color: Magenta') - .and('not.contain', 'Size: S'); - cy.get('[data-cy=additional-info-icon]').click(); + .and('not.contain', 'Color: Magenta'); - cy.get('[data-cy=details-panel]').within(() => { - cy.get('[data-cy=property-editor-btn]').click(); - }); - cy.get('[data-cy=resource-properties-dialog').contains('Edit properties'); + 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', 'Properties'); // Key: Color (IDTAGCOLORS) - Value: Magenta (IDVALCOLORS3) cy.get('[data-cy=resource-properties-form]').within(() => { @@ -107,14 +153,56 @@ describe('Collection panel tests', function () { cy.root().submit(); }); // Confirm proper vocabulary labels are displayed on the UI. - cy.get('[data-cy=resource-properties-dialog]') - .should('contain', 'Color: Magenta'); + cy.get('[data-cy=form-dialog]').should('contain', 'Color: Magenta'); + cy.get('[data-cy=form-dialog]').contains('Save').click(); + cy.get('[data-cy=form-dialog]').should('not.exist'); // 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.IDTAGCOLORS).to.equal('IDVALCOLORS3'); }); + // Confirm the property is displayed on the UI. + cy.get('[data-cy=collection-info-panel') + .should('contain', this.testCollection.name) + .and('contain', 'Color: Magenta'); + }); + }); + + it('uses the editor (from details panel) 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.goToPath(`/collections/${this.testCollection.uuid}`); + + cy.get('[data-cy=collection-info-panel') + .should('contain', this.testCollection.name) + .and('not.contain', 'Color: Magenta') + .and('not.contain', 'Size: S'); + cy.get('[data-cy=additional-info-icon]').click(); + + cy.get('[data-cy=details-panel]').within(() => { + cy.get('[data-cy=details-panel-edit-btn]').click(); + }); + cy.get('[data-cy=form-dialog').contains('Edit Collection'); + + // Key: Color (IDTAGCOLORS) - Value: Magenta (IDVALCOLORS3) + cy.get('[data-cy=resource-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=form-dialog]') + .should('contain', 'Color: Magenta'); // Case-insensitive on-blur auto-selection test // Key: Size (IDTAGSIZES) - Value: Small (IDVALSIZES2) @@ -131,19 +219,21 @@ describe('Collection panel tests', function () { cy.root().submit(); }); // Confirm proper vocabulary labels are displayed on the UI. - cy.get('[data-cy=resource-properties-dialog]') + cy.get('[data-cy=form-dialog]') .should('contain', 'Size: S'); + + cy.get('[data-cy=form-dialog]').contains('Save').click(); + cy.get('[data-cy=form-dialog]').should('not.exist'); + // 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.IDTAGCOLORS).to.equal('IDVALCOLORS3'); expect(this.collection.properties.IDTAGSIZES).to.equal('IDVALSIZES2'); }); - // Close property editor & confirm properties display on the UI. - cy.get('[data-cy=resource-properties-dialog]').within(() => { - cy.get('[data-cy=close-dialog-btn]').click(); - }); + // Confirm properties display on the UI. cy.get('[data-cy=collection-info-panel') .should('contain', this.testCollection.name) .and('contain', 'Color: Magenta') @@ -167,7 +257,7 @@ describe('Collection panel tests', function () { // a bogus manifest text without block signatures. cy.doRequest('GET', '/arvados/v1/config', null, null) .its('body').should((clusterConfig) => { - expect(clusterConfig.Collections, "clusterConfig").to.have.property("TrustAllContent", false); + expect(clusterConfig.Collections, "clusterConfig").to.have.property("TrustAllContent", true); expect(clusterConfig.Services, "clusterConfig").to.have.property("WebDAV").have.property("ExternalURL"); expect(clusterConfig.Services, "clusterConfig").to.have.property("WebDAVDownload").have.property("ExternalURL"); const inlineUrl = clusterConfig.Services.WebDAV.ExternalURL !== "" @@ -210,9 +300,9 @@ describe('Collection panel tests', function () { .should('contain', 'someKey: someValue') .and('not.contain', 'anotherKey: anotherValue'); // 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); + cy.waitForDom().get('[data-cy=collection-files-panel]').within(() => { + cy.get('[data-cy=collection-files-right-panel]', { timeout: 5000 }) + .should('contain', fileName); if (isWritable) { cy.get('[data-cy=upload-button]') .should(`${isWritable ? '' : 'not.'}contain`, 'Upload data'); @@ -220,23 +310,30 @@ describe('Collection panel tests', function () { }); // Test context menus cy.get('[data-cy=collection-files-panel]') - .contains(fileName).rightclick({ force: true }); + .contains(fileName).rightclick(); cy.get('[data-cy=context-menu]') .should('contain', 'Download') - .and('not.contain', 'Open in new tab') + .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 cy.get('[data-cy=collection-files-panel]') - .contains(subDirName).rightclick({ force: true }); + .contains(subDirName).rightclick(); cy.get('[data-cy=context-menu]') .should('not.contain', 'Download') - .and('not.contain', 'Open in new tab') + .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 + // File/dir item 'more options' button + cy.get('[data-cy=file-item-options-btn') + .first() + .click() + cy.get('[data-cy=context-menu]') + .should(`${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() @@ -293,7 +390,7 @@ describe('Collection panel tests', function () { 'bar' // make sure we can go back to the original name as a last step ]; eachPair(names, (from, to) => { - cy.get('[data-cy=collection-files-panel]') + cy.waitForDom().get('[data-cy=collection-files-panel]') .contains(`${from}`).rightclick(); cy.get('[data-cy=context-menu]') .contains('Rename') @@ -326,8 +423,8 @@ describe('Collection panel tests', function () { 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.waitForDom().get('[data-cy=collection-files-panel]') + .contains('bar').rightclick(); cy.get('[data-cy=context-menu]') .contains('Rename') .click(); @@ -340,9 +437,9 @@ describe('Collection panel tests', function () { 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' + + // Rename 'subdir/foo' to 'bar' cy.wait(1000); cy.get('[data-cy=collection-files-panel]') .contains('foo').rightclick(); @@ -358,8 +455,10 @@ describe('Collection panel tests', function () { }); cy.get('[data-cy=form-submit-btn]').click(); - cy.wait(1000); - cy.get('[data-cy=collection-files-panel]') + // need to wait for dialog to dismiss + cy.get('[data-cy=form-dialog]').should('not.exist'); + + cy.waitForDom().get('[data-cy=collection-files-panel]') .contains('Home') .click(); @@ -374,10 +473,25 @@ describe('Collection panel tests', function () { .contains('Remove') .click(); cy.get('[data-cy=confirmation-dialog-ok-btn]').click(); + cy.get('[data-cy=form-dialog]').should('not.exist'); }); }); }); + it('shows collection owner', () => { + 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((testCollection) => { + cy.loginAs(activeUser); + cy.goToPath(`/collections/${testCollection.uuid}`); + cy.wait(5000); + cy.get('[data-cy=collection-info-panel]').contains(`Collection User`); + }); + }); + 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. @@ -567,9 +681,10 @@ describe('Collection panel tests', function () { cy.get('[data-cy=form-dialog]') .should('contain', 'Move to') .within(() => { + // must use .then to avoid selecting instead of expanding https://github.com/cypress-io/cypress/issues/5529 cy.get('[data-cy=projects-tree-home-tree-picker]') .find('i') - .click(); + .then(el => el.click()); cy.get('[data-cy=projects-tree-home-tree-picker]') .contains(projName) .click(); @@ -581,8 +696,48 @@ describe('Collection panel tests', function () { .contains(projName).and('contain', testProject.uuid); // Double check that the collection is in the project cy.goToPath(`/projects/${testProject.uuid}`); - cy.get('[data-cy=project-panel]').should('contain', collName); + cy.waitForDom().get('[data-cy=project-panel]').should('contain', collName); + }); + }); + + it('automatically updates the collection UI contents without using the Refresh button', function () { + const collName = `Test Collection ${Math.floor(Math.random() * 999999)}`; + + cy.createCollection(adminUser.token, { + name: collName, + owner_uuid: activeUser.user.uuid, + }).as('testCollection'); + + cy.getAll('@testCollection').then(function ([testCollection]) { + cy.loginAs(activeUser); + + const files = [ + "foobar", + "anotherFile", + "", + "finalName", + ]; + + cy.goToPath(`/collections/${testCollection.uuid}`); + cy.get('[data-cy=collection-files-panel]').should('contain', 'This collection is empty'); + cy.get('[data-cy=collection-files-panel]').should('not.contain', files[0]); + cy.get('[data-cy=collection-info-panel]').should('contain', collName); + + files.map((fileName, i, files) => { + cy.updateCollection(adminUser.token, testCollection.uuid, { + name: `${collName + ' updated'}`, + manifest_text: fileName ? `. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n` : "", + }).as('updatedCollection'); + cy.getAll('@updatedCollection').then(function ([updatedCollection]) { + expect(updatedCollection.name).to.equal(`${collName + ' updated'}`); + cy.get('[data-cy=collection-info-panel]').should('contain', updatedCollection.name); + fileName + ? cy.get('[data-cy=collection-files-panel]').should('contain', fileName) + : cy.get('[data-cy=collection-files-panel]').should('not.contain', files[i-1]);; + }); }); + + }); }); it('makes a copy of an existing collection', function() { @@ -750,6 +905,35 @@ describe('Collection panel tests', function () { }); }); + it('creates collection from selected files of another collection', () => { + cy.createCollection(adminUser.token, { + name: `Test Collection ${Math.floor(Math.random() * 999999)}`, + 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.goToPath(`/collections/${this.collection.uuid}`); + + cy.get('[data-cy=collection-files-panel]').within(() => { + cy.get('input[type=checkbox]').first().click(); + }); + + cy.get('[data-cy=collection-files-panel-options-btn]').click(); + cy.get('[data-cy=context-menu]').contains('Create a new collection with selected').click(); + + cy.get('[data-cy=form-dialog]').contains('Projects').click(); + + cy.get('[data-cy=form-submit-btn]').click(); + + cy.waitForDom().get('.layout-pane-primary', { timeout: 12000 }).contains('Projects').click(); + + cy.get('main').contains(`Files extracted from: ${this.collection.name}`).should('exist'); + }); + }); + it('creates new collection with properties on home project', function () { cy.loginAs(activeUser); cy.goToPath(`/projects/${activeUser.user.uuid}`); @@ -793,6 +977,10 @@ describe('Collection panel tests', function () { // Confirm proper vocabulary labels are displayed on the UI. cy.get('[data-cy=form-dialog]').should('contain', 'Color: Magenta'); + // Value field should not complain about being required just after + // adding a new property. See #19732 + cy.get('[data-cy=form-dialog]').should('not.contain', 'This field is required'); + cy.get('[data-cy=form-submit-btn]').click(); // Confirm that the user was taken to the newly created collection cy.get('[data-cy=form-dialog]').should('not.exist'); @@ -820,17 +1008,15 @@ describe('Collection panel tests', function () { name: `Test collection ${Math.floor(Math.random() * 999999)}`, owner_uuid: activeUser.user.uuid, manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" - }) - .as('testCollection1'); + }).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'); - }); + }).as('testCollection2').then(function (testCollection2) { + cy.shareWith(adminUser.token, activeUser.user.uuid, testCollection2.uuid, 'can_write'); + }); cy.getAll('@testCollection1', '@testCollection2') .then(function ([testCollection1, testCollection2]) { @@ -851,9 +1037,41 @@ describe('Collection panel tests', 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('testCollection1'); + manifest_text: "./subdir 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo\n. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" + }).as('testCollection1'); + }); + + it.only('uploads a file and checks the collection UI to be fresh', () => { + cy.getAll('@testCollection1') + .then(function([testCollection1]) { + cy.loginAs(activeUser); + cy.goToPath(`/collections/${testCollection1.uuid}`); + cy.get('[data-cy=upload-button]').click(); + cy.get('[data-cy=collection-files-panel]') + .contains('5mb_a.bin').should('not.exist'); + cy.get('[data-cy=collection-file-count]').should('contain', '2'); + cy.fixture('files/5mb.bin', 'base64').then(content => { + cy.get('[data-cy=drag-and-drop]').upload(content, '5mb_a.bin'); + cy.get('[data-cy=form-submit-btn]').click(); + cy.get('[data-cy=form-submit-btn]').should('not.exist'); + cy.get('[data-cy=collection-files-panel]') + .contains('5mb_a.bin').should('exist'); + cy.get('[data-cy=collection-file-count]').should('contain', '3'); + + cy.get('[data-cy=collection-files-panel]').contains('subdir').click(); + cy.get('[data-cy=upload-button]').click(); + cy.fixture('files/5mb.bin', 'base64').then(content => { + cy.get('[data-cy=drag-and-drop]').upload(content, '5mb_b.bin'); + cy.get('[data-cy=form-submit-btn]').click(); + cy.waitForDom().get('[data-cy=form-submit-btn]').should('not.exist'); + // subdir gets unselected, I think this is a bug but + // for the time being let's just make sure the test works. + cy.get('[data-cy=collection-files-panel]').contains('subdir').click(); + cy.waitForDom().get('[data-cy=collection-files-right-panel]') + .contains('5mb_b.bin').should('exist'); + }); + }); + }); }); it('allows to cancel running upload', () => { @@ -909,6 +1127,14 @@ describe('Collection panel tests', function () { cy.goToPath(`/collections/${testCollection1.uuid}`); + // Confirm initial collection state. + cy.get('[data-cy=collection-files-panel]') + .contains('bar').should('exist'); + cy.get('[data-cy=collection-files-panel]') + .contains('5mb_a.bin').should('not.exist'); + cy.get('[data-cy=collection-files-panel]') + .contains('5mb_b.bin').should('not.exist'); + cy.get('[data-cy=upload-button]').click(); cy.fixture('files/5mb.bin', 'base64').then(content => { @@ -918,9 +1144,25 @@ describe('Collection panel tests', function () { cy.get('[data-cy=form-submit-btn]').click(); cy.get('button[aria-label=Remove]').should('exist'); - cy.get('button[aria-label=Remove]').click({ multiple: true, force: true }); + cy.get('button[aria-label=Remove]') + .click({ multiple: true, force: true }); cy.get('[data-cy=form-submit-btn]').should('not.exist'); + + // Confirm final collection state. + cy.get('[data-cy=collection-files-panel]') + .contains('bar').should('exist'); + // The following fails, but doesn't seem to happen + // in the real world. Maybe there's a race between + // the PUT request finishing and the 'Remove' button + // dissapearing, because sometimes just one of the 2 + // files gets uploaded. + // Maybe this will be needed to simulate a slow network: + // https://docs.cypress.io/api/commands/intercept#Convenience-functions-1 + // cy.get('[data-cy=collection-files-panel]') + // .contains('5mb_a.bin').should('not.exist'); + // cy.get('[data-cy=collection-files-panel]') + // .contains('5mb_b.bin').should('not.exist'); }); }); });