updated base controller and added more specsfix/import-namespace

4 files changed, 140 insertions, 7 deletions

diff --git a/app/controllers/import/base_controller.rb b/app/controllers/import/base_controller.rb
index 1b08262f3cd..16e8cac2699 100644
--- a/app/controllers/import/base_controller.rb
+++ b/app/controllers/import/base_controller.rb
@@ -5,10 +5,10 @@ class Import::BaseController < ApplicationController
     return current_user.namespace if names == owner
     return current_user.namespace unless current_user.can_create_group?
 
+    names = params[:target_namespace].presence || names
     full_path_namespace = Namespace.find_by_full_path(names)
-    return full_path_namespace if full_path_namespace
 
-    names = params[:target_namespace].presence || names
+    return full_path_namespace if full_path_namespace
 
     names.split('/').inject(nil) do |parent, name|
       begin
diff --git a/spec/controllers/import/bitbucket_controller_spec.rb b/spec/controllers/import/bitbucket_controller_spec.rb
index 51f23e4eeb9..010e3180ea4 100644
--- a/spec/controllers/import/bitbucket_controller_spec.rb
+++ b/spec/controllers/import/bitbucket_controller_spec.rb
@@ -200,5 +200,72 @@ describe Import::BitbucketController do
         end
       end
     end
+
+    context 'user has chosen an existing nested namespace and name for the project' do
+      let(:parent_namespace) { create(:namespace, name: 'foo', owner: user) }
+      let(:nested_namespace) { create(:namespace, name: 'bar', parent: parent_namespace, owner: user) }
+      let(:test_name) { 'test_name' }
+
+      it 'takes the selected namespace and name' do
+        expect(Gitlab::BitbucketImport::ProjectCreator).
+          to receive(:new).with(bitbucket_repo, test_name, nested_namespace, user, access_params).
+            and_return(double(execute: true))
+
+        post :create, { target_namespace: nested_namespace.full_path, new_name: test_name, format: :js }
+      end
+    end
+
+    context 'user has chosen a non-existent nested namespaces and name for the project' do
+      let(:test_name) { 'test_name' }
+
+      it 'takes the selected namespace and name' do
+        expect(Gitlab::BitbucketImport::ProjectCreator).
+          to receive(:new).with(bitbucket_repo, test_name, kind_of(Namespace), user, access_params).
+            and_return(double(execute: true))
+
+        post :create, { target_namespace: 'foo/bar', new_name: test_name, format: :js }
+      end
+
+      it 'creates the namespaces' do
+        allow(Gitlab::BitbucketImport::ProjectCreator).
+          to receive(:new).with(bitbucket_repo, test_name, kind_of(Namespace), user, access_params).
+            and_return(double(execute: true))
+
+        expect { post :create, { target_namespace: 'foo/bar', new_name: test_name, format: :js } }
+          .to change { Namespace.count }.by(2)
+      end
+
+      it 'new namespace has the right parent' do
+        allow(Gitlab::BitbucketImport::ProjectCreator).
+          to receive(:new).with(bitbucket_repo, test_name, kind_of(Namespace), user, access_params).
+            and_return(double(execute: true))
+
+        post :create, { target_namespace: 'foo/bar', new_name: test_name, format: :js }
+
+        expect(Namespace.find_by_path_or_name('bar').parent.path).to eq('foo')
+      end
+    end
+
+    context 'user has chosen existent and non-existent nested namespaces and name for the project' do
+      let(:test_name) { 'test_name' }
+      let!(:parent_namespace) { create(:namespace, name: 'foo', owner: user) }
+
+      it 'takes the selected namespace and name' do
+        expect(Gitlab::BitbucketImport::ProjectCreator).
+          to receive(:new).with(bitbucket_repo, test_name, kind_of(Namespace), user, access_params).
+            and_return(double(execute: true))
+
+        post :create, { target_namespace: 'foo/foobar/bar', new_name: test_name, format: :js }
+      end
+
+      it 'creates the namespaces' do
+        allow(Gitlab::BitbucketImport::ProjectCreator).
+          to receive(:new).with(bitbucket_repo, test_name, kind_of(Namespace), user, access_params).
+            and_return(double(execute: true))
+
+        expect { post :create, { target_namespace: 'foo/foobar/bar', new_name: test_name, format: :js } }
+          .to change { Namespace.count }.by(2)
+      end
+    end
   end
 end
diff --git a/spec/controllers/import/gitlab_controller_spec.rb b/spec/controllers/import/gitlab_controller_spec.rb
index 3f73ea000ae..2dbb89219d0 100644
--- a/spec/controllers/import/gitlab_controller_spec.rb
+++ b/spec/controllers/import/gitlab_controller_spec.rb
@@ -174,6 +174,72 @@ describe Import::GitlabController do
           end
         end
       end
+      
+      context 'user has chosen an existing nested namespace for the project' do
+        let(:parent_namespace) { create(:namespace, name: 'foo', owner: user) }
+        let(:nested_namespace) { create(:namespace, name: 'bar', parent: parent_namespace, owner: user) }
+
+        it 'takes the selected namespace and name' do
+          expect(Gitlab::GitlabImport::ProjectCreator).
+            to receive(:new).with(gitlab_repo, nested_namespace, user, access_params).
+              and_return(double(execute: true))
+
+          post :create, { target_namespace: nested_namespace.full_path, format: :js }
+        end
+      end
+
+      context 'user has chosen a non-existent nested namespaces for the project' do
+        let(:test_name) { 'test_name' }
+
+        it 'takes the selected namespace and name' do
+          expect(Gitlab::GitlabImport::ProjectCreator).
+            to receive(:new).with(gitlab_repo, kind_of(Namespace), user, access_params).
+              and_return(double(execute: true))
+
+          post :create, { target_namespace: 'foo/bar', format: :js }
+        end
+
+        it 'creates the namespaces' do
+          allow(Gitlab::GitlabImport::ProjectCreator).
+            to receive(:new).with(gitlab_repo, kind_of(Namespace), user, access_params).
+              and_return(double(execute: true))
+
+          expect { post :create, { target_namespace: 'foo/bar', format: :js } }
+            .to change { Namespace.count }.by(2)
+        end
+
+        it 'new namespace has the right parent' do
+          allow(Gitlab::GitlabImport::ProjectCreator).
+            to receive(:new).with(gitlab_repo, kind_of(Namespace), user, access_params).
+              and_return(double(execute: true))
+
+          post :create, { target_namespace: 'foo/bar', format: :js }
+
+          expect(Namespace.find_by_path_or_name('bar').parent.path).to eq('foo')
+        end
+      end
+
+      context 'user has chosen existent and non-existent nested namespaces and name for the project' do
+        let(:test_name) { 'test_name' }
+        let!(:parent_namespace) { create(:namespace, name: 'foo', owner: user) }
+
+        it 'takes the selected namespace and name' do
+          expect(Gitlab::GitlabImport::ProjectCreator).
+            to receive(:new).with(gitlab_repo, kind_of(Namespace), user, access_params).
+              and_return(double(execute: true))
+
+          post :create, { target_namespace: 'foo/foobar/bar', format: :js }
+        end
+
+        it 'creates the namespaces' do
+          allow(Gitlab::GitlabImport::ProjectCreator).
+            to receive(:new).with(gitlab_repo, kind_of(Namespace), user, access_params).
+              and_return(double(execute: true))
+
+          expect { post :create, { target_namespace: 'foo/foobar/bar', format: :js } }
+            .to change { Namespace.count }.by(2)
+        end
+      end
     end
   end
 end
diff --git a/spec/support/controllers/githubish_import_controller_shared_examples.rb b/spec/support/controllers/githubish_import_controller_shared_examples.rb
index cba5fe567c2..c59b30c772d 100644
--- a/spec/support/controllers/githubish_import_controller_shared_examples.rb
+++ b/spec/support/controllers/githubish_import_controller_shared_examples.rb
@@ -248,7 +248,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
 
       it 'takes the selected namespace and name' do
         expect(Gitlab::GithubImport::ProjectCreator).
-          to receive(:new).with(provider_repo, test_name, instance_of(Group), user, access_params, type: provider).
+          to receive(:new).with(provider_repo, test_name, kind_of(Namespace), user, access_params, type: provider).
             and_return(double(execute: true))
 
         post :create, { target_namespace: 'foo/bar', new_name: test_name, format: :js }
@@ -256,7 +256,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
 
       it 'creates the namespaces' do
         allow(Gitlab::GithubImport::ProjectCreator).
-          to receive(:new).with(provider_repo, test_name, instance_of(Group), user, access_params, type: provider).
+          to receive(:new).with(provider_repo, test_name, kind_of(Namespace), user, access_params, type: provider).
             and_return(double(execute: true))
 
         expect { post :create, { target_namespace: 'foo/bar', new_name: test_name, format: :js } }
@@ -265,7 +265,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
 
       it 'new namespace has the right parent' do
         allow(Gitlab::GithubImport::ProjectCreator).
-          to receive(:new).with(provider_repo, test_name, instance_of(Group), user, access_params, type: provider).
+          to receive(:new).with(provider_repo, test_name, kind_of(Namespace), user, access_params, type: provider).
             and_return(double(execute: true))
 
         post :create, { target_namespace: 'foo/bar', new_name: test_name, format: :js }
@@ -280,7 +280,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
 
       it 'takes the selected namespace and name' do
         expect(Gitlab::GithubImport::ProjectCreator).
-          to receive(:new).with(provider_repo, test_name, instance_of(Group), user, access_params, type: provider).
+          to receive(:new).with(provider_repo, test_name, kind_of(Namespace), user, access_params, type: provider).
             and_return(double(execute: true))
 
         post :create, { target_namespace: 'foo/foobar/bar', new_name: test_name, format: :js }
@@ -288,7 +288,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
 
       it 'creates the namespaces' do
         allow(Gitlab::GithubImport::ProjectCreator).
-          to receive(:new).with(provider_repo, test_name, instance_of(Group), user, access_params, type: provider).
+          to receive(:new).with(provider_repo, test_name, kind_of(Namespace), user, access_params, type: provider).
             and_return(double(execute: true))
 
         expect { post :create, { target_namespace: 'foo/foobar/bar', new_name: test_name, format: :js } }