summaryrefslogtreecommitdiff
path: root/spec/services
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2018-04-24 17:26:08 +1000
committerDylan Griffith <dyl.griffith@gmail.com>2018-04-24 17:26:08 +1000
commit51cc01b6c9468056f40cdc8deb0e4b6414a3ccb9 (patch)
treeb72c20e3bec34a9433eb5115ddec82460d9851d7 /spec/services
parent9447e5c27d8f840eaf4eee9635a5149ab36d93b6 (diff)
parent2e00c1a72afc4b7388bb46bd6d58608e2ae61899 (diff)
downloadgitlab-ce-51cc01b6c9468056f40cdc8deb0e4b6414a3ccb9.tar.gz
Merge branch 'master' into siemens-runner-per-group
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/groups/nested_create_service_spec.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/services/groups/nested_create_service_spec.rb b/spec/services/groups/nested_create_service_spec.rb
index 6491fb34777..86fdd43c1e5 100644
--- a/spec/services/groups/nested_create_service_spec.rb
+++ b/spec/services/groups/nested_create_service_spec.rb
@@ -59,8 +59,11 @@ describe Groups::NestedCreateService do
describe "#execute" do
it 'returns the group if it already existed' do
- parent = create(:group, path: 'a-group', owner: user)
- child = create(:group, path: 'a-sub-group', parent: parent, owner: user)
+ parent = create(:group, path: 'a-group')
+ child = create(:group, path: 'a-sub-group', parent: parent)
+
+ parent.add_owner(user)
+ child.add_owner(user)
expect(service.execute).to eq(child)
end