Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 2 deletions

diff --git a/spec/features/search/user_uses_search_filters_spec.rb b/spec/features/search/user_uses_search_filters_spec.rb
index 2e3aaab563d..5e553cb0869 100644
--- a/spec/features/search/user_uses_search_filters_spec.rb
+++ b/spec/features/search/user_uses_search_filters_spec.rb
@@ -50,7 +50,9 @@ RSpec.describe 'User uses search filters', :js, feature_category: :global_search
 
           wait_for_requests
 
-          expect(page).to have_current_path(search_path(search: "test"))
+          expect(page).to have_current_path(search_path, ignore_query: true) do |uri|
+            uri.normalized_query(:sorted) == "scope=blobs&search=test"
+          end
         end
       end
     end
@@ -83,7 +85,9 @@ RSpec.describe 'User uses search filters', :js, feature_category: :global_search
           find('[data-testid="project-filter"] [data-testid="clear-icon"]').click
           wait_for_requests
 
-          expect(page).to have_current_path(search_path(search: "test"))
+          expect(page).to have_current_path(search_path, ignore_query: true) do |uri|
+            uri.normalized_query(:sorted) == "scope=blobs&search=test"
+          end
         end
       end
     end