Merge branch 'master' into openid

[rails.git] / test / unit / diary_entry_test.rb

diff --git a/test/unit/diary_entry_test.rb b/test/unit/diary_entry_test.rb
index e28e03a105704fb6092ac4fdc79691cda1a7bd58..54ac0175bcbb14b6c3ea46e551a3060110d78e04 100644 (file)
--- a/test/unit/diary_entry_test.rb
+++ b/test/unit/diary_entry_test.rb
@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 require File.dirname(__FILE__) + '/../test_helper'
 

-class DiaryEntryTest < Test::Unit::TestCase
+class DiaryEntryTest < ActiveSupport::TestCase

   api_fixtures
   api_fixtures

-  fixtures :diary_entries
+  fixtures :diary_entries, :languages

   
   def test_diary_entry_count
     assert_equal 2, DiaryEntry.count
   
   def test_diary_entry_count
     assert_equal 2, DiaryEntry.count


@@ -27,7 +27,7 @@ class DiaryEntryTest < Test::Unit::TestCase
   def diary_entry_valid(attrs, result = true)
     entry = diary_entries(:normal_user_entry_1).clone
     entry.attributes = attrs
   def diary_entry_valid(attrs, result = true)
     entry = diary_entries(:normal_user_entry_1).clone
     entry.attributes = attrs

-    assert_equal result, entry.valid?
+    assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}"

   end
   
 end
   end
   
 end