Merge branch '24733-archived-project-merge-request-count' into 'master'

Fix Archived project merge requests add to group's Merge Requests

Closes #24733

See merge request !7790

2 files changed, 39 insertions, 2 deletions

diff --git a/spec/features/groups/merge_requests_spec.rb b/spec/features/groups/merge_requests_spec.rb
index a2791b57544..30b80aa82b0 100644
--- a/spec/features/groups/merge_requests_spec.rb
+++ b/spec/features/groups/merge_requests_spec.rb
@@ -2,7 +2,35 @@ require 'spec_helper'
 
 feature 'Group merge requests page', feature: true do
   let(:path) { merge_requests_group_path(group) }
-  let(:issuable) { create(:merge_request, source_project: project, target_project: project, title: "this is my created issuable")}
+  let(:issuable) { create(:merge_request, source_project: project, target_project: project, title: 'this is my created issuable') }
 
   include_examples 'project features apply to issuables', MergeRequest
+
+  context 'archived issuable' do
+    let(:project_archived) { create(:project, group: group, merge_requests_access_level: ProjectFeature::ENABLED, archived: true) }
+    let(:issuable_archived) { create(:merge_request, source_project: project_archived, target_project: project_archived, title: 'issuable of an archived project') }
+    let(:access_level) { ProjectFeature::ENABLED }
+    let(:user) { user_in_group }
+
+    before do
+      issuable_archived
+      visit path
+    end
+
+    it 'hides archived merge requests' do
+      expect(page).to have_content(issuable.title)
+      expect(page).not_to have_content(issuable_archived.title)
+    end
+
+    it 'ignores archived merge request count badges in navbar' do
+      expect( page.find('[title="Merge Requests"] span.badge.count').text).to eq("1")
+    end
+
+    it 'ignores archived merge request count badges in state-filters' do
+      expect(page.find('#state-opened span.badge').text).to eq("1")
+      expect(page.find('#state-merged span.badge').text).to eq("0")
+      expect(page.find('#state-closed span.badge').text).to eq("0")
+      expect(page.find('#state-all span.badge').text).to eq("1")
+    end
+  end
 end
diff --git a/spec/finders/merge_requests_finder_spec.rb b/spec/finders/merge_requests_finder_spec.rb
index 535aabfc18d..88361e27102 100644
--- a/spec/finders/merge_requests_finder_spec.rb
+++ b/spec/finders/merge_requests_finder_spec.rb
@@ -6,14 +6,17 @@ describe MergeRequestsFinder do
 
   let(:project1) { create(:project) }
   let(:project2) { create(:project, forked_from_project: project1) }
+  let(:project3) { create(:project, forked_from_project: project1, archived: true) }
 
   let!(:merge_request1) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project1) }
   let!(:merge_request2) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project1, state: 'closed') }
   let!(:merge_request3) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project2) }
+  let!(:merge_request4) { create(:merge_request, :simple, author: user, source_project: project3, target_project: project3) }
 
   before do
     project1.team << [user, :master]
     project2.team << [user, :developer]
+    project3.team << [user, :developer]
     project2.team << [user2, :developer]
   end
 
@@ -21,7 +24,7 @@ describe MergeRequestsFinder do
     it 'filters by scope' do
       params = { scope: 'authored', state: 'opened' }
       merge_requests = MergeRequestsFinder.new(user, params).execute
-      expect(merge_requests.size).to eq(2)
+      expect(merge_requests.size).to eq(3)
     end
 
     it 'filters by project' do
@@ -29,5 +32,11 @@ describe MergeRequestsFinder do
       merge_requests = MergeRequestsFinder.new(user, params).execute
       expect(merge_requests.size).to eq(1)
     end
+
+    it 'filters by non_archived' do
+      params = { non_archived: true }
+      merge_requests = MergeRequestsFinder.new(user, params).execute
+      expect(merge_requests.size).to eq(3)
+    end
   end
 end