From: Lucas Di Pentima Date: Mon, 20 Dec 2021 16:21:36 +0000 (-0300) Subject: 18219: Updates tests on property edition. X-Git-Tag: 2.4.0~21^2~6 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/06eb8bc68a992559581124342faae0044f1b0406 18219: Updates tests on property edition. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js index 03ec1b58..c509bfbf 100644 --- a/cypress/integration/collection.spec.js +++ b/cypress/integration/collection.spec.js @@ -750,7 +750,7 @@ describe('Collection panel tests', function () { }); }); - it('creates new collection on home project', function () { + it('creates new collection with properties on home project', function () { cy.loginAs(activeUser); cy.goToPath(`/projects/${activeUser.user.uuid}`); cy.get('[data-cy=breadcrumb-first]').should('contain', 'Projects'); @@ -760,6 +760,8 @@ describe('Collection panel tests', function () { cy.get('[data-cy=side-panel-new-collection]').click(); // Name between brackets tests bugfix #17582 const collName = `[Test collection (${Math.floor(999999 * Math.random())})]`; + + // Select a storage class. cy.get('[data-cy=form-dialog]') .should('contain', 'New collection') .and('contain', 'Storage classes') @@ -775,15 +777,42 @@ describe('Collection panel tests', function () { }); cy.get('[data-cy=checkbox-foo]').click(); }) + + // Add a property. + // Key: Color (IDTAGCOLORS) - Value: Magenta (IDVALCOLORS3) + cy.get('[data-cy=form-dialog]').should('not.contain', 'Color: Magenta'); + 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'); + cy.get('[data-cy=form-submit-btn]').click(); - // Confirm that the user was taken to the newly created thing + // Confirm that the user was taken to the newly created collection 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('contain', 'Color: Magenta') .and('not.contain', 'bar'); + // Confirm that the collection's properties has the real values. + cy.doRequest('GET', '/arvados/v1/collections', null, { + filters: `[["name", "=", "${collName}"]]`, + }) + .its('body.items').as('collections') + .then(function() { + expect(this.collections).to.have.lengthOf(1); + expect(this.collections[0].properties).to.have.property( + 'IDTAGCOLORS', 'IDVALCOLORS3'); + }); }); it('shows responsible person for collection if available', () => { diff --git a/cypress/integration/project.spec.js b/cypress/integration/project.spec.js index 3ffdcc2d..3678b78a 100644 --- a/cypress/integration/project.spec.js +++ b/cypress/integration/project.spec.js @@ -42,6 +42,7 @@ describe('Project tests', function() { }); // Key: Color (IDTAGCOLORS) - Value: Magenta (IDVALCOLORS3) + cy.get('[data-cy=form-dialog]').should('not.contain', 'Color: Magenta'); cy.get('[data-cy=resource-properties-form]').within(() => { cy.get('[data-cy=property-field-key]').within(() => { cy.get('input').type('Color'); diff --git a/src/views-components/context-menu/action-sets/collection-files-action-set.ts b/src/views-components/context-menu/action-sets/collection-files-action-set.ts index 59a5f368..f34f2868 100644 --- a/src/views-components/context-menu/action-sets/collection-files-action-set.ts +++ b/src/views-components/context-menu/action-sets/collection-files-action-set.ts @@ -4,7 +4,11 @@ import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set"; import { collectionPanelFilesAction, openMultipleFilesRemoveDialog } from "store/collection-panel/collection-panel-files/collection-panel-files-actions"; -import { openCollectionPartialCopyDialog, openCollectionPartialCopyToSelectedCollectionDialog } from 'store/collections/collection-partial-copy-actions'; +import { + openCollectionPartialCopyDialog, + // Disabled while addressing #18587 + // openCollectionPartialCopyToSelectedCollectionDialog +} from 'store/collections/collection-partial-copy-actions'; // These action sets are used on the multi-select actions button. export const readOnlyCollectionFilesActionSet: ContextMenuActionSet = [[