Merge branch 'pull/3035'

[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..2b94d04dd76f3598c0f127a7d345837c9a600a94 100644 (file)
--- a/test/models/diary_entry_test.rb
+++ b/test/models/diary_entry_test.rb
@@ -1,20 +1,25 @@
 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({})
   def test_diary_entry_validations
     diary_entry_valid({})

-    diary_entry_valid({ :title => "" }, false)
+    diary_entry_valid({ :title => "" }, :valid => false)

     diary_entry_valid(:title => "a" * 255)
     diary_entry_valid(:title => "a" * 255)

-    diary_entry_valid({ :title => "a" * 256 }, false)
-    diary_entry_valid({ :body => "" }, false)
+    diary_entry_valid({ :title => "a" * 256 }, :valid => false)
+    diary_entry_valid({ :body => "" }, :valid => false)

     diary_entry_valid(:latitude => 90)
     diary_entry_valid(:latitude => 90)

-    diary_entry_valid({ :latitude => 90.00001 }, false)
+    diary_entry_valid({ :latitude => 90.00001 }, :valid => false)

     diary_entry_valid(:latitude => -90)
     diary_entry_valid(:latitude => -90)

-    diary_entry_valid({ :latitude => -90.00001 }, false)
+    diary_entry_valid({ :latitude => -90.00001 }, :valid => false)

     diary_entry_valid(:longitude => 180)
     diary_entry_valid(:longitude => 180)

-    diary_entry_valid({ :longitude => 180.00001 }, false)
+    diary_entry_valid({ :longitude => 180.00001 }, :valid => false)

     diary_entry_valid(:longitude => -180)
     diary_entry_valid(:longitude => -180)

-    diary_entry_valid({ :longitude => -180.00001 }, false)
+    diary_entry_valid({ :longitude => -180.00001 }, :valid => false)

   end
 
   def test_diary_entry_visible
   end
 
   def test_diary_entry_visible


@@ -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


@@ -42,9 +48,8 @@ class DiaryEntryTest < ActiveSupport::TestCase
 
   private
 
 
   private
 

-  def diary_entry_valid(attrs, result = true)
-    entry = DiaryEntry.new(attributes_for(:diary_entry))
-    entry.assign_attributes(attrs)
-    assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}"
+  def diary_entry_valid(attrs, valid: true)
+    entry = build(:diary_entry, attrs)
+    assert_equal valid, entry.valid?, "Expected #{attrs.inspect} to be #{valid}"

   end
 end
   end
 end