X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3b3f328ae4427ba0d1e3700ceabf7d0870f78dbd..6788569211e65f8445fda2caec04105cba4158e1:/test/models/diary_entry_test.rb diff --git a/test/models/diary_entry_test.rb b/test/models/diary_entry_test.rb index ba70c5228..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 @@ -28,6 +33,7 @@ class DiaryEntryTest < ActiveSupport::TestCase 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 @@ -42,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