Merge branch '18169-cancel-button-not-working' into main

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

diff --git a/cypress/integration/search.spec.js b/cypress/integration/search.spec.js
index 0fba64cdffec01221c488a7b0c94f92d65d5c03c..8806d12d48fa486fb9ac9107ee956dd50561bb92 100644 (file)
--- a/cypress/integration/search.spec.js
+++ b/cypress/integration/search.spec.js
@@ -46,6 +46,7 @@ describe('Search tests', function() {
         cy.createCollection(adminUser.token, {
             name: colName,
             owner_uuid: activeUser.user.uuid,
+            preserve_version: true,
             manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"})
         .as('originalVersion').then(function() {
             // Change the file name to create a new version.
@@ -71,13 +72,13 @@ describe('Search tests', function() {
             cy.loginAs(activeUser);
             const searchQuery = `${colName} type:arvados#collection`;
             // Search for only collection's current version
-            cy.visit(`/search-results?q=${encodeURIComponent(searchQuery)}`);
-            cy.get('[data-cy=search-results]').should('contain', 'current');
-            cy.get('[data-cy=search-results]').should('not.contain', 'old version');
+            cy.doSearch(`${searchQuery}`);
+            cy.get('[data-cy=search-results]').should('contain', 'head version');
+            cy.get('[data-cy=search-results]').should('not.contain', 'version 1');
             // ...and then, include old versions.
-            cy.visit(`/search-results?q=${encodeURIComponent(searchQuery + ' is:pastVersion')}`);
-            cy.get('[data-cy=search-results]').should('contain', 'current');
-            cy.get('[data-cy=search-results]').should('contain', 'old version');
+            cy.doSearch(`${searchQuery} is:pastVersion`);
+            cy.get('[data-cy=search-results]').should('contain', 'head version');
+            cy.get('[data-cy=search-results]').should('contain', 'version 1');
         });
     });
 });
\ No newline at end of file