17579: fix for wrong conflict resolution

[arvados-workbench2.git] / cypress / integration / collection.spec.js

diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js
index e46be0c366717da85f09f7e60d121393e91cfd65..6c1727fb453ffdd0e89254fd382cd9c4465bfd6e 100644 (file)
--- a/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@ -795,14 +795,16 @@ describe('Collection panel tests', function () {
     });
 
     describe('file upload', () => {
-        it('allows to cancel running upload', () => {
+        beforeEach(() => {
             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('testCollection1');
+        });
 
+        it('allows to cancel running upload', () => {
             cy.getAll('@testCollection1')
                 .then(function([testCollection1]) {
                     cy.loginAs(activeUser);
@@ -815,12 +817,8 @@ describe('Collection panel tests', function () {
                         cy.get('[data-cy=drag-and-drop]').upload(content, '5mb_a.bin');
                         cy.get('[data-cy=drag-and-drop]').upload(content, '5mb_b.bin');
 
-                        cy.wait(1000);
-
                         cy.get('[data-cy=form-submit-btn]').click();
 
-                        cy.wait(10);
-
                         cy.get('button').contains('Cancel').click();
 
                         cy.get('[data-cy=form-submit-btn]').should('not.exist');
@@ -829,13 +827,6 @@ describe('Collection panel tests', function () {
         });
 
         it('allows to cancel single file from the running upload', () => {
-            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('testCollection1');
-
             cy.getAll('@testCollection1')
                 .then(function([testCollection1]) {
                     cy.loginAs(activeUser);
@@ -848,13 +839,36 @@ describe('Collection panel tests', function () {
                         cy.get('[data-cy=drag-and-drop]').upload(content, '5mb_a.bin');
                         cy.get('[data-cy=drag-and-drop]').upload(content, '5mb_b.bin');
 
-                        cy.wait(1000);
+                        cy.get('[data-cy=form-submit-btn]').click();
+
+                        cy.get('button[aria-label=Remove]').eq(1).click();
+
+                        cy.get('[data-cy=form-submit-btn]').should('not.exist');
+
+                        cy.get('[data-cy=collection-files-panel]').contains('5mb_a.bin').should('exist');
+                    });
+                });
+        });
+
+        it('allows to cancel all files from the running upload', () => {
+            cy.getAll('@testCollection1')
+                .then(function([testCollection1]) {
+                    cy.loginAs(activeUser);
+
+                    cy.goToPath(`/collections/${testCollection1.uuid}`);
+
+                    cy.get('[data-cy=upload-button]').click();
+
+                    cy.fixture('files/5mb.bin', 'base64').then(content => {
+                        cy.get('[data-cy=drag-and-drop]').upload(content, '5mb_a.bin');
+                        cy.get('[data-cy=drag-and-drop]').upload(content, '5mb_b.bin');
 
                         cy.get('[data-cy=form-submit-btn]').click();
 
-                        cy.wait(10);
+                        cy.get('button[aria-label=Remove]').should('exist');
+                        cy.get('button[aria-label=Remove]').click({ multiple: true, force: true });
 
-                        cy.get('button[aria-label=Remove]').eq(1).click();
+                        cy.get('[data-cy=form-submit-btn]').should('not.exist');
                     });
                 });
         });