X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/09eb09cec6185c482a0e4f98f6b432c93990d3d8..e4a198bd0cc9ed174cb68345623ce9fbd8923951:/cypress/integration/favorites.spec.js diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js index eaeb6644..9bc90ebd 100644 --- a/cypress/integration/favorites.spec.js +++ b/cypress/integration/favorites.spec.js @@ -14,14 +14,12 @@ describe('Favorites tests', function () { cy.getUser('admin', 'Admin', 'User', true, true) .as('adminUser').then(function () { adminUser = this.adminUser; - } - ); + }); cy.getUser('collectionuser1', 'Collection', 'User', false, true) .as('activeUser').then(function () { activeUser = this.activeUser; - } - ); - }) + }); + }); beforeEach(function () { cy.clearCookies() @@ -46,55 +44,39 @@ describe('Favorites tests', function () { }); }); - it('can copy selected into the collection', () => { - cy.loginAs(adminUser); - + // Disabled while addressing #18587 + it.skip('can copy selected into the collection', () => { 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.shareWith(adminUser.token, activeUser.user.uuid, testSourceCollection.uuid, 'can_read'); - }); - + }).as('testSourceCollection').then(function (testSourceCollection) { + cy.shareWith(adminUser.token, activeUser.user.uuid, testSourceCollection.uuid, 'can_read'); + }); cy.createCollection(adminUser.token, { name: `Test target collection ${Math.floor(Math.random() * 999999)}`, - }) - .as('testTargetCollection').then(function (testTargetCollection) { - cy.shareWith(adminUser.token, activeUser.user.uuid, testTargetCollection.uuid, 'can_write'); - }); + }).as('testTargetCollection').then(function (testTargetCollection) { + cy.shareWith(adminUser.token, activeUser.user.uuid, testTargetCollection.uuid, 'can_write'); + cy.addToFavorites(activeUser.token, activeUser.user.uuid, testTargetCollection.uuid); + }); cy.getAll('@testSourceCollection', '@testTargetCollection') .then(function ([testSourceCollection, testTargetCollection]) { cy.loginAs(activeUser); - - cy.get('.layout-pane-primary') - .contains('Projects').click(); - - cy.addToFavorites(activeUser.token, activeUser.user.uuid, testTargetCollection.uuid); - - cy.get('main').contains(testSourceCollection.name).click(); + cy.goToPath(`/collections/${testSourceCollection.uuid}`); 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('.layout-pane-primary').contains('Projects').click(); + cy.goToPath(`/collections/${testTargetCollection.uuid}`); cy.get('[data-cy=collection-files-panel]').contains('bar'); }); }); @@ -131,8 +113,6 @@ describe('Favorites tests', function () { .then(function ([mySharedWritableProject, mySharedReadonlyProject, myProject1, testCollection]) { cy.loginAs(activeUser); - cy.doSearch(`${activeUser.user.uuid}`); - cy.contains(testCollection.name).rightclick(); cy.get('[data-cy=context-menu]').within(() => { cy.contains('Move to').click(); @@ -148,12 +128,55 @@ describe('Favorites tests', function () { cy.get('[data-cy=form-submit-btn]').click(); }); - cy.doSearch(`${mySharedWritableProject.uuid}`); + cy.goToPath(`/projects/${mySharedWritableProject.uuid}`); cy.get('main').contains(testCollection.name); }); }); - it.only('can view favourites in workflow', () => { + it('can edit project and collections in favorites', () => { + cy.createProject({ + owningUser: adminUser, + projectName: 'mySharedWritableProject', + canWrite: true, + addToFavorites: true + }); + + cy.createCollection(adminUser.token, { + owner_uuid: adminUser.user.uuid, + name: `Test target collection ${Math.floor(Math.random() * 999999)}`, + }).as('testTargetCollection').then(function (testTargetCollection) { + cy.addToFavorites(adminUser.token, adminUser.user.uuid, testTargetCollection.uuid); + }); + + cy.getAll('@mySharedWritableProject', '@testTargetCollection') + .then(function ([mySharedWritableProject, testTargetCollection]) { + cy.loginAs(adminUser); + + cy.get('[data-cy=side-panel-tree]').contains('My Favorites').click(); + + const newProjectName = `New project name ${mySharedWritableProject.name}`; + const newProjectDescription = `New project description ${mySharedWritableProject.name}`; + const newCollectionName = `New collection name ${testTargetCollection.name}`; + const newCollectionDescription = `New collection description ${testTargetCollection.name}`; + + cy.testEditProjectOrCollection('main', mySharedWritableProject.name, newProjectName, newProjectDescription); + cy.testEditProjectOrCollection('main', testTargetCollection.name, newCollectionName, newCollectionDescription, false); + + cy.get('[data-cy=side-panel-tree]').contains('Projects').click(); + + cy.get('main').contains(newProjectName).rightclick(); + cy.contains('Add to public favorites').click(); + cy.get('main').contains(newCollectionName).rightclick(); + cy.contains('Add to public favorites').click(); + + cy.get('[data-cy=side-panel-tree]').contains('Public Favorites').click(); + + cy.testEditProjectOrCollection('main', newProjectName, mySharedWritableProject.name, 'newProjectDescription'); + cy.testEditProjectOrCollection('main', newCollectionName, testTargetCollection.name, 'newCollectionDescription', false); + }); + }); + + it('can view favorites in workflow', () => { cy.createProject({ owningUser: adminUser, targetUser: activeUser, @@ -176,8 +199,6 @@ describe('Favorites tests', function () { cy.getAll('@mySharedWritableProject', '@mySharedReadonlyProject', '@myProject1') .then(function ([mySharedWritableProject, mySharedReadonlyProject, myProject1]) { - cy.loginAs(activeUser); - cy.createWorkflow(adminUser.token, { name: `TestWorkflow${Math.floor(Math.random() * 999999)}.cwl`, definition: "{\n \"$graph\": [\n {\n \"class\": \"Workflow\",\n \"doc\": \"Reverse the lines in a document, then sort those lines.\",\n \"hints\": [\n {\n \"acrContainerImage\": \"99b0201f4cade456b4c9d343769a3b70+261\",\n \"class\": \"http://arvados.org/cwl#WorkflowRunnerResources\"\n }\n ],\n \"id\": \"#main\",\n \"inputs\": [\n {\n \"default\": null,\n \"doc\": \"The input file to be processed.\",\n \"id\": \"#main/input\",\n \"type\": \"File\"\n },\n {\n \"default\": true,\n \"doc\": \"If true, reverse (decending) sort\",\n \"id\": \"#main/reverse_sort\",\n \"type\": \"boolean\"\n }\n ],\n \"outputs\": [\n {\n \"doc\": \"The output with the lines reversed and sorted.\",\n \"id\": \"#main/output\",\n \"outputSource\": \"#main/sorted/output\",\n \"type\": \"File\"\n }\n ],\n \"steps\": [\n {\n \"id\": \"#main/rev\",\n \"in\": [\n {\n \"id\": \"#main/rev/input\",\n \"source\": \"#main/input\"\n }\n ],\n \"out\": [\n \"#main/rev/output\"\n ],\n \"run\": \"#revtool.cwl\"\n },\n {\n \"id\": \"#main/sorted\",\n \"in\": [\n {\n \"id\": \"#main/sorted/input\",\n \"source\": \"#main/rev/output\"\n },\n {\n \"id\": \"#main/sorted/reverse\",\n \"source\": \"#main/reverse_sort\"\n }\n ],\n \"out\": [\n \"#main/sorted/output\"\n ],\n \"run\": \"#sorttool.cwl\"\n }\n ]\n },\n {\n \"baseCommand\": \"rev\",\n \"class\": \"CommandLineTool\",\n \"doc\": \"Reverse each line using the `rev` command\",\n \"hints\": [\n {\n \"class\": \"ResourceRequirement\",\n \"ramMin\": 8\n }\n ],\n \"id\": \"#revtool.cwl\",\n \"inputs\": [\n {\n \"id\": \"#revtool.cwl/input\",\n \"inputBinding\": {},\n \"type\": \"File\"\n }\n ],\n \"outputs\": [\n {\n \"id\": \"#revtool.cwl/output\",\n \"outputBinding\": {\n \"glob\": \"output.txt\"\n },\n \"type\": \"File\"\n }\n ],\n \"stdout\": \"output.txt\"\n },\n {\n \"baseCommand\": \"sort\",\n \"class\": \"CommandLineTool\",\n \"doc\": \"Sort lines using the `sort` command\",\n \"hints\": [\n {\n \"class\": \"ResourceRequirement\",\n \"ramMin\": 8\n }\n ],\n \"id\": \"#sorttool.cwl\",\n \"inputs\": [\n {\n \"id\": \"#sorttool.cwl/reverse\",\n \"inputBinding\": {\n \"position\": 1,\n \"prefix\": \"-r\"\n },\n \"type\": \"boolean\"\n },\n {\n \"id\": \"#sorttool.cwl/input\",\n \"inputBinding\": {\n \"position\": 2\n },\n \"type\": \"File\"\n }\n ],\n \"outputs\": [\n {\n \"id\": \"#sorttool.cwl/output\",\n \"outputBinding\": {\n \"glob\": \"output.txt\"\n },\n \"type\": \"File\"\n }\n ],\n \"stdout\": \"output.txt\"\n }\n ],\n \"cwlVersion\": \"v1.0\"\n}", @@ -192,9 +213,7 @@ describe('Favorites tests', function () { }) .as('testWorkflow2'); - cy.contains('Shared with me').click(); - - cy.doSearch(`${activeUser.user.uuid}`); + cy.loginAs(activeUser); cy.get('main').contains(myProject1.name).click(); @@ -229,4 +248,4 @@ describe('Favorites tests', function () { }); }); }); -}); \ No newline at end of file +});