X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/a293a23fa93855c9c6e180bfd77880b794c24673..4a917782a054773c2cb72f3ee364e2c0b02643e9:/cypress/integration/delete-multiple-files.spec.js

diff --git a/cypress/integration/delete-multiple-files.spec.js b/cypress/integration/delete-multiple-files.spec.js
index bd40a2b7..b506fb3d 100644
--- a/cypress/integration/delete-multiple-files.spec.js
+++ b/cypress/integration/delete-multiple-files.spec.js
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-describe('Collection panel tests', function () {
+describe('Multi-file deletion tests', function () {
     let activeUser;
     let adminUser;
 
@@ -32,7 +32,8 @@ describe('Collection panel tests', function () {
         })
             .as('testCollection').then(function () {
                 cy.loginAs(activeUser);
-                cy.visit(`/collections/${this.testCollection.uuid}`);
+                cy.goToPath(`/collections/${this.testCollection.uuid}`);
+
                 cy.get('[data-cy=collection-files-panel]').within(() => {
                     cy.get('[type="checkbox"]').first().check();
                     cy.get('[type="checkbox"]').last().check();
@@ -40,49 +41,65 @@ describe('Collection panel tests', function () {
                 cy.get('[data-cy=collection-files-panel-options-btn]').click();
                 cy.get('[data-cy=context-menu] div').contains('Remove selected').click();
                 cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
+                cy.wait(1000);
                 cy.get('[data-cy=collection-files-panel]')
                     .should('not.contain', 'baz')
                     .and('not.contain', 'bar');
             });
     });
 
-    it('deletes all files from non root dir', function () {
+    it.skip('deletes all files from non root dir', 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. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:baz\n"
+            manifest_text: "./subdir 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo\n. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:baz\n"
         })
             .as('testCollection').then(function () {
                 cy.loginAs(activeUser);
-                cy.visit(`/collections/${this.testCollection.uuid}`);
+                cy.goToPath(`/collections/${this.testCollection.uuid}`);
+
+                cy.get('[data-cy=virtual-file-tree] > div > i').first().click();
+                cy.get('[data-cy=collection-files-panel]')
+                    .should('contain', 'foo');
 
                 cy.get('[data-cy=collection-files-panel]')
-                    .contains('bar').rightclick({ force: true });
+                    .contains('foo').closest('[data-cy=virtual-file-tree]').find('[type="checkbox"]').click();
 
-                cy.get('[data-cy=context-menu]')
-                    .contains('Rename')
-                    .click();
+                cy.get('[data-cy=collection-files-panel-options-btn]').click();
+                cy.get('[data-cy=context-menu] div').contains('Remove selected').click();
+                cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
 
-                cy.get('[data-cy=form-dialog]')
-                    .should('contain', 'Rename')
-                    .within(() => {
-                        cy.get('input').type(`{selectall}{backspace}subdir/foo`);
-                    });
-                cy.get('[data-cy=form-submit-btn]').click();
                 cy.get('[data-cy=collection-files-panel]')
-                    .should('not.contain', 'bar')
-                    .and('contain', 'subdir');
+                    .should('not.contain', 'subdir')
+                    .and('contain', 'baz');
+            });
+    });
 
-                cy.get('[data-cy=virtual-file-tree] > div > i').first().click();
+    it('deletes all files from non root dir', function () {
+        cy.createCollection(adminUser.token, {
+            name: `Test collection ${Math.floor(Math.random() * 999999)}`,
+            owner_uuid: activeUser.user.uuid,
+            manifest_text: "./subdir 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo\n. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:baz\n"
+        })
+            .as('testCollection').then(function () {
+                cy.loginAs(activeUser);
+                cy.goToPath(`/collections/${this.testCollection.uuid}`);
+
+                cy.get('[data-cy=collection-files-panel]').contains('subdir').click();
+                cy.wait(1000);
                 cy.get('[data-cy=collection-files-panel]')
                     .should('contain', 'foo');
 
                 cy.get('[data-cy=collection-files-panel]')
-                    .contains('foo').closest('[data-cy=virtual-file-tree]').find('[type="checkbox"]').click();
+                    .contains('foo').parent().find('[type="checkbox"]').click();
 
                 cy.get('[data-cy=collection-files-panel-options-btn]').click();
                 cy.get('[data-cy=context-menu] div').contains('Remove selected').click();
                 cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
+
+                cy.get('[data-cy=collection-files-panel]')
+                    .should('not.contain', 'foo')
+                    .and('contain', 'subdir');
             });
     });
 })