summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorFabian Schneider <fabbbbbi+git@googlemail.com>2019-07-01 11:17:47 +0000
committerBob Van Landuyt <bob@gitlab.com>2019-07-01 11:17:47 +0000
commitb5952294cefa52d58f6cb58e88460ca3551cf377 (patch)
tree1dcc8e58ab44be50153af71c05b914617aa657e6 /spec
parent8611291dcf5dc3f7b54478d800e396565f4c6145 (diff)
downloadgitlab-ce-b5952294cefa52d58f6cb58e88460ca3551cf377.tar.gz
Revert "Include subgroups in shared_projects"
This reverts commit 4bed2daef935bb4097988e0eff4830fc13a23c37.
Diffstat (limited to 'spec')
-rw-r--r--spec/controllers/groups_controller_spec.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index 47d7e278183..d2faef5b12b 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -125,11 +125,14 @@ describe GroupsController do
end
context 'as json' do
- it 'includes all projects in event feed' do
- 3.times do
+ it 'includes all projects from groups and subgroups in event feed' do
+ 2.times do
project = create(:project, group: group)
create(:event, project: project)
end
+ subgroup = create(:group, parent: group)
+ project = create(:project, group: subgroup)
+ create(:event, project: project)
get :activity, params: { id: group.to_param }, format: :json