[EE] Extract EE-specific code from issues_finder_spec.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

ee/spec/finders/issues_finder_spec.rb

@@ -5,4 +5,93 @@ describe IssuesFinder do
     let!(:subject) { create(:issue, project: project) }
     let(:project_params) { { project_id: project.id } }
   end
+
+  describe '#execute' do
+    include_context 'IssuesFinder context'
+    include_context 'IssuesFinder#execute context'
+
+    context 'scope: all' do
+      let(:scope) { 'all' }
+
+      describe 'filter by weight' do
+        set(:issue_with_weight_1) { create(:issue, project: project3, weight: 1) }
+        set(:issue_with_weight_42) { create(:issue, project: project3, weight: 42) }
+
+        context 'filter issues with no weight' do
+          let(:params) { { weight: Issue::WEIGHT_NONE } }
+
+          it 'returns all issues' do
+            expect(issues).to contain_exactly(issue1, issue2, issue3, issue4)
+          end
+        end
+
+        context 'filter issues with any weight' do
+          let(:params) { { weight: Issue::WEIGHT_ANY } }
+
+          it 'returns all issues' do
+            expect(issues).to contain_exactly(issue_with_weight_1, issue_with_weight_42)
+          end
+        end
+
+        context 'filter issues with a specific weight' do
+          let(:params) { { weight: 42 } }
+
+          it 'returns all issues' do
+            expect(issues).to contain_exactly(issue_with_weight_42)
+          end
+        end
+      end
+
+      context 'filtering by assignee IDs' do
+        set(:user3) { create(:user) }
+        let(:params) { { assignee_ids: [user2.id, user3.id] } }
+
+        before do
+          project2.add_developer(user3)
+
+          issue3.assignees = [user2, user3]
+        end
+
+        it 'returns issues assigned to those users' do
+          expect(issues).to contain_exactly(issue3)
+        end
+      end
+    end
+  end
+
+  describe '#with_confidentiality_access_check' do
+    let(:guest) { create(:user) }
+    set(:authorized_user) { create(:user) }
+    set(:project) { create(:project, namespace: authorized_user.namespace) }
+    set(:public_issue) { create(:issue, project: project) }
+    set(:confidential_issue) { create(:issue, project: project, confidential: true) }
+
+    context 'when no project filter is given' do
+      let(:params) { {} }
+
+      context 'for an auditor' do
+        let(:auditor_user) { create(:user, :auditor) }
+
+        subject { described_class.new(auditor_user, params).with_confidentiality_access_check }
+
+        it 'returns all issues' do
+          expect(subject).to include(public_issue, confidential_issue)
+        end
+      end
+    end
+
+    context 'when searching within a specific project' do
+      let(:params) { { project_id: project.id } }
+
+      context 'for an auditor' do
+        let(:auditor_user) { create(:user, :auditor) }
+
+        subject { described_class.new(auditor_user, params).with_confidentiality_access_check }
+
+        it 'returns all issues' do
+          expect(subject).to include(public_issue, confidential_issue)
+        end
+      end
+    end
+  end
 end

spec/finders/issues_finder_spec.rb

 require 'spec_helper'
 
 describe IssuesFinder do
-  set(:user) { create(:user) }
-  set(:user2) { create(:user) }
-  set(:group) { create(:group) }
-  set(:subgroup) { create(:group, parent: group) }
-  set(:project1) { create(:project, group: group) }
-  set(:project2) { create(:project) }
-  set(:project3) { create(:project, group: subgroup) }
-  set(:milestone) { create(:milestone, project: project1) }
-  set(:label) { create(:label, project: project2) }
-  set(:issue1) { create(:issue, author: user, assignees: [user], project: project1, milestone: milestone, title: 'gitlab', created_at: 1.week.ago, updated_at: 1.week.ago) }
-  set(:issue2) { create(:issue, author: user, assignees: [user], project: project2, description: 'gitlab', created_at: 1.week.from_now, updated_at: 1.week.from_now) }
-  set(:issue3) { create(:issue, author: user2, assignees: [user2], project: project2, title: 'tanuki', description: 'tanuki', created_at: 2.weeks.from_now, updated_at: 2.weeks.from_now) }
-  set(:issue4) { create(:issue, project: project3) }
-  set(:award_emoji1) { create(:award_emoji, name: 'thumbsup', user: user, awardable: issue1) }
-  set(:award_emoji2) { create(:award_emoji, name: 'thumbsup', user: user2, awardable: issue2) }
-  set(:award_emoji3) { create(:award_emoji, name: 'thumbsdown', user: user, awardable: issue3) }
+  include_context 'IssuesFinder context'
 
   describe '#execute' do
-    let!(:closed_issue) { create(:issue, author: user2, assignees: [user2], project: project2, state: 'closed') }
-    let!(:label_link) { create(:label_link, label: label, target: issue2) }
-    let(:search_user) { user }
-    let(:params) { {} }
-    let(:issues) { described_class.new(search_user, params.reverse_merge(scope: scope, state: 'opened')).execute }
-
-    before(:context) do
-      project1.add_maintainer(user)
-      project2.add_developer(user)
-      project2.add_developer(user2)
-      project3.add_developer(user)
-
-      issue1
-      issue2
-      issue3
-      issue4
-
-      award_emoji1
-      award_emoji2
-      award_emoji3
-    end
+    include_context 'IssuesFinder#execute context'
 
     context 'scope: all' do
       let(:scope) { 'all' }
@@ -48,22 +13,6 @@ describe IssuesFinder do
         expect(issues).to contain_exactly(issue1, issue2, issue3, issue4)
       end
 
-      context 'sort by issues with no weight' do
-        let(:params) { { weight: Issue::WEIGHT_NONE } }
-
-        it 'returns all issues' do
-          expect(issues).to contain_exactly(issue1, issue2, issue3, issue4)
-        end
-      end
-
-      context 'sort by issues with any weight' do
-        let(:params) { { weight: Issue::WEIGHT_ANY } }
-
-        it 'returns all issues' do
-          expect(issues).to be_empty
-        end
-      end
-
       context 'filtering by assignee ID' do
         let(:params) { { assignee_id: user.id } }
 
@@ -72,21 +21,6 @@ describe IssuesFinder do
         end
       end
 
-      context 'filtering by assignee IDs' do
-        set(:user3) { create(:user) }
-        let(:params) { { assignee_ids: [user2.id, user3.id] } }
-
-        before do
-          project2.add_developer(user3)
-
-          issue3.assignees = [user2, user3]
-        end
-
-        it 'returns issues assigned to those users' do
-          expect(issues).to contain_exactly(issue3)
-        end
-      end
-
       context 'filtering by assignee usernames' do
         set(:user3) { create(:user) }
         let(:params) { { assignee_username: [user2.username, user3.username] } }
@@ -690,16 +624,6 @@ describe IssuesFinder do
         end
       end
 
-      context 'for an auditor' do
-        let(:auditor_user) { create(:user, :auditor) }
-
-        subject { described_class.new(auditor_user, params).with_confidentiality_access_check }
-
-        it 'returns all issues' do
-          expect(subject).to include(public_issue, confidential_issue)
-        end
-      end
-
       context 'for an admin' do
         let(:admin_user) { create(:user, :admin) }
 
@@ -777,24 +701,8 @@ describe IssuesFinder do
         end
       end
 
-      context 'for an auditor' do
-        let(:auditor_user) { create(:user, :auditor) }
-
-        subject { described_class.new(auditor_user, params).with_confidentiality_access_check }
-
-        it 'returns all issues' do
-          expect(subject).to include(public_issue, confidential_issue)
-        end
-
-        it 'does not filter by confidentiality' do
-          expect(Issue).not_to receive(:where).with(a_string_matching('confidential'), anything)
-
-          subject
-        end
-      end
-
       context 'for an admin' do
-        let(:admin_user) { create(:user, :auditor) }
+        let(:admin_user) { create(:user, :admin) }
 
         subject { described_class.new(admin_user, params).with_confidentiality_access_check }
 

spec/support/shared_contexts/finders/issues_finder_shared_contexts.rb

+require 'spec_helper'
+
+RSpec.shared_context 'IssuesFinder context' do
+  set(:user) { create(:user) }
+  set(:user2) { create(:user) }
+  set(:group) { create(:group) }
+  set(:subgroup) { create(:group, parent: group) }
+  set(:project1) { create(:project, group: group) }
+  set(:project2) { create(:project) }
+  set(:project3) { create(:project, group: subgroup) }
+  set(:milestone) { create(:milestone, project: project1) }
+  set(:label) { create(:label, project: project2) }
+  set(:issue1) { create(:issue, author: user, assignees: [user], project: project1, milestone: milestone, title: 'gitlab', created_at: 1.week.ago, updated_at: 1.week.ago) }
+  set(:issue2) { create(:issue, author: user, assignees: [user], project: project2, description: 'gitlab', created_at: 1.week.from_now, updated_at: 1.week.from_now) }
+  set(:issue3) { create(:issue, author: user2, assignees: [user2], project: project2, title: 'tanuki', description: 'tanuki', created_at: 2.weeks.from_now, updated_at: 2.weeks.from_now) }
+  set(:issue4) { create(:issue, project: project3) }
+  set(:award_emoji1) { create(:award_emoji, name: 'thumbsup', user: user, awardable: issue1) }
+  set(:award_emoji2) { create(:award_emoji, name: 'thumbsup', user: user2, awardable: issue2) }
+  set(:award_emoji3) { create(:award_emoji, name: 'thumbsdown', user: user, awardable: issue3) }
+end
+
+RSpec.shared_context 'IssuesFinder#execute context' do
+  let!(:closed_issue) { create(:issue, author: user2, assignees: [user2], project: project2, state: 'closed') }
+  let!(:label_link) { create(:label_link, label: label, target: issue2) }
+  let(:search_user) { user }
+  let(:params) { {} }
+  let(:issues) { described_class.new(search_user, params.reverse_merge(scope: scope, state: 'opened')).execute }
+
+  before(:context) do
+    project1.add_maintainer(user)
+    project2.add_developer(user)
+    project2.add_developer(user2)
+    project3.add_developer(user)
+
+    issue1
+    issue2
+    issue3
+    issue4
+
+    award_emoji1
+    award_emoji2
+    award_emoji3
+  end
+end