diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-04 06:09:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-04 06:09:48 +0300 |
commit | bf6fe5762063848eba47cee7e0ce8c65c1c5a7dd (patch) | |
tree | 3739eb1b8f0386957788f1319f0c13022c8324f3 /spec | |
parent | da37005e4575681fbdecaed11cf9528b2673b6ea (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/frontend/search/sidebar/components/app_spec.js | 28 | ||||
-rw-r--r-- | spec/support/shared_examples/lib/gitlab/search_language_filter_shared_examples.rb | 25 |
2 files changed, 5 insertions, 48 deletions
diff --git a/spec/frontend/search/sidebar/components/app_spec.js b/spec/frontend/search/sidebar/components/app_spec.js index bbe04ba67f1..8a35ae96d5e 100644 --- a/spec/frontend/search/sidebar/components/app_spec.js +++ b/spec/frontend/search/sidebar/components/app_spec.js @@ -57,23 +57,23 @@ describe('GlobalSearchSidebar', () => { }); describe.each` - scope | showFilters | ShowsLanguage + scope | showFilters | showsLanguage ${'issues'} | ${true} | ${false} ${'merge_requests'} | ${true} | ${false} ${'projects'} | ${false} | ${false} ${'blobs'} | ${false} | ${true} - `('sidebar scope: $scope', ({ scope, showFilters, ShowsLanguage }) => { + `('sidebar scope: $scope', ({ scope, showFilters, showsLanguage }) => { beforeEach(() => { getterSpies.currentScope = jest.fn(() => scope); - createComponent({ urlQuery: { scope } }, { searchBlobsLanguageAggregation: true }); + createComponent({ urlQuery: { scope } }); }); it(`${!showFilters ? "doesn't" : ''} shows filters`, () => { expect(findFilters().exists()).toBe(showFilters); }); - it(`${!ShowsLanguage ? "doesn't" : ''} shows language filters`, () => { - expect(findLanguageAggregation().exists()).toBe(ShowsLanguage); + it(`${!showsLanguage ? "doesn't" : ''} shows language filters`, () => { + expect(findLanguageAggregation().exists()).toBe(showsLanguage); }); }); @@ -86,22 +86,4 @@ describe('GlobalSearchSidebar', () => { }); }); }); - - describe('when search_blobs_language_aggregation is enabled', () => { - beforeEach(() => { - createComponent({ urlQuery: { scope: 'blobs' } }, { searchBlobsLanguageAggregation: true }); - }); - it('shows the language filter', () => { - expect(findLanguageAggregation().exists()).toBe(true); - }); - }); - - describe('when search_blobs_language_aggregation is disabled', () => { - beforeEach(() => { - createComponent({ urlQuery: { scope: 'blobs' } }, { searchBlobsLanguageAggregation: false }); - }); - it('hides the language filter', () => { - expect(findLanguageAggregation().exists()).toBe(false); - }); - }); }); diff --git a/spec/support/shared_examples/lib/gitlab/search_language_filter_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/search_language_filter_shared_examples.rb index a3e4379f4d3..18545698c27 100644 --- a/spec/support/shared_examples/lib/gitlab/search_language_filter_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/search_language_filter_shared_examples.rb @@ -26,29 +26,4 @@ RSpec.shared_examples 'search results filtered by language' do expect(blob_results.size).to eq(5) expect(paths).to match_array(expected_paths) end - - context 'when the search_blobs_language_aggregation feature flag is disabled' do - before do - stub_feature_flags(search_blobs_language_aggregation: false) - end - - it 'does not filter by language', :sidekiq_inline, :aggregate_failures do - expected_paths = %w[ - CHANGELOG - CONTRIBUTING.md - bar/branch-test.txt - custom-highlighting/test.gitlab-custom - files/ruby/popen.rb - files/ruby/regex.rb - files/ruby/version_info.rb - files/whitespace - encoding/test.txt - files/markdown/ruby-style-guide.md - ] - - paths = blob_results.map { |blob| blob.binary_path } - expect(blob_results.size).to eq(10) - expect(paths).to match_array(expected_paths) - end - end end |