X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1d0bb953a83891cab9a5dc38eae8e60fad3ea42c..4b75b09d1c75d6796e75efc55e7b06917834b63e:/cypress/integration/favorites.spec.js diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js index d6055add..9bc90ebd 100644 --- a/cypress/integration/favorites.spec.js +++ b/cypress/integration/favorites.spec.js @@ -14,28 +14,21 @@ 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() cy.clearLocalStorage() - }) - - it('checks that Public favorites does not appear under shared with me', function () { - cy.loginAs(adminUser); - cy.contains('Shared with me').click(); - cy.get('main').contains('Public favorites').should('not.exist'); }); it('creates and removes a public favorite', function () { cy.loginAs(adminUser); + cy.createGroup(adminUser.token, { name: `my-favorite-project`, group_class: 'project', @@ -51,46 +44,63 @@ describe('Favorites tests', function () { }); }); - 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('mySharedWritableProject').then(function (mySharedWritableProject) { - cy.contains('Refresh').click(); - cy.get('main').contains(mySharedWritableProject.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(); + // 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'); + }); + 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'); + cy.addToFavorites(activeUser.token, activeUser.user.uuid, testTargetCollection.uuid); }); - cy.createGroup(adminUser.token, { - name: `my-shared-readonly-project ${Math.floor(Math.random() * 999999)}`, - group_class: 'project', - }).as('mySharedReadonlyProject').then(function (mySharedReadonlyProject) { - cy.contains('Refresh').click(); - cy.get('main').contains(mySharedReadonlyProject.name).rightclick(); - cy.get('[data-cy=context-menu]').within(() => { - cy.contains('Share').click(); + cy.getAll('@testSourceCollection', '@testTargetCollection') + .then(function ([testSourceCollection, testTargetCollection]) { + cy.loginAs(activeUser); + 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.goToPath(`/collections/${testTargetCollection.uuid}`); + cy.get('[data-cy=collection-files-panel]').contains('bar'); }); - 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.createGroup(activeUser.token, { - name: `my-project ${Math.floor(Math.random() * 999999)}`, - group_class: 'project', - }).as('myProject1'); + it('can copy collection to favorites', () => { + cy.createProject({ + owningUser: adminUser, + targetUser: activeUser, + projectName: 'mySharedWritableProject', + canWrite: true, + addToFavorites: true + }); + cy.createProject({ + owningUser: adminUser, + targetUser: activeUser, + projectName: 'mySharedReadonlyProject', + canWrite: false, + addToFavorites: true + }); + cy.createProject({ + owningUser: activeUser, + projectName: 'myProject1', + addToFavorites: true + }); cy.createCollection(adminUser.token, { name: `Test collection ${Math.floor(Math.random() * 999999)}`, @@ -103,25 +113,6 @@ describe('Favorites tests', function () { .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(); @@ -137,60 +128,124 @@ 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('can copy selected into the collection', () => { - cy.loginAs(activeUser); - - cy.createCollection(adminUser.token, { - name: `Test source collection ${Math.floor(Math.random() * 999999)}`, - owner_uuid: activeUser.user.uuid, - manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" - }) - .as('testSourceCollection'); + 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)}`, - owner_uuid: activeUser.user.uuid - }) - .as('testTargetCollection'); + }).as('testTargetCollection').then(function (testTargetCollection) { + cy.addToFavorites(adminUser.token, adminUser.user.uuid, testTargetCollection.uuid); + }); - cy.getAll('@testSourceCollection', '@testTargetCollection') - .then(function ([testSourceCollection, testTargetCollection]) { - cy.get('.layout-pane-primary') - .contains('Projects').click(); + cy.getAll('@mySharedWritableProject', '@testTargetCollection') + .then(function ([mySharedWritableProject, testTargetCollection]) { + cy.loginAs(adminUser); - cy.get('main').contains(testTargetCollection.name).rightclick(); - cy.get('[data-cy=context-menu]').within(() => { - cy.contains('Add to favorites').click(); - }); + cy.get('[data-cy=side-panel-tree]').contains('My 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(); + 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.get('[data-cy=projects-tree-favourites-tree-picker]') - .find('i') - .click(); + cy.testEditProjectOrCollection('main', mySharedWritableProject.name, newProjectName, newProjectDescription); + cy.testEditProjectOrCollection('main', testTargetCollection.name, newCollectionName, newCollectionDescription, false); - cy.get('[data-cy=projects-tree-favourites-tree-picker]') - .contains(testTargetCollection.name) - .click(); + cy.get('[data-cy=side-panel-tree]').contains('Projects').click(); - cy.get('[data-cy=form-submit-btn]').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('.layout-pane-primary') - .contains('Projects').click(); + cy.get('[data-cy=side-panel-tree]').contains('Public Favorites').click(); - cy.get('main').contains(testTargetCollection.name).click(); + cy.testEditProjectOrCollection('main', newProjectName, mySharedWritableProject.name, 'newProjectDescription'); + cy.testEditProjectOrCollection('main', newCollectionName, testTargetCollection.name, 'newCollectionDescription', false); + }); + }); - cy.get('[data-cy=collection-files-panel]').contains('bar'); + it('can view favorites in workflow', () => { + cy.createProject({ + owningUser: adminUser, + targetUser: activeUser, + projectName: 'mySharedWritableProject', + canWrite: true, + addToFavorites: true + }); + cy.createProject({ + owningUser: adminUser, + targetUser: activeUser, + projectName: 'mySharedReadonlyProject', + canWrite: false, + addToFavorites: true + }); + cy.createProject({ + owningUser: activeUser, + projectName: 'myProject1', + addToFavorites: true + }); + + cy.getAll('@mySharedWritableProject', '@mySharedReadonlyProject', '@myProject1') + .then(function ([mySharedWritableProject, mySharedReadonlyProject, myProject1]) { + 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}", + owner_uuid: myProject1.uuid, + }) + .as('testWorkflow'); + + cy.createWorkflow(adminUser.token, { + name: `TestWorkflow2-${Math.floor(Math.random() * 999999)}.cwl`, + definition: "{ \"$graph\": [ { \"$namespaces\": { \"arv\": \"http://arvados.org/cwl#\" }, \"class\": \"Workflow\", \"doc\": \"Detect blurriness of WSI data.\", \"id\": \"#main\", \"inputs\": [ { \"default\": { \"basename\": \"3d3cb547725e72ddb442bc620adbc342+2463\", \"class\": \"Directory\", \"location\": \"keep:3d3cb547725e72ddb442bc620adbc342+2463\" }, \"doc\": \"Collection containing all pipeline input images\", \"id\": \"#main/image_collection\", \"type\": \"Directory\" } ], \"outputs\": [ { \"id\": \"#main/blur_report\", \"outputSource\": \"#main/blurdetection/report\", \"type\": \"Any\" } ], \"steps\": [ { \"id\": \"#main/blurdetection\", \"in\": [ { \"id\": \"#main/blurdetection/image_collection\", \"source\": \"#main/image_collection\" } ], \"out\": [ \"#main/blurdetection/report\" ], \"run\": \"#blurdetection.cwl\" } ] }, { \"arguments\": [ \"--num_workers\", \"0\", \"--wsi_dir\", \"$(inputs.image_collection)\", \"--tile_out_dir\", \"$(runtime.outdir)\" ], \"baseCommand\": [ \"python3\", \"/updated_blur_on_folder.py\" ], \"class\": \"CommandLineTool\", \"hints\": [ { \"class\": \"DockerRequirement\", \"dockerPull\": \"updated_score_aws:cpu2\", \"http://arvados.org/cwl#dockerCollectionPDH\": \"0d6702518d1408ce2c471ffec40695cf+4924\" }, { \"class\": \"ResourceRequirement\", \"coresMin\": 8, \"ramMin\": 20000 }, { \"class\": \"http://arvados.org/cwl#RuntimeConstraints\", \"keep_cache\": 2000 } ], \"id\": \"#blurdetection.cwl\", \"inputs\": [ { \"doc\": \"Collection containing all pipeline input images\", \"id\": \"#blurdetection.cwl/image_collection\", \"type\": \"Directory\" } ], \"outputs\": [ { \"id\": \"#blurdetection.cwl/report\", \"outputBinding\": { \"glob\": \"*.csv\" }, \"type\": \"Any\" } ] } ], \"cwlVersion\": \"v1.0\" }", + owner_uuid: myProject1.uuid, + }) + .as('testWorkflow2'); + + cy.loginAs(activeUser); + + cy.get('main').contains(myProject1.name).click(); + + cy.get('[data-cy=side-panel-button]').click(); + + cy.get('#aside-menu-list').contains('Run a process').click(); + + cy.get('@testWorkflow') + .then((testWorkflow) => { + cy.get('main').contains(testWorkflow.name).click(); + cy.get('[data-cy=run-process-next-button]').click(); + cy.get('[readonly]').click(); + cy.get('[data-cy=choose-a-file-dialog]').as('chooseFileDialog'); + cy.get('[data-cy=projects-tree-favourites-tree-picker]').contains('Favorites').closest('ul').find('i').click(); + cy.get('@chooseFileDialog').find(`[data-id=${mySharedWritableProject.uuid}]`); + cy.get('@chooseFileDialog').find(`[data-id=${mySharedReadonlyProject.uuid}]`); + cy.get('button').contains('Cancel').click(); + }); + + cy.get('button').contains('Back').click(); + + cy.get('@testWorkflow2') + .then((testWorkflow2) => { + cy.get('main').contains(testWorkflow2.name).click(); + cy.get('button').contains('Change Workflow').click(); + cy.get('[data-cy=run-process-next-button]').click(); + cy.get('[readonly]').click(); + cy.get('[data-cy=choose-a-directory-dialog]').as('chooseDirectoryDialog'); + cy.get('[data-cy=projects-tree-favourites-tree-picker]').contains('Favorites').closest('ul').find('i').click(); + cy.get('@chooseDirectoryDialog').find(`[data-id=${mySharedWritableProject.uuid}]`); + cy.get('@chooseDirectoryDialog').find(`[data-id=${mySharedReadonlyProject.uuid}]`); + }); }); }); -}); \ No newline at end of file +});