X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6a9b0f05b28cee95b06377978339fc0028261583..ad4ab4603b27f2e89e4bb4a709bc04a6685ba67b:/test/models/diary_entry_test.rb

diff --git a/test/models/diary_entry_test.rb b/test/models/diary_entry_test.rb
index 958ca403f..eb794acec 100644
--- a/test/models/diary_entry_test.rb
+++ b/test/models/diary_entry_test.rb
@@ -1,22 +1,25 @@
 require "test_helper"
 
 class DiaryEntryTest < ActiveSupport::TestCase
-  fixtures :users, :languages
+  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)
-    diary_entry_valid(:title => "a" * 255)
-    diary_entry_valid({ :title => "a" * 256 }, false)
-    diary_entry_valid({ :body => "" }, false)
-    diary_entry_valid(:latitude => 90)
-    diary_entry_valid({ :latitude => 90.00001 }, false)
-    diary_entry_valid(:latitude => -90)
-    diary_entry_valid({ :latitude => -90.00001 }, false)
-    diary_entry_valid(:longitude => 180)
-    diary_entry_valid({ :longitude => 180.00001 }, false)
-    diary_entry_valid(:longitude => -180)
-    diary_entry_valid({ :longitude => -180.00001 }, false)
+    diary_entry_valid({ :title => "" }, :valid => false)
+    diary_entry_valid({ :title => "a" * 255 })
+    diary_entry_valid({ :title => "a" * 256 }, :valid => false)
+    diary_entry_valid({ :body => "" }, :valid => false)
+    diary_entry_valid({ :latitude => 90 })
+    diary_entry_valid({ :latitude => 90.00001 }, :valid => false)
+    diary_entry_valid({ :latitude => -90 })
+    diary_entry_valid({ :latitude => -90.00001 }, :valid => false)
+    diary_entry_valid({ :longitude => 180 })
+    diary_entry_valid({ :longitude => 180.00001 }, :valid => false)
+    diary_entry_valid({ :longitude => -180 })
+    diary_entry_valid({ :longitude => -180.00001 }, :valid => false)
   end
 
   def test_diary_entry_visible
@@ -45,8 +48,8 @@ class DiaryEntryTest < ActiveSupport::TestCase
 
   private
 
-  def diary_entry_valid(attrs, result = true)
+  def diary_entry_valid(attrs, valid: true)
     entry = build(:diary_entry, attrs)
-    assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}"
+    assert_equal valid, entry.valid?, "Expected #{attrs.inspect} to be #{valid}"
   end
 end