summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-10-09 07:35:22 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-10-09 07:35:22 +0000
commit7d138ae57532c043439af118d55ce7f8353ad174 (patch)
tree73a0d098baaf5f066df11faf9191bd2ec371bcad
parent880d43532a6c1cc2f43759a9af2cf889e06e62b8 (diff)
downloadredmine-7d138ae57532c043439af118d55ce7f8353ad174.tar.gz
redmine-7d138ae57532c043439af118d55ce7f8353ad174.zip
Merged r18636 from trunk to 3.4-stable
fix assert_equal parameter is broken in test/functional/project_enumerations_controller_test.rb git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18638 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/functional/project_enumerations_controller_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/project_enumerations_controller_test.rb b/test/functional/project_enumerations_controller_test.rb
index f98d85965..d6d47e798 100644
--- a/test/functional/project_enumerations_controller_test.rb
+++ b/test/functional/project_enumerations_controller_test.rb
@@ -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