Commit 4f8b9d09 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'clean_up_search_classes' into 'master'

Clean up search result classes

## What does this MR do?

Clean up search result classes

## Are there points in the code the reviewer needs to double check?

I checked if those methods are used and it seems like NO. But you can check as well.

## Why was this MR needed?

To be clean

See merge request !6216
parents 52cc64a8 03bed0fb
......@@ -28,11 +28,6 @@ module Gitlab
end
end
def total_count
@total_count ||= issues_count + merge_requests_count + blobs_count +
notes_count + wiki_blobs_count + commits_count
end
def blobs_count
@blobs_count ||= blobs.count
end
......
......@@ -27,11 +27,6 @@ module Gitlab
end
end
def total_count
@total_count ||= projects_count + issues_count + merge_requests_count +
milestones_count
end
def projects_count
@projects_count ||= projects.count
end
......@@ -48,10 +43,6 @@ module Gitlab
@milestones_count ||= milestones.count
end
def empty?
total_count.zero?
end
private
def projects
......
......@@ -20,10 +20,6 @@ module Gitlab
end
end
def total_count
@total_count ||= snippet_titles_count + snippet_blobs_count
end
def snippet_titles_count
@snippet_titles_count ||= snippet_titles.count
end
......
......@@ -12,12 +12,6 @@ describe Gitlab::SearchResults do
let!(:milestone) { create(:milestone, project: project, title: 'foo') }
let(:results) { described_class.new(user, Project.all, 'foo') }
describe '#total_count' do
it 'returns the total amount of search hits' do
expect(results.total_count).to eq(4)
end
end
describe '#projects_count' do
it 'returns the total amount of projects' do
expect(results.projects_count).to eq(1)
......@@ -42,18 +36,6 @@ describe Gitlab::SearchResults do
end
end
describe '#empty?' do
it 'returns true when there are no search results' do
allow(results).to receive(:total_count).and_return(0)
expect(results.empty?).to eq(true)
end
it 'returns false when there are search results' do
expect(results.empty?).to eq(false)
end
end
describe 'confidential issues' do
let(:project_1) { create(:empty_project) }
let(:project_2) { create(:empty_project) }
......
......@@ -5,12 +5,6 @@ describe Gitlab::SnippetSearchResults do
let(:results) { described_class.new(Snippet.all, 'foo') }
describe '#total_count' do
it 'returns the total amount of search hits' do
expect(results.total_count).to eq(2)
end
end
describe '#snippet_titles_count' do
it 'returns the amount of matched snippet titles' do
expect(results.snippet_titles_count).to eq(1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment