1 files changed, 66 insertions, 0 deletions
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