From: Tom Hughes <tom@compton.nu>
Date: Tue, 23 Mar 2021 19:48:13 +0000 (+0000)
Subject: Fix new rubocop warnings
X-Git-Tag: live~1659
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3512d6303c438ceaab5e74bcc43b165a55a2aa20

Fix new rubocop warnings
---

diff --git a/test/integration/page_locale_test.rb b/test/integration/page_locale_test.rb
index 239c1d847..b42865ae4 100644
--- a/test/integration/page_locale_test.rb
+++ b/test/integration/page_locale_test.rb
@@ -18,7 +18,7 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
     follow_redirect!
 
     get "/diary/new"
-    assert_equal [], User.find(user.id).languages
+    assert_empty User.find(user.id).languages
     assert_select "html[lang=?]", "en"
 
     get "/diary/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => "fr, en" }
diff --git a/test/lib/locale_test.rb b/test/lib/locale_test.rb
index 7b02b3f1f..d84239038 100644
--- a/test/lib/locale_test.rb
+++ b/test/lib/locale_test.rb
@@ -68,7 +68,7 @@ class LocaleTest < ActiveSupport::TestCase
   end
 
   def test_list
-    assert_equal [], Locale.list
+    assert_empty Locale.list
     assert_equal [EN], Locale.list("en")
     assert_equal [EN, ZH_YUE, ZH_HANT_TW], Locale.list("en", "zh-yue", "zh-Hant-TW")
     assert_equal [ZH_YUE, ZH_HANT_TW], Locale.list("en;de", "zh-yue", "zh-Hant-TW")
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index de318df20..4c863272b 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -52,7 +52,7 @@ class UserTest < ActiveSupport::TestCase
     ok.each do |name|
       user = build(:user)
       user.email = name
-      assert user.valid?(:save), user.errors.full_messages.join(",")
+      assert user.valid?(:save), "#{name} isn't valid when it should be"
     end
 
     bad.each do |name|
@@ -129,11 +129,11 @@ class UserTest < ActiveSupport::TestCase
     # charlie and alice are both near bob, but alice has their data private
     assert_equal [charlie], bob.nearby
     # david has no user nearby, since edward is not active
-    assert_equal [], david.nearby
+    assert_empty david.nearby
     # south_pole_user has no user nearby, and doesn't throw exception
-    assert_equal [], south_pole_user.nearby
+    assert_empty south_pole_user.nearby
     # vagrant_user has no home location
-    assert_equal [], vagrant_user.nearby
+    assert_empty vagrant_user.nearby
   end
 
   def test_friends
@@ -144,7 +144,7 @@ class UserTest < ActiveSupport::TestCase
     assert_equal [sec], norm.friends
     assert_equal 1, norm.friends.size
 
-    assert_equal [], sec.friends
+    assert_empty sec.friends
     assert_equal 0, sec.friends.size
   end