diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-14 15:10:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-14 15:10:12 +0300 |
commit | 14a0edee5c04b04b5281f99ce7f6ba75b919dba1 (patch) | |
tree | 98484def7f8c4ad9c371664e40ddfef523340fad /spec/features | |
parent | 7a7f602c2689ef1d204976b23a8e89bdf927e8e2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/issues/related_issues_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/search/user_uses_search_filters_spec.rb | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/spec/features/issues/related_issues_spec.rb b/spec/features/issues/related_issues_spec.rb index f460b4b1c7f..5102eeb2511 100644 --- a/spec/features/issues/related_issues_spec.rb +++ b/spec/features/issues/related_issues_spec.rb @@ -22,6 +22,10 @@ RSpec.describe 'Related issues', :js, feature_category: :team_planning do let_it_be(:private_issue) { create(:issue, project: private_project) } let_it_be(:public_issue) { create(:issue, project: public_project) } + before do + stub_feature_flags(move_close_into_dropdown: false) + end + context 'widget visibility' do context 'when not logged in' do it 'does not show widget when internal project' do 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 |