X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bb15077dcc5a5b4942b6a8f983eca59407d69423..98b8b9f70c24832cd58f5b8235bead1f612c36df:/test/models/diary_entry_test.rb diff --git a/test/models/diary_entry_test.rb b/test/models/diary_entry_test.rb index 6981ebc43..eb794acec 100644 --- 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 + 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 @@ -43,9 +48,8 @@ class DiaryEntryTest < ActiveSupport::TestCase 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