From: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
Date: Tue, 21 Jun 2022 09:16:57 +0000 (+0200)
Subject: Merge branch '18203-Support-setting-multi-properties-at-once' into main
X-Git-Tag: 2.5.0~50
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/765f6475a53ac7e635b737642ef375459324a117?hp=-c

Merge branch '18203-Support-setting-multi-properties-at-once' into main
closes #18203

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
---

765f6475a53ac7e635b737642ef375459324a117
diff --combined cypress/integration/collection.spec.js
index 1329191d,384b789f..fd8e65b2
--- a/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@@ -278,13 -278,6 +278,13 @@@ describe('Collection panel tests', func
                              .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()
@@@ -425,6 -418,20 +425,20 @@@
              });
      });
  
+     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.