From be9b5b23f584d08adcee0d3ca4a31558c1aa938d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Kuty=C5=82a?= Date: Wed, 8 Dec 2021 21:44:42 +0100 Subject: [PATCH] 17579: fix for wrong conflict resolution MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła --- cypress/integration/collection.spec.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js index a22ec37d..6c1727fb 100644 --- a/cypress/integration/collection.spec.js +++ b/cypress/integration/collection.spec.js @@ -866,11 +866,7 @@ 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'); }); -- 2.30.2