minor adjustments to the specs

3 files changed, 11 insertions, 12 deletions

diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index eae352d35ce..74fc83b4e77 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -12,7 +12,7 @@ module Projects
     TransferError = Class.new(StandardError)
 
     def execute(new_namespace)
-      if allowed_transfer?(current_user, project, new_namespace)
+      if !new_namespace.blank? && allowed_transfer?(current_user, project, new_namespace)
         transfer(project, new_namespace)
       else
         error_message = if new_namespace.blank? 
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 5f9c747634c..4f6fc6691be 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -229,23 +229,22 @@ describe ProjectsController do
   describe '#transfer' do
     render_views
 
-    subject(:project) { create(:project) }
+    let(:project) { create(:project) }
     let(:admin) { create(:admin) }
     let(:new_namespace) { create(:namespace) }
 
     it 'updates namespace' do
-      controller.instance_variable_set(:@project, project)
       sign_in(admin)
 
       put :transfer,
-          namespace_id: project.namespace.id,
+          namespace_id: project.namespace.path,
           new_namespace_id: new_namespace.id,
-          id: project.id,
+          id: project.path,
           format: :js
 
       project.reload
 
-      expect(project.namespace.id).to eq(new_namespace.id)
+      expect(project.namespace).to eq(new_namespace)
       expect(response).to have_http_status(200)
     end
 
@@ -254,18 +253,18 @@ describe ProjectsController do
         controller.instance_variable_set(:@project, project)
         sign_in(admin)
 
-        old_namespace_id = project.namespace.id
+        old_namespace = project.namespace
 
         put :transfer,
-            namespace_id: old_namespace_id,
+            namespace_id: old_namespace.path,
             new_namespace_id: nil,
-            id: project.id,
+            id: project.path,
             format: :js
 
         project.reload
 
-        expect(project.namespace.id).to eq(old_namespace_id)
-        expect(response).to have_http_status(200) 
+        expect(project.namespace).to eq(old_namespace)
+        expect(response).to have_http_status(200)
         expect(flash[:alert]).to eq 'Please select a new namespace for your project.'
       end
     end
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index 2bddb6f3e42..b957517c715 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -26,7 +26,7 @@ describe Projects::TransferService, services: true do
 
     it { expect(@result).to eq false }
     it { expect(project.namespace).to eq(user.namespace) }
-    it { expect(project.errors.messages[:new_namespace][0]).to eq 'Please select a new namespace for your project.' }
+    it { expect(project.errors.messages[:new_namespace].first).to eq 'Please select a new namespace for your project.' }
   end
 
   context 'disallow transfering of project with tags' do