Unconditionally unbind moveend event

[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 2d5c34f83ed36698bb71abb90811fcb028a979e2..0801aa299a9ca74f86ff0f9575a22caee5e14c5f 100644 (file)
--- a/test/unit/diary_entry_test.rb
+++ b/test/unit/diary_entry_test.rb
@@ -5,7 +5,7 @@ class DiaryEntryTest < ActiveSupport::TestCase
   fixtures :diary_entries, :diary_comments, :languages
   
   def test_diary_entry_count
-    assert_equal 3, DiaryEntry.count
+    assert_equal 5, DiaryEntry.count
   end
   
   def test_diary_entry_validations
@@ -25,7 +25,7 @@ class DiaryEntryTest < ActiveSupport::TestCase
   end
 
   def test_diary_entry_visible
-    assert_equal 2, DiaryEntry.visible.count
+    assert_equal 4, DiaryEntry.visible.count
     assert_raise ActiveRecord::RecordNotFound do
       DiaryEntry.visible.find(diary_entries(:deleted_entry).id)
     end
@@ -33,7 +33,7 @@ class DiaryEntryTest < ActiveSupport::TestCase
   
   def test_diary_entry_comments
     assert_equal 0, diary_entries(:normal_user_entry_1).comments.count
-    assert_equal 3, diary_entries(:normal_user_geo_entry).comments.count
+    assert_equal 4, diary_entries(:normal_user_geo_entry).comments.count
   end
   
   def test_diary_entry_visible_comments
@@ -44,8 +44,8 @@ class DiaryEntryTest < ActiveSupport::TestCase
 private
 
   def diary_entry_valid(attrs, result = true)
-    entry = DiaryEntry.new(diary_entries(:normal_user_entry_1).attributes, :without_protection => true)
-    entry.assign_attributes(attrs, :without_protection => true)
+    entry = DiaryEntry.new(diary_entries(:normal_user_entry_1).attributes)
+    entry.assign_attributes(attrs)
     assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}"
   end  
 end