From f024fc6c50ad0473674ebb6e30ab227b98c5b661 Mon Sep 17 00:00:00 2001
From: Lucas Di Pentima <lucas.dipentima@curii.com>
Date: Tue, 4 Jan 2022 13:19:51 -0300
Subject: [PATCH] 18219: Fixes tests.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>
---
 cypress/integration/collection.spec.js        | 24 ++++++++-----------
 .../details-panel/collection-details.tsx      |  4 ++--
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js
index 32c1320b..51933887 100644
--- a/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@ -120,7 +120,7 @@ describe('Collection panel tests', function () {
             });
     });
 
-    it('uses the property editor (from details panel) with vocabulary terms', function () {
+    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,
@@ -139,7 +139,7 @@ describe('Collection panel tests', function () {
                 cy.get('[data-cy=details-panel]').within(() => {
                     cy.get('[data-cy=details-panel-edit-btn]').click();
                 });
-                cy.get('[data-cy=resource-properties-dialog').contains('Edit properties');
+                cy.get('[data-cy=form-dialog').contains('Edit Collection');
 
                 // Key: Color (IDTAGCOLORS) - Value: Magenta (IDVALCOLORS3)
                 cy.get('[data-cy=resource-properties-form]').within(() => {
@@ -152,14 +152,8 @@ 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', 'Color: 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.IDTAGCOLORS).to.equal('IDVALCOLORS3');
-                    });
 
                 // Case-insensitive on-blur auto-selection test
                 // Key: Size (IDTAGSIZES) - Value: Small (IDVALSIZES2)
@@ -176,19 +170,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')
diff --git a/src/views-components/details-panel/collection-details.tsx b/src/views-components/details-panel/collection-details.tsx
index 7f35ca65..f2b599e7 100644
--- a/src/views-components/details-panel/collection-details.tsx
+++ b/src/views-components/details-panel/collection-details.tsx
@@ -98,8 +98,8 @@ const CollectionInfo = withStyles(styles)(
     connect(ciMapStateToProps, ciMapDispatchToProps)(
         ({ currentCollection, editCollection, classes }: CollectionInfoProps) =>
             currentCollection !== undefined
-                ? <div data-cy='details-panel-edit-btn'>
-                    <Button onClick={() => editCollection(currentCollection)}>
+                ? <div>
+                    <Button data-cy='details-panel-edit-btn' onClick={() => editCollection(currentCollection)}>
                         <RenameIcon className={classes.editIcon} /> Edit
                     </Button>
                     <CollectionDetailsAttributes twoCol={false} item={currentCollection} />
-- 
2.30.2