kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rails4: replace deprecated find_all_by_* at ProjectEnumerationsControllerTest 

git-svn-id: http://svn.redmine.org/redmine/trunk@12523 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2014-01-08 06:42:52 +00:00
parent 184ea832d6
commit ce2e9158a5
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/functional/project_enumerations_controller_test.rb
View File

@ -129,7 +129,7 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase
end
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.where(:activity_id => 9, :project_id => 1).count
@request.session[:user_id] = 2 # manager
put :update, :project_id => 1, :enumerations => {
@ -152,8 +152,8 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase
TimeEntryActivity.create!({:name => parent.name, :project_id => 1, :position => parent.position, :active => true})
TimeEntry.create!({:project_id => 1, :hours => 1.0, :user => User.find(1), :issue_id => 3, :activity_id => 10, :spent_on => '2009-01-01'})
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 3, TimeEntry.where(:activity_id => 9, :project_id => 1).count
assert_equal 1, TimeEntry.where(:activity_id => 10, :project_id => 1).count
@request.session[:user_id] = 2 # manager
put :update, :project_id => 1, :enumerations => {
@ -210,8 +210,15 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase
assert_redirected_to '/projects/ecookbook/settings/activities'
assert_nil TimeEntryActivity.find_by_id(project_activity.id)
assert_equal 0, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size, "TimeEntries still assigned to project specific activity"
assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size, "TimeEntries still assigned to project specific activity"
assert_equal 0, TimeEntry.where(
:activity_id => project_activity.id,
:project_id => 1
).count,
"TimeEntries still assigned to project specific activity"
assert_equal 3, TimeEntry.where(
:activity_id => 9,
:project_id => 1
).count,
"TimeEntries still assigned to project specific activity"
end
end