X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4abd9cfcf19701bf43322374c5df6dd586449e54..2fabc46421f9e908ef6902ea7c4890a0032af446:/test/models/user_test.rb

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index de318df20..f35cdd23f 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -4,12 +4,16 @@ class UserTest < ActiveSupport::TestCase
   include Rails::Dom::Testing::Assertions::SelectorAssertions
 
   def test_invalid_with_empty_attributes
-    user = User.new
+    user = build(:user, :email => nil,
+                        :pass_crypt => nil,
+                        :display_name => nil,
+                        :home_lat => nil,
+                        :home_lon => nil,
+                        :home_zoom => nil)
     assert_not user.valid?
     assert user.errors[:email].any?
     assert user.errors[:pass_crypt].any?
     assert user.errors[:display_name].any?
-    assert user.errors[:email].any?
     assert user.errors[:home_lat].none?
     assert user.errors[:home_lon].none?
     assert user.errors[:home_zoom].none?
@@ -17,28 +21,14 @@ class UserTest < ActiveSupport::TestCase
 
   def test_unique_email
     existing_user = create(:user)
-    new_user = User.new(
-      :email => existing_user.email,
-      :status => "active",
-      :pass_crypt => Digest::MD5.hexdigest("test"),
-      :display_name => "new user",
-      :data_public => 1,
-      :description => "desc"
-    )
+    new_user = build(:user, :email => existing_user.email)
     assert_not new_user.save
     assert_includes new_user.errors[:email], "has already been taken"
   end
 
   def test_unique_display_name
     existing_user = create(:user)
-    new_user = User.new(
-      :email => "tester@openstreetmap.org",
-      :status => "pending",
-      :pass_crypt => Digest::MD5.hexdigest("test"),
-      :display_name => existing_user.display_name,
-      :data_public => 1,
-      :description => "desc"
-    )
+    new_user = build(:user, :display_name => existing_user.display_name)
     assert_not new_user.save
     assert_includes new_user.errors[:display_name], "has already been taken"
   end
@@ -52,7 +42,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 +66,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 +119,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 +134,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
 
@@ -256,9 +246,9 @@ class UserTest < ActiveSupport::TestCase
     assert create(:moderator_user).has_role?("moderator")
   end
 
-  def test_delete
+  def test_soft_destroy
     user = create(:user, :with_home_location, :description => "foo")
-    user.delete
+    user.soft_destroy
     assert_equal "user_#{user.id}", user.display_name
     assert user.description.blank?
     assert_nil user.home_lat