Skip to content
Snippets Groups Projects

Exclude archived projects from blob search

Merged Siddharth Dungarwal requested to merge 414901-excluded-archived-from-blob-search into master
All threads resolved!
Compare and Show latest version
2 files
+ 12
43
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -69,52 +69,26 @@
@@ -69,52 +69,26 @@
before do
before do
unarchived_project.repository.index_commits_and_blobs
unarchived_project.repository.index_commits_and_blobs
archived_project.repository.index_commits_and_blobs
archived_project.repository.index_commits_and_blobs
 
ensure_elasticsearch_index!
ensure_elasticsearch_index!
end
let_it_be(:owner) { create(:user) }
allow(Gitlab::Search::FoundBlob).to receive(:new).and_return(instance_double(Gitlab::Search::FoundBlob))
let_it_be(:unarchived_project) { create(:project, :public, :repository, group: group, creator: owner) }
let_it_be(:archived_project) { create(:project, :archived, :repository, :public, group: group, creator: owner) }
let_it_be(:unarchived_result_object) do
unarchived_project.repository.create_file(owner, 'test.rb', '# magik', message: 'magik', branch_name: 'master')
end
let_it_be(:archived_result_object) do
allow(Gitlab::Search::FoundBlob).to receive(:new)
archived_project.repository.create_file(owner, 'test.rb', '# magik', message: 'magik', branch_name: 'master')
.with(a_hash_including(project_id: unarchived_project.id, ref: unarchived_project.commit.id)).and_return(unarchived_result)
end
let(:unarchived_blob) { unarchived_project.repository.blob_at('HEAD', 'test.rb') }
allow(Gitlab::Search::FoundBlob).to receive(:new)
let(:archived_blob) { archived_project.repository.blob_at('HEAD', 'test.rb') }
.with(a_hash_including(project_id: archived_project.id, ref: archived_project.commit.id)).and_return(archived_result)
let(:unarchived_result) do
Gitlab::Search::FoundBlob.new(
path: unarchived_blob.path,
basename: './test',
ref: unarchived_project.commit.id,
matched_lines_count: 0,
data: unarchived_blob.data,
group: group,
project: unarchived_project,
project_id: unarchived_project.id,
highlight_line: 1,
startline: 1)
end
end
let(:archived_result) do
let_it_be(:unarchived_project) { create(:project, :public, :repository, group: group) }
Gitlab::Search::FoundBlob.new(
let_it_be(:archived_project) { create(:project, :archived, :repository, :public, group: group) }
path: archived_blob.path,
basename: './test',
let(:unarchived_result) { instance_double(Gitlab::Search::FoundBlob, project: unarchived_project) }
ref: archived_project.commit.id,
let(:archived_result) { instance_double(Gitlab::Search::FoundBlob, project: archived_project) }
matched_lines_count: 0,
data: archived_blob.data,
project: archived_project,
group: group,
project_id: archived_project.id,
highlight_line: 1,
startline: 1)
end
let(:scope) { 'blobs' }
let(:scope) { 'blobs' }
let(:query) { 'magik' }
let(:query) { 'something went wrong' }
include_examples 'search results filtered by archived', 'search_blobs_hide_archived_projects'
include_examples 'search results filtered by archived', 'search_blobs_hide_archived_projects'
end
end
Loading