Backported r5581 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5584 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
8d3b32644b
commit
e20191e666
2 files changed
+30
-3
No files matched your search
@@ -117,7 +117,6 @@ class ProjectsController < ApplicationController
|
|||||||
Mailer.with_deliveries(params[:notifications] == '1') do
|
Mailer.with_deliveries(params[:notifications] == '1') do
|
||||||
@project = Project.new
|
@project = Project.new
|
||||||
@project.safe_attributes = params[:project]
|
@project.safe_attributes = params[:project]
|
||||||
@project.enabled_module_names = params[:enabled_modules]
|
|
||||||
if validate_parent_id && @project.copy(@source_project, :only => params[:only])
|
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')
|
@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
|
||||||
flash[:notice] = l(:notice_successful_create)
|
flash[:notice] = l(:notice_successful_create)
|
||||||
|
|||||||
@@ -448,7 +448,7 @@ class ProjectsControllerTest < ActionController::TestCase
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_copy_with_project
|
def test_get_copy
|
||||||
@request.session[:user_id] = 1 # admin
|
@request.session[:user_id] = 1 # admin
|
||||||
get :copy, :id => 1
|
get :copy, :id => 1
|
||||||
assert_response :success
|
assert_response :success
|
||||||
@@ -456,14 +456,42 @@ class ProjectsControllerTest < ActionController::TestCase
|
|||||||
assert assigns(:project)
|
assert assigns(:project)
|
||||||
assert_equal Project.find(1).description, assigns(:project).description
|
assert_equal Project.find(1).description, assigns(:project).description
|
||||||
assert_nil assigns(:project).id
|
assert_nil assigns(:project).id
|
||||||
|
|
||||||
|
assert_tag :tag => 'input',
|
||||||
|
:attributes => {:name => 'project[enabled_module_names][]', :value => 'issue_tracking'}
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_copy_without_project
|
def test_get_copy_without_project
|
||||||
@request.session[:user_id] = 1 # admin
|
@request.session[:user_id] = 1 # admin
|
||||||
get :copy
|
get :copy
|
||||||
assert_response :redirect
|
assert_response :redirect
|
||||||
assert_redirected_to :controller => 'admin', :action => 'projects'
|
assert_redirected_to :controller => 'admin', :action => 'projects'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_post_copy_should_copy_requested_items
|
||||||
|
@request.session[:user_id] = 1 # admin
|
||||||
|
CustomField.delete_all
|
||||||
|
|
||||||
|
assert_difference 'Project.count' do
|
||||||
|
post :copy, :id => 1,
|
||||||
|
:project => {
|
||||||
|
:name => 'Copy',
|
||||||
|
:identifier => 'unique-copy',
|
||||||
|
:tracker_ids => ['1', '2', '3', ''],
|
||||||
|
: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,
|
||||||
|
project.issues.count, "All issues were not copied"
|
||||||
|
assert_equal 0, project.members.count
|
||||||
|
end
|
||||||
|
|
||||||
context "POST :copy" do
|
context "POST :copy" do
|
||||||
should "TODO: test the rest of the method"
|
should "TODO: test the rest of the method"
|
||||||
|
|||||||
Reference in new issue
Block a user