remove trailing white-spaces from test/functional/project_enumerations_controller_test.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6918 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
a117b9a924
commit
4f81c4c7f6
|
@ -2,7 +2,7 @@ require File.expand_path('../../test_helper', __FILE__)
|
||||||
|
|
||||||
class ProjectEnumerationsControllerTest < ActionController::TestCase
|
class ProjectEnumerationsControllerTest < ActionController::TestCase
|
||||||
fixtures :all
|
fixtures :all
|
||||||
|
|
||||||
def setup
|
def setup
|
||||||
@request.session[:user_id] = nil
|
@request.session[:user_id] = nil
|
||||||
Setting.default_language = 'en'
|
Setting.default_language = 'en'
|
||||||
|
@ -76,7 +76,7 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase
|
||||||
})
|
})
|
||||||
assert project_activity_two.save
|
assert project_activity_two.save
|
||||||
|
|
||||||
|
|
||||||
put :update, :project_id => 1, :enumerations => {
|
put :update, :project_id => 1, :enumerations => {
|
||||||
project_activity.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # De-activate
|
project_activity.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # De-activate
|
||||||
project_activity_two.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"} # De-activate
|
project_activity_two.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"} # De-activate
|
||||||
|
@ -102,7 +102,7 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase
|
||||||
|
|
||||||
def test_update_when_creating_new_activities_will_convert_existing_data
|
def test_update_when_creating_new_activities_will_convert_existing_data
|
||||||
assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size
|
assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size
|
||||||
|
|
||||||
@request.session[:user_id] = 2 # manager
|
@request.session[:user_id] = 2 # manager
|
||||||
put :update, :project_id => 1, :enumerations => {
|
put :update, :project_id => 1, :enumerations => {
|
||||||
"9"=> {"parent_id"=>"9", "custom_field_values"=>{"7" => "1"}, "active"=>"0"} # Design, De-activate
|
"9"=> {"parent_id"=>"9", "custom_field_values"=>{"7" => "1"}, "active"=>"0"} # Design, De-activate
|
||||||
|
@ -126,7 +126,7 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase
|
||||||
|
|
||||||
assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size
|
assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size
|
||||||
assert_equal 1, TimeEntry.find_all_by_activity_id_and_project_id(10, 1).size
|
assert_equal 1, TimeEntry.find_all_by_activity_id_and_project_id(10, 1).size
|
||||||
|
|
||||||
@request.session[:user_id] = 2 # manager
|
@request.session[:user_id] = 2 # manager
|
||||||
put :update, :project_id => 1, :enumerations => {
|
put :update, :project_id => 1, :enumerations => {
|
||||||
"9"=> {"parent_id"=>"9", "custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # Design
|
"9"=> {"parent_id"=>"9", "custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # Design
|
||||||
|
@ -164,7 +164,7 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase
|
||||||
assert_nil TimeEntryActivity.find_by_id(project_activity.id)
|
assert_nil TimeEntryActivity.find_by_id(project_activity.id)
|
||||||
assert_nil TimeEntryActivity.find_by_id(project_activity_two.id)
|
assert_nil TimeEntryActivity.find_by_id(project_activity_two.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_destroy_should_reassign_time_entries_back_to_the_system_activity
|
def test_destroy_should_reassign_time_entries_back_to_the_system_activity
|
||||||
@request.session[:user_id] = 2 # manager
|
@request.session[:user_id] = 2 # manager
|
||||||
project_activity = TimeEntryActivity.new({
|
project_activity = TimeEntryActivity.new({
|
||||||
|
@ -176,7 +176,7 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase
|
||||||
assert project_activity.save
|
assert project_activity.save
|
||||||
assert TimeEntry.update_all("activity_id = '#{project_activity.id}'", ["project_id = ? AND activity_id = ?", 1, 9])
|
assert TimeEntry.update_all("activity_id = '#{project_activity.id}'", ["project_id = ? AND activity_id = ?", 1, 9])
|
||||||
assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size
|
assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size
|
||||||
|
|
||||||
delete :destroy, :project_id => 1
|
delete :destroy, :project_id => 1
|
||||||
assert_response :redirect
|
assert_response :redirect
|
||||||
assert_redirected_to '/projects/ecookbook/settings/activities'
|
assert_redirected_to '/projects/ecookbook/settings/activities'
|
||||||
|
|
Loading…
Reference in New Issue