diff --git a/app/models/project.rb b/app/models/project.rb index afb0ee0..deb4974 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -723,9 +723,10 @@ class Project < ActiveRecord::Base end Redmine::Hook.call_hook(:model_project_copy_before_save, :source_project => project, :destination_project => self) save + else + false end end - true end # Returns a new unsaved Project instance with attributes copied from +project+ diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 42c6ff7..8e20900 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -608,6 +608,13 @@ class ProjectsControllerTest < ActionController::TestCase assert_redirected_to :controller => 'projects', :action => 'settings', :id => 'unique-copy' end + def test_post_copy_with_failure + @request.session[:user_id] = 1 + post :copy, :id => 1, :project => {:name => 'Copy', :identifier => ''} + assert_response :success + assert_template 'copy' + end + def test_jump_should_redirect_to_active_tab get :show, :id => 1, :jump => 'issues' assert_redirected_to '/projects/ecookbook/issues' diff --git a/test/unit/project_copy_test.rb b/test/unit/project_copy_test.rb index 2f1f6ee..c10a5de 100644 --- a/test/unit/project_copy_test.rb +++ b/test/unit/project_copy_test.rb @@ -46,6 +46,11 @@ class ProjectCopyTest < ActiveSupport::TestCase @project.enabled_module_names = @source_project.enabled_modules.collect(&:name) end + def test_copy_should_return_false_if_save_fails + project = Project.new(:name => 'Copy', :identifier => nil) + assert_equal false, project.copy(@source_project) + end + test "#copy should copy issues" do @source_project.issues << Issue.generate!(:status => IssueStatus.find_by_name('Closed'), :subject => "copy issue status",