diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-08-31 16:02:31 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-08-31 16:02:31 +0000 |
| commit | 4f81c4c7f6fd1ea8bbad4935b6d1147dcf0010b8 (patch) | |
| tree | 2ffbfa16a0a33f91521073593cc259316506dd56 /test/functional/project_enumerations_controller_test.rb | |
| parent | a117b9a92464c20983d4aa0fac1be885df2a5cc3 (diff) | |
| download | redmine-4f81c4c7f6fd1ea8bbad4935b6d1147dcf0010b8.tar.gz redmine-4f81c4c7f6fd1ea8bbad4935b6d1147dcf0010b8.zip | |
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
Diffstat (limited to 'test/functional/project_enumerations_controller_test.rb')
| -rw-r--r-- | test/functional/project_enumerations_controller_test.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/functional/project_enumerations_controller_test.rb b/test/functional/project_enumerations_controller_test.rb index 3a10a3baf..f3a8115fd 100644 --- a/test/functional/project_enumerations_controller_test.rb +++ b/test/functional/project_enumerations_controller_test.rb @@ -2,7 +2,7 @@ require File.expand_path('../../test_helper', __FILE__) class ProjectEnumerationsControllerTest < ActionController::TestCase fixtures :all - + def setup @request.session[:user_id] = nil Setting.default_language = 'en' @@ -76,7 +76,7 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase }) assert project_activity_two.save - + put :update, :project_id => 1, :enumerations => { 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 @@ -102,7 +102,7 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase 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 - + @request.session[:user_id] = 2 # manager put :update, :project_id => 1, :enumerations => { "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 1, TimeEntry.find_all_by_activity_id_and_project_id(10, 1).size - + @request.session[:user_id] = 2 # manager put :update, :project_id => 1, :enumerations => { "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_two.id) end - + def test_destroy_should_reassign_time_entries_back_to_the_system_activity @request.session[:user_id] = 2 # manager project_activity = TimeEntryActivity.new({ @@ -176,7 +176,7 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase assert project_activity.save 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 - + delete :destroy, :project_id => 1 assert_response :redirect assert_redirected_to '/projects/ecookbook/settings/activities' |