Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 26 insertions, 9 deletions

diff --git a/spec/graphql/resolvers/issue_status_counts_resolver_spec.rb b/spec/graphql/resolvers/issue_status_counts_resolver_spec.rb
index d2412db35c6..69e940ee6ca 100644
--- a/spec/graphql/resolvers/issue_status_counts_resolver_spec.rb
+++ b/spec/graphql/resolvers/issue_status_counts_resolver_spec.rb
@@ -7,14 +7,21 @@ RSpec.describe Resolvers::IssueStatusCountsResolver do
 
   describe '#resolve' do
     let_it_be(:current_user) { create(:user) }
-    let_it_be(:project) { create(:project) }
-    let_it_be(:issue)    { create(:issue, project: project, state: :opened, created_at: 3.hours.ago, updated_at: 3.hours.ago) }
+    let_it_be(:group) { create(:group) }
+    let_it_be(:project) { create(:project, group: group) }
+    let_it_be(:issue) { create(:issue, project: project, state: :opened, created_at: 3.hours.ago, updated_at: 3.hours.ago) }
     let_it_be(:incident) { create(:incident, project: project, state: :closed, created_at: 1.hour.ago, updated_at: 1.hour.ago, closed_at: 1.hour.ago) }
 
+    # This issue should not be included in the counts
+    let_it_be(:other_project) { create(:project) }
+    let_it_be(:other_proj_issue) { create(:issue, state: :opened, project: other_project) }
+
+    let(:parent) { project }
     let(:args) { {} }
 
-    before do
+    before_all do
       project.add_developer(current_user)
+      other_project.add_developer(current_user)
     end
 
     subject { resolve_issue_status_counts(args) }
@@ -22,12 +29,22 @@ RSpec.describe Resolvers::IssueStatusCountsResolver do
     it { is_expected.to be_a(Gitlab::IssuablesCountForState) }
     specify { expect(subject.project).to eq(project) }
 
-    it 'returns expected results' do
-      result = resolve_issue_status_counts
+    shared_examples 'returns expected results' do
+      it 'returns expected results', :aggregate_failures do
+        result = resolve_issue_status_counts
 
-      expect(result.all).to eq 2
-      expect(result.opened).to eq 1
-      expect(result.closed).to eq 1
+        expect(result.all).to eq 2
+        expect(result.opened).to eq 1
+        expect(result.closed).to eq 1
+      end
+    end
+
+    it_behaves_like 'returns expected results'
+
+    context 'group used as parent' do
+      let(:parent) { project.group }
+
+      it_behaves_like 'returns expected results'
     end
 
     it 'filters by search', :aggregate_failures do
@@ -58,7 +75,7 @@ RSpec.describe Resolvers::IssueStatusCountsResolver do
     private
 
     def resolve_issue_status_counts(args = {}, context = { current_user: current_user })
-      resolve(described_class, obj: project, args: args, ctx: context)
+      resolve(described_class, obj: parent, args: args, ctx: context)
     end
   end
 end