Merge branch 'master' into 28433-internationalise-cycle-analytics-page

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index 7a07ea618c0..033e6ecd18c 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -27,6 +27,22 @@ describe Projects::CreateService, '#execute', services: true do
     end
   end
 
+  context "admin creates project with other user's namespace_id" do
+    it 'sets the correct permissions' do
+      admin = create(:admin)
+      opts = {
+        name: 'GitLab',
+        namespace_id: user.namespace.id
+      }
+      project = create_project(admin, opts)
+
+      expect(project).to be_persisted
+      expect(project.owner).to eq(user)
+      expect(project.team.masters).to include(user, admin)
+      expect(project.namespace).to eq(user.namespace)
+    end
+  end
+
   context 'group namespace' do
     let(:group) do
       create(:group).tap do |group|