diff test/unit/.svn/text-base/time_entry_activity_test.rb.svn-base @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"
author Chris Cannam
date Mon, 06 Jun 2011 14:41:04 +0100
parents cbce1fd3b1b7
children
line wrap: on
line diff
--- a/test/unit/.svn/text-base/time_entry_activity_test.rb.svn-base	Thu Mar 03 15:08:45 2011 +0000
+++ b/test/unit/.svn/text-base/time_entry_activity_test.rb.svn-base	Mon Jun 06 14:41:04 2011 +0100
@@ -23,10 +23,10 @@
   def test_should_be_an_enumeration
     assert TimeEntryActivity.ancestors.include?(Enumeration)
   end
-  
+
   def test_objects_count
     assert_equal 3, TimeEntryActivity.find_by_name("Design").objects_count
-    assert_equal 1, TimeEntryActivity.find_by_name("Development").objects_count
+    assert_equal 2, TimeEntryActivity.find_by_name("Development").objects_count
   end
 
   def test_option_name