17579: Fix for collection cypress failure

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

diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js
index e728227580a98afabf554813f8f0916c3d7e833f..a22ec37d4acbfb560da2c714d1961ebb5409007c 100644 (file)
--- a/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@ -866,7 +866,11 @@ describe('Collection panel tests', function () {
                         cy.get('[data-cy=form-submit-btn]').click();
 
                         cy.get('button[aria-label=Remove]').should('exist');
+<<<<<<< HEAD
                         cy.get('button[aria-label=Remove]').click({ multiple: true });
+=======
+                        cy.get('button[aria-label=Remove]').click({ multiple: true, force: true });
+>>>>>>> a4391aa3... 17579: Fix for collection cypress failure
 
                         cy.get('[data-cy=form-submit-btn]').should('not.exist');
                     });