X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a45fc1ed0f5e0385e3741cca6c0b48284ae6f8bb..8297f0f273e326e64145a48266805b0b3d073c32:/cypress/integration/favorites.spec.js

diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js
index 695812ca1a..eca35bc4e0 100644
--- a/cypress/integration/favorites.spec.js
+++ b/cypress/integration/favorites.spec.js
@@ -51,42 +51,40 @@ describe('Favorites tests', function () {
         });
     });
 
-    it.only('can copy collection to favorites', () => {
+    it('can copy collection to favorites', () => {
         cy.loginAs(adminUser);
 
         cy.createGroup(adminUser.token, {
             name: `my-shared-writable-project ${Math.floor(Math.random() * 999999)}`,
             group_class: 'project',
-        }).as('mySharedProject1').then(function () {
+        }).as('mySharedWritableProject').then(function (mySharedWritableProject) {
             cy.contains('Refresh').click();
-            cy.get('main').contains(this.mySharedProject1.name).rightclick();
+            cy.get('main').contains(mySharedWritableProject.name).rightclick();
             cy.get('[data-cy=context-menu]').within(() => {
                 cy.contains('Share').click();
             });
-            cy.wait(1000);
             cy.get('[id="select-permissions"]').as('selectPermissions');
             cy.get('@selectPermissions').click();
             cy.contains('Write').click();
             cy.get('.sharing-dialog').as('sharingDialog');
-            cy.get('@sharingDialog').find('input').first().type(activeUser.user.email);
+            cy.get('[data-cy=invite-people-field]').find('input').type(activeUser.user.email);
             cy.get('[role=tooltip]').click();
-            cy.get('@sharingDialog').find('button').last().click();
+            cy.get('@sharingDialog').contains('Save').click();
         });
 
         cy.createGroup(adminUser.token, {
             name: `my-shared-readonly-project ${Math.floor(Math.random() * 999999)}`,
             group_class: 'project',
-        }).as('mySharedProject2').then(function () {
+        }).as('mySharedReadonlyProject').then(function (mySharedReadonlyProject) {
             cy.contains('Refresh').click();
-            cy.get('main').contains(this.mySharedProject2.name).rightclick();
+            cy.get('main').contains(mySharedReadonlyProject.name).rightclick();
             cy.get('[data-cy=context-menu]').within(() => {
                 cy.contains('Share').click();
             });
-            cy.wait(1000);
             cy.get('.sharing-dialog').as('sharingDialog');
-            cy.get('@sharingDialog').find('input').first().type(activeUser.user.email);
+            cy.get('[data-cy=invite-people-field]').find('input').type(activeUser.user.email);
             cy.get('[role=tooltip]').click();
-            cy.get('@sharingDialog').find('button').last().click();
+            cy.get('@sharingDialog').contains('Save').click();
         });
 
         cy.createGroup(activeUser.token, {
@@ -94,51 +92,131 @@ describe('Favorites tests', function () {
             group_class: 'project',
         }).as('myProject1');
 
-        cy.get('@mySharedProject1').then(function () {
-            cy.get('@mySharedProject2').then(function () {
-                cy.get('@myProject1').then(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.contains('Shared with me').click();
-
-                            cy.get('main').contains(this.mySharedProject1.name).rightclick();
-                            cy.get('[data-cy=context-menu]').within(() => {
-                                cy.contains('Add to favorites').click();
-                            });
-
-                            cy.get('main').contains(this.mySharedProject2.name).rightclick();
-                            cy.get('[data-cy=context-menu]').within(() => {
-                                cy.contains('Add to favorites').click();
-                            });
-
-                            cy.doSearch(`${activeUser.user.uuid}`);
-
-                            cy.get('main').contains(this.myProject1.name).rightclick();
-                            cy.get('[data-cy=context-menu]').within(() => {
-                                cy.contains('Add to favorites').click();
-                            });    
-
-                            cy.contains(this.testCollection.name).rightclick();
-                            cy.get('[data-cy=context-menu]').within(() => {
-                                cy.contains('Move to').click();
-                            });
-
-                            cy.get('[data-cy=form-dialog]').within(function() {
-                                cy.get('ul').last().find('i').click();
-                                cy.contains(this.myProject1.name);
-                                cy.contains(this.mySharedProject1.name);
-                                cy.get('ul').last()
-                                    .should('not.contain', this.mySharedProject2.name);
-                            });
-                        });
+        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');
+
+        cy.getAll('@mySharedWritableProject', '@mySharedReadonlyProject', '@myProject1', '@testCollection')
+            .then(function ([mySharedWritableProject, mySharedReadonlyProject, myProject1, testCollection]) {
+                cy.loginAs(activeUser);
+
+                cy.contains('Shared with me').click();
+
+                cy.get('main').contains(mySharedWritableProject.name).rightclick();
+                cy.get('[data-cy=context-menu]').within(() => {
+                    cy.contains('Add to favorites').click();
+                });
+
+                cy.get('main').contains(mySharedReadonlyProject.name).rightclick();
+                cy.get('[data-cy=context-menu]').within(() => {
+                    cy.contains('Add to favorites').click();
+                });
+
+                cy.doSearch(`${activeUser.user.uuid}`);
+
+                cy.get('main').contains(myProject1.name).rightclick();
+                cy.get('[data-cy=context-menu]').within(() => {
+                    cy.contains('Add to favorites').click();
+                });
+
+                cy.contains(testCollection.name).rightclick();
+                cy.get('[data-cy=context-menu]').within(() => {
+                    cy.contains('Move to').click();
+                });
+
+                cy.get('[data-cy=form-dialog]').within(function () {
+                    cy.get('[data-cy=projects-tree-favourites-tree-picker]').find('i').click();
+                    cy.contains(myProject1.name);
+                    cy.contains(mySharedWritableProject.name);
+                    cy.get('[data-cy=projects-tree-favourites-tree-picker]')
+                        .should('not.contain', mySharedReadonlyProject.name);
+                    cy.contains(mySharedWritableProject.name).click();
+                    cy.get('[data-cy=form-submit-btn]').click();
                 });
+
+                cy.doSearch(`${mySharedWritableProject.uuid}`);
+                cy.get('main').contains(testCollection.name);
+            });
+    });
+
+    it('can copy selected into the collection', () => {
+        cy.loginAs(adminUser);
+
+        cy.createCollection(adminUser.token, {
+            name: `Test source collection ${Math.floor(Math.random() * 999999)}`,
+            manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
+        })
+            .as('testSourceCollection').then(function (testSourceCollection) {
+                cy.contains('Refresh').click();
+                cy.get('main').contains(testSourceCollection.name).rightclick();
+                cy.get('[data-cy=context-menu]').within(() => {
+                    cy.contains('Share').click();
+                });
+                cy.get('[id="select-permissions"]').as('selectPermissions');
+                cy.get('@selectPermissions').click();
+                cy.contains('Write').click();
+                cy.get('.sharing-dialog').as('sharingDialog');
+                cy.get('[data-cy=invite-people-field]').find('input').type(activeUser.user.email);
+                cy.get('[role=tooltip]').click();
+                cy.get('@sharingDialog').contains('Save').click();
+            });
+
+        cy.createCollection(adminUser.token, {
+            name: `Test target collection ${Math.floor(Math.random() * 999999)}`,
+        })
+            .as('testTargetCollection').then(function (testTargetCollection) {
+                cy.contains('Refresh').click();
+                cy.get('main').contains(testTargetCollection.name).rightclick();
+                cy.get('[data-cy=context-menu]').within(() => {
+                    cy.contains('Share').click();
+                });
+                cy.get('[id="select-permissions"]').as('selectPermissions');
+                cy.get('@selectPermissions').click();
+                cy.contains('Write').click();
+                cy.get('.sharing-dialog').as('sharingDialog');
+                cy.get('[data-cy=invite-people-field]').find('input').type(activeUser.user.email);
+                cy.get('[role=tooltip]').click();
+                cy.get('@sharingDialog').contains('Save').click();
+            });
+
+        cy.getAll('@testSourceCollection', '@testTargetCollection')
+            .then(function ([testSourceCollection, testTargetCollection]) {
+                cy.loginAs(activeUser);
+
+                cy.get('.layout-pane-primary')
+                    .contains('Projects').click();
+
+                cy.get('main').contains(testTargetCollection.name).rightclick();
+                cy.get('[data-cy=context-menu]').within(() => {
+                    cy.contains('Add to favorites').click();
+                });
+
+                cy.get('main').contains(testSourceCollection.name).click();
+                cy.get('[data-cy=collection-files-panel]').contains('bar');
+                cy.get('[data-cy=collection-files-panel]').find('input[type=checkbox]').click({ force: true });
+                cy.get('[data-cy=collection-files-panel-options-btn]').click();
+                cy.get('[data-cy=context-menu]')
+                    .contains('Copy selected into the collection').click();
+
+                cy.get('[data-cy=projects-tree-favourites-tree-picker]')
+                    .find('i')
+                    .click();
+
+                cy.get('[data-cy=projects-tree-favourites-tree-picker]')
+                    .contains(testTargetCollection.name)
+                    .click();
+
+                cy.get('[data-cy=form-submit-btn]').click();
+
+                cy.get('.layout-pane-primary')
+                    .contains('Projects').click();
+
+                cy.get('main').contains(testTargetCollection.name).click();
+
+                cy.get('[data-cy=collection-files-panel]').contains('bar');
             });
-        });
     });
-})
+});
\ No newline at end of file