Skip to content
Snippets Groups Projects
Commit acd573f1 authored by Jose Ivan Vargas Lopez's avatar Jose Ivan Vargas Lopez
Browse files

minor adjustments to the specs

parent fbde5e33
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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?
Loading
Loading
Loading
Loading
@@ -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
 
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment