diff options
author | Rémy Coutable <remy@rymai.me> | 2018-12-06 19:59:45 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-12-06 19:59:45 +0300 |
commit | 69b2a78826c2921e2ba80a769f1deac78bafe38c (patch) | |
tree | e1e39380a81d2d557aac4135dcf0343f7592ac4a /spec/support | |
parent | 1e6b82a575d5f9a2dc3b69d74bf4dd06357939b7 (diff) | |
parent | 58bfd733310effa94af0e1f1f19e53e34235cffc (diff) |
Merge branch 'blob-count2' into 'master'
Support unlimited file search in web UI and API
See merge request gitlab-org/gitlab-ce!23553
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/shared_examples/file_finder.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/spec/support/shared_examples/file_finder.rb b/spec/support/shared_examples/file_finder.rb index ef144bdf61c..0dc351b5149 100644 --- a/spec/support/shared_examples/file_finder.rb +++ b/spec/support/shared_examples/file_finder.rb @@ -3,18 +3,19 @@ shared_examples 'file finder' do let(:search_results) { subject.find(query) } it 'finds by name' do - filename, blob = search_results.find { |_, blob| blob.filename == expected_file_by_name } - expect(filename).to eq(expected_file_by_name) - expect(blob).to be_a(Gitlab::SearchResults::FoundBlob) + blob = search_results.find { |blob| blob.filename == expected_file_by_name } + + expect(blob.filename).to eq(expected_file_by_name) + expect(blob).to be_a(Gitlab::Search::FoundBlob) expect(blob.ref).to eq(subject.ref) expect(blob.data).not_to be_empty end it 'finds by content' do - filename, blob = search_results.find { |_, blob| blob.filename == expected_file_by_content } + blob = search_results.find { |blob| blob.filename == expected_file_by_content } - expect(filename).to eq(expected_file_by_content) - expect(blob).to be_a(Gitlab::SearchResults::FoundBlob) + expect(blob.filename).to eq(expected_file_by_content) + expect(blob).to be_a(Gitlab::Search::FoundBlob) expect(blob.ref).to eq(subject.ref) expect(blob.data).not_to be_empty end |