Improve Elasticsearch search results spec

spec/lib/gitlab/elastic/search_results_spec.rb

@@ -83,90 +83,165 @@ describe Gitlab::Elastic::SearchResults, lib: true do
   describe 'confidential issues' do
     let(:project_3) { create(:empty_project) }
     let(:project_4) { create(:empty_project) }
-    let(:query) { 'issue' }
     let(:limit_project_ids) { [project_1.id, project_2.id, project_3.id] }
     let(:author) { create(:user) }
     let(:assignee) { create(:user) }
     let(:non_member) { create(:user) }
     let(:member) { create(:user) }
     let(:admin) { create(:admin) }
-    let!(:issue) { create(:issue, project: project_1, title: 'Issue 1') }
-    let!(:security_issue_1) { create(:issue, :confidential, project: project_1, title: 'Security issue 1', author: author) }
-    let!(:security_issue_2) { create(:issue, :confidential, title: 'Security issue 2', project: project_1, assignee: assignee) }
-    let!(:security_issue_3) { create(:issue, :confidential, project: project_2, title: 'Security issue 3', author: author) }
-    let!(:security_issue_4) { create(:issue, :confidential, project: project_3, title: 'Security issue 4', assignee: assignee) }
-    let!(:security_issue_5) { create(:issue, :confidential, project: project_4, title: 'Security issue 5') }
+    let!(:issue) { create(:issue, project: project_1, title: 'Issue 1', iid: 1) }
+    let!(:security_issue_1) { create(:issue, :confidential, project: project_1, title: 'Security issue 1', author: author, iid: 2) }
+    let!(:security_issue_2) { create(:issue, :confidential, title: 'Security issue 2', project: project_1, assignee: assignee, iid: 3) }
+    let!(:security_issue_3) { create(:issue, :confidential, project: project_2, title: 'Security issue 3', author: author, iid: 1) }
+    let!(:security_issue_4) { create(:issue, :confidential, project: project_3, title: 'Security issue 4', assignee: assignee, iid: 1) }
+    let!(:security_issue_5) { create(:issue, :confidential, project: project_4, title: 'Security issue 5', iid: 1) }
 
     before do
       Issue.__elasticsearch__.refresh_index!
     end
 
-    it 'should not list confidential issues for non project members' do
-      results = described_class.new(non_member, limit_project_ids, query)
-      issues = results.objects('issues')
+    context 'search by term' do
+      let(:query) { 'issue' }
 
-      expect(issues).to include issue
-      expect(issues).not_to include security_issue_1
-      expect(issues).not_to include security_issue_2
-      expect(issues).not_to include security_issue_3
-      expect(issues).not_to include security_issue_4
-      expect(issues).not_to include security_issue_5
-      expect(results.issues_count).to eq 1
-    end
+      it 'should not list confidential issues for non project members' do
+        results = described_class.new(non_member, limit_project_ids, query)
+        issues = results.objects('issues')
 
-    it 'should list confidential issues for author' do
-      results = described_class.new(author, limit_project_ids, query)
-      issues = results.objects('issues')
+        expect(issues).to include issue
+        expect(issues).not_to include security_issue_1
+        expect(issues).not_to include security_issue_2
+        expect(issues).not_to include security_issue_3
+        expect(issues).not_to include security_issue_4
+        expect(issues).not_to include security_issue_5
+        expect(results.issues_count).to eq 1
+      end
 
-      expect(issues).to include issue
-      expect(issues).to include security_issue_1
-      expect(issues).not_to include security_issue_2
-      expect(issues).to include security_issue_3
-      expect(issues).not_to include security_issue_4
-      expect(issues).not_to include security_issue_5
-      expect(results.issues_count).to eq 3
-    end
+      it 'should list confidential issues for author' do
+        results = described_class.new(author, limit_project_ids, query)
+        issues = results.objects('issues')
+
+        expect(issues).to include issue
+        expect(issues).to include security_issue_1
+        expect(issues).not_to include security_issue_2
+        expect(issues).to include security_issue_3
+        expect(issues).not_to include security_issue_4
+        expect(issues).not_to include security_issue_5
+        expect(results.issues_count).to eq 3
+      end
 
-    it 'should list confidential issues for assignee' do
-      results = described_class.new(assignee, limit_project_ids, query)
-      issues = results.objects('issues')
+      it 'should list confidential issues for assignee' do
+        results = described_class.new(assignee, limit_project_ids, query)
+        issues = results.objects('issues')
+
+        expect(issues).to include issue
+        expect(issues).not_to include security_issue_1
+        expect(issues).to include security_issue_2
+        expect(issues).not_to include security_issue_3
+        expect(issues).to include security_issue_4
+        expect(issues).not_to include security_issue_5
+        expect(results.issues_count).to eq 3
+      end
 
-      expect(issues).to include issue
-      expect(issues).not_to include security_issue_1
-      expect(issues).to include security_issue_2
-      expect(issues).not_to include security_issue_3
-      expect(issues).to include security_issue_4
-      expect(issues).not_to include security_issue_5
-      expect(results.issues_count).to eq 3
-    end
+      it 'should list confidential issues for project members' do
+        project_1.team << [member, :developer]
+        project_2.team << [member, :developer]
 
-    it 'should list confidential issues for project members' do
-      project_1.team << [member, :developer]
-      project_2.team << [member, :developer]
+        results = described_class.new(member, limit_project_ids, query)
+        issues = results.objects('issues')
 
-      results = described_class.new(member, limit_project_ids, query)
-      issues = results.objects('issues')
+        expect(issues).to include issue
+        expect(issues).to include security_issue_1
+        expect(issues).to include security_issue_2
+        expect(issues).to include security_issue_3
+        expect(issues).not_to include security_issue_4
+        expect(issues).not_to include security_issue_5
+        expect(results.issues_count).to eq 4
+      end
 
-      expect(issues).to include issue
-      expect(issues).to include security_issue_1
-      expect(issues).to include security_issue_2
-      expect(issues).to include security_issue_3
-      expect(issues).not_to include security_issue_4
-      expect(issues).not_to include security_issue_5
-      expect(results.issues_count).to eq 4
+      it 'should list all issues for admin' do
+        results = described_class.new(admin, limit_project_ids, query)
+        issues = results.objects('issues')
+
+        expect(issues).to include issue
+        expect(issues).to include security_issue_1
+        expect(issues).to include security_issue_2
+        expect(issues).to include security_issue_3
+        expect(issues).to include security_issue_4
+        expect(issues).not_to include security_issue_5
+        expect(results.issues_count).to eq 5
+      end
     end
 
-    it 'should list all issues for admin' do
-      results = described_class.new(admin, limit_project_ids, query)
-      issues = results.objects('issues')
+    context 'search by iid' do
+      let(:query) { '#1' }
+
+      it 'should not list confidential issues for non project members' do
+        results = described_class.new(non_member, limit_project_ids, query)
+        issues = results.objects('issues')
+
+        expect(issues).to include issue
+        expect(issues).not_to include security_issue_1
+        expect(issues).not_to include security_issue_2
+        expect(issues).not_to include security_issue_3
+        expect(issues).not_to include security_issue_4
+        expect(issues).not_to include security_issue_5
+        expect(results.issues_count).to eq 1
+      end
 
-      expect(issues).to include issue
-      expect(issues).to include security_issue_1
-      expect(issues).to include security_issue_2
-      expect(issues).to include security_issue_3
-      expect(issues).to include security_issue_4
-      expect(issues).not_to include security_issue_5
-      expect(results.issues_count).to eq 5
+      it 'should list confidential issues for author' do
+        results = described_class.new(author, limit_project_ids, query)
+        issues = results.objects('issues')
+
+        expect(issues).to include issue
+        expect(issues).not_to include security_issue_1
+        expect(issues).not_to include security_issue_2
+        expect(issues).to include security_issue_3
+        expect(issues).not_to include security_issue_4
+        expect(issues).not_to include security_issue_5
+        expect(results.issues_count).to eq 2
+      end
+
+      it 'should list confidential issues for assignee' do
+        results = described_class.new(assignee, limit_project_ids, query)
+        issues = results.objects('issues')
+
+        expect(issues).to include issue
+        expect(issues).not_to include security_issue_1
+        expect(issues).not_to include security_issue_2
+        expect(issues).not_to include security_issue_3
+        expect(issues).to include security_issue_4
+        expect(issues).not_to include security_issue_5
+        expect(results.issues_count).to eq 2
+      end
+
+      it 'should list confidential issues for project members' do
+        project_2.team << [member, :developer]
+        project_3.team << [member, :developer]
+
+        results = described_class.new(member, limit_project_ids, query)
+        issues = results.objects('issues')
+
+        expect(issues).to include issue
+        expect(issues).not_to include security_issue_1
+        expect(issues).not_to include security_issue_2
+        expect(issues).to include security_issue_3
+        expect(issues).to include security_issue_4
+        expect(issues).not_to include security_issue_5
+        expect(results.issues_count).to eq 3
+      end
+
+      it 'should list all issues for admin' do
+        results = described_class.new(admin, limit_project_ids, query)
+        issues = results.objects('issues')
+
+        expect(issues).to include issue
+        expect(issues).not_to include security_issue_1
+        expect(issues).not_to include security_issue_2
+        expect(issues).to include security_issue_3
+        expect(issues).to include security_issue_4
+        expect(issues).not_to include security_issue_5
+        expect(results.issues_count).to eq 3
+      end
     end
   end