mirror of
https://github.com/redmine/redmine.git
synced 2026-07-04 15:39:09 +02:00
Merged r18636 from trunk to 4.0-stable
fix assert_equal parameter is broken in test/functional/project_enumerations_controller_test.rb git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18637 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -155,7 +155,7 @@ class ProjectEnumerationsControllerTest < Redmine::ControllerTest
|
||||
# All TimeEntries using project activity
|
||||
project_specific_activity = TimeEntryActivity.find_by_parent_id_and_project_id(9, 1)
|
||||
assert_equal 3, TimeEntry.where(:activity_id => project_specific_activity.id,
|
||||
:project_id => 1).count
|
||||
:project_id => 1).count,
|
||||
"No Time Entries assigned to the project activity"
|
||||
end
|
||||
|
||||
@@ -185,11 +185,11 @@ class ProjectEnumerationsControllerTest < Redmine::ControllerTest
|
||||
|
||||
# TimeEntries shouldn't have been reassigned on the failed record
|
||||
assert_equal 3, TimeEntry.where(:activity_id => 9,
|
||||
:project_id => 1).count
|
||||
:project_id => 1).count,
|
||||
"Time Entries are not assigned to system activities"
|
||||
# TimeEntries shouldn't have been reassigned on the saved record either
|
||||
assert_equal 1, TimeEntry.where(:activity_id => 10,
|
||||
:project_id => 1).count
|
||||
:project_id => 1).count,
|
||||
"Time Entries are not assigned to system activities"
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user