Merge remote-tracking branch 'upstream/pull/3403'

[rails.git] / test / models / user_test.rb

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 58c1d174b26a81dbccb88c95b8484500411c60af..76f5200912bee738cd54cdec5574bc1db1ff2119 100644 (file)
--- 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|
@@ -76,7 +76,7 @@ class UserTest < ActiveSupport::TestCase
 
   def test_display_name_valid
     # Due to sanitisation in the view some of these that you might not
-    # expact are allowed
+    # expect are allowed
     # However, would they affect the xml planet dumps?
     ok = ["Name", "'me", "he\"", "<hr>", "*ho", "\"help\"@",
           "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲", "space space"]
@@ -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,15 +144,15 @@ 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
 
   def test_user_preferred_editor
     user = create(:user)
     assert_nil user.preferred_editor
-    user.preferred_editor = "potlatch"
-    assert_equal "potlatch", user.preferred_editor
+    user.preferred_editor = "id"
+    assert_equal "id", user.preferred_editor
     user.save!
 
     user.preferred_editor = "invalid_editor"
@@ -256,9 +256,9 @@ class UserTest < ActiveSupport::TestCase
     assert create(:moderator_user).has_role?("moderator")
   end
 
-  def test_delete
+  def test_destroy
     user = create(:user, :with_home_location, :description => "foo")
-    user.delete
+    user.destroy
     assert_equal "user_#{user.id}", user.display_name
     assert user.description.blank?
     assert_nil user.home_lat