diff options
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 | ||||
| -rw-r--r-- | test/functional/projects_controller_test.rb | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index ea2ddd132..8579d0a80 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -117,7 +117,6 @@ class ProjectsController < ApplicationController Mailer.with_deliveries(params[:notifications] == '1') do @project = Project.new @project.safe_attributes = params[:project] - @project.enabled_module_names = params[:enabled_modules] if validate_parent_id && @project.copy(@source_project, :only => params[:only]) @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') flash[:notice] = l(:notice_successful_create) diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 3d00b8634..cb42cad03 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -448,7 +448,7 @@ class ProjectsControllerTest < ActionController::TestCase end end - def test_copy_with_project + def test_get_copy @request.session[:user_id] = 1 # admin get :copy, :id => 1 assert_response :success @@ -456,9 +456,12 @@ class ProjectsControllerTest < ActionController::TestCase assert assigns(:project) assert_equal Project.find(1).description, assigns(:project).description assert_nil assigns(:project).id + + assert_tag :tag => 'input', + :attributes => {:name => 'project[enabled_module_names][]', :value => 'issue_tracking'} end - def test_copy_without_project + def test_get_copy_without_project @request.session[:user_id] = 1 # admin get :copy assert_response :redirect @@ -475,12 +478,14 @@ class ProjectsControllerTest < ActionController::TestCase :name => 'Copy', :identifier => 'unique-copy', :tracker_ids => ['1', '2', '3', ''], - :enabled_modules => %w(issue_tracking time_tracking) + :enabled_module_names => %w(issue_tracking time_tracking) }, :only => %w(issues versions) end project = Project.find('unique-copy') source = Project.find(1) + assert_equal %w(issue_tracking time_tracking), project.enabled_module_names.sort + assert_equal source.versions.count, project.versions.count, "All versions were not copied" # issues assigned to a closed version won't be copied assert_equal source.issues.select {|i| i.fixed_version.nil? || i.fixed_version.open?}.size, |