From 7f0ebeff1affcd4f5155790cc5a5884b052695af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jarka=20Kadlecova=CC=81?= <jarka@gitlab.com>
Date: Wed, 24 Jan 2018 07:06:24 +0100
Subject: Include subgroup issuables on the group page

---
 spec/finders/merge_requests_finder_spec.rb | 41 ++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 10 deletions(-)

(limited to 'spec/finders/merge_requests_finder_spec.rb')

diff --git a/spec/finders/merge_requests_finder_spec.rb b/spec/finders/merge_requests_finder_spec.rb
index 687ffaec7cc..9385c892c9e 100644
--- a/spec/finders/merge_requests_finder_spec.rb
+++ b/spec/finders/merge_requests_finder_spec.rb
@@ -6,31 +6,36 @@ describe MergeRequestsFinder do
   let(:user)  { create :user }
   let(:user2) { create :user }
 
-  let(:project1) { create(:project, :public) }
+  let(:group) { create(:group) }
+  let(:subgroup) { create(:group, parent: group) }
+  let(:project1) { create(:project, :public, group: group) }
   let(:project2) { fork_project(project1, user) }
   let(:project3) do
     p = fork_project(project1, user)
     p.update!(archived: true)
     p
   end
+  let(:project4) { create(:project, :public, group: subgroup) }
 
   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) }
+  let!(:merge_request5) { create(:merge_request, :simple, author: user, source_project: project4, target_project: project4) }
 
   before do
     project1.add_master(user)
     project2.add_developer(user)
     project3.add_developer(user)
     project2.add_developer(user2)
+    project4.add_developer(user)
   end
 
   describe "#execute" do
     it 'filters by scope' do
       params = { scope: 'authored', state: 'opened' }
       merge_requests = described_class.new(user, params).execute
-      expect(merge_requests.size).to eq(3)
+      expect(merge_requests.size).to eq(4)
     end
 
     it 'filters by project' do
@@ -39,10 +44,26 @@ describe MergeRequestsFinder do
       expect(merge_requests.size).to eq(1)
     end
 
+    it 'filters by group' do
+      params = { group_id: group.id }
+
+      merge_requests = described_class.new(user, params).execute
+
+      expect(merge_requests.size).to eq(2)
+    end
+
+    it 'filters by group including subgroups', :nested_groups do
+      params = { group_id: group.id, include_subgroups: true }
+
+      merge_requests = described_class.new(user, params).execute
+
+      expect(merge_requests.size).to eq(3)
+    end
+
     it 'filters by non_archived' do
       params = { non_archived: true }
       merge_requests = described_class.new(user, params).execute
-      expect(merge_requests.size).to eq(3)
+      expect(merge_requests.size).to eq(4)
     end
 
     it 'filters by iid' do
@@ -73,14 +94,14 @@ describe MergeRequestsFinder do
     end
 
     context 'with created_after and created_before params' do
-      let(:project4) { create(:project, forked_from_project: project1) }
+      let(:new_project) { create(:project, forked_from_project: project1) }
 
       let!(:new_merge_request) do
         create(:merge_request,
                :simple,
                author: user,
                created_at: 1.week.from_now,
-               source_project: project4,
+               source_project: new_project,
                target_project: project1)
       end
 
@@ -89,12 +110,12 @@ describe MergeRequestsFinder do
                :simple,
                author: user,
                created_at: 1.week.ago,
-               source_project: project4,
-               target_project: project4)
+               source_project: new_project,
+               target_project: new_project)
       end
 
       before do
-        project4.add_master(user)
+        new_project.add_master(user)
       end
 
       it 'filters by created_after' do
@@ -106,7 +127,7 @@ describe MergeRequestsFinder do
       end
 
       it 'filters by created_before' do
-        params = { project_id: project4.id, created_before: old_merge_request.created_at + 1.second }
+        params = { project_id: new_project.id, created_before: old_merge_request.created_at + 1.second }
 
         merge_requests = described_class.new(user, params).execute
 
@@ -119,7 +140,7 @@ describe MergeRequestsFinder do
     it 'returns the number of rows for the default state' do
       finder = described_class.new(user)
 
-      expect(finder.row_count).to eq(3)
+      expect(finder.row_count).to eq(4)
     end
 
     it 'returns the number of rows for a given state' do
-- 
cgit v1.2.1