Merge branch 'master' into tag-colour-preview-rebase

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

diff --git a/test/models/diary_entry_test.rb b/test/models/diary_entry_test.rb
index ba70c5228a796593b4fe124e4f68daaf432b8869..76e8bbbe02d04432e0b8ad202dd0823a361029fb 100644 (file)
--- a/test/models/diary_entry_test.rb
+++ b/test/models/diary_entry_test.rb
@@ -1,6 +1,11 @@
 require "test_helper"
 
 class DiaryEntryTest < ActiveSupport::TestCase
 require "test_helper"
 
 class DiaryEntryTest < ActiveSupport::TestCase

+  def setup
+    # Create the default language for diary entries
+    create(:language, :code => "en")
+  end
+

   def test_diary_entry_validations
     diary_entry_valid({})
     diary_entry_valid({ :title => "" }, false)
   def test_diary_entry_validations
     diary_entry_valid({})
     diary_entry_valid({ :title => "" }, false)


@@ -28,6 +33,7 @@ class DiaryEntryTest < ActiveSupport::TestCase
 
   def test_diary_entry_comments
     diary = create(:diary_entry)
 
   def test_diary_entry_comments
     diary = create(:diary_entry)

+    assert_equal(0, diary.comments.count)

     create(:diary_comment, :diary_entry => diary)
     assert_equal(1, diary.comments.count)
   end
     create(:diary_comment, :diary_entry => diary)
     assert_equal(1, diary.comments.count)
   end


@@ -43,8 +49,7 @@ class DiaryEntryTest < ActiveSupport::TestCase
   private
 
   def diary_entry_valid(attrs, result = true)
   private
 
   def diary_entry_valid(attrs, result = true)

-    entry = DiaryEntry.new(attributes_for(:diary_entry))
-    entry.assign_attributes(attrs)
+    entry = build(:diary_entry, attrs)

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