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 4c863272bf7d3cb92130b3b4c56486362c2f1a8f..76f5200912bee738cd54cdec5574bc1db1ff2119 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -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
 
   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"]
     # However, would they affect the xml planet dumps?
     ok = ["Name", "'me", "he\"", "<hr>", "*ho", "\"help\"@",
           "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲", "space space"]


@@ -256,9 +256,9 @@ class UserTest < ActiveSupport::TestCase
     assert create(:moderator_user).has_role?("moderator")
   end
 
     assert create(:moderator_user).has_role?("moderator")
   end
 

-  def test_delete
+  def test_destroy

     user = create(:user, :with_home_location, :description => "foo")
     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
     assert_equal "user_#{user.id}", user.display_name
     assert user.description.blank?
     assert_nil user.home_lat