X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8ecb53b8692cbaac262fba5b1baa632d7cef5353..2e34b62fac7d0a9a7b03e92bdf26f691736e2954:/test/models/user_test.rb

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 4c863272b..72e1ca5d9 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -4,41 +4,31 @@ 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?
+    assert_predicate user.errors[:email], :any?
+    assert_predicate user.errors[:pass_crypt], :any?
+    assert_predicate user.errors[:display_name], :any?
+    assert_predicate user.errors[:home_lat], :none?
+    assert_predicate user.errors[:home_lon], :none?
+    assert_predicate user.errors[:home_zoom], :none?
   end
 
   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
@@ -65,7 +55,7 @@ class UserTest < ActiveSupport::TestCase
   def test_display_name_length
     user = build(:user)
     user.display_name = "123"
-    assert user.valid?, "should allow 3 char name name"
+    assert_predicate user, :valid?, "should allow 3 char name name"
     user.display_name = "12"
     assert_not user.valid?, "should not allow 2 char name"
     user.display_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"]
@@ -91,7 +81,7 @@ class UserTest < ActiveSupport::TestCase
     ok.each do |display_name|
       user = build(:user)
       user.display_name = display_name
-      assert user.valid?, "#{display_name} is invalid, when it should be"
+      assert_predicate user, :valid?, "#{display_name} is invalid, when it should be"
     end
 
     bad.each do |display_name|
@@ -107,12 +97,12 @@ class UserTest < ActiveSupport::TestCase
     charlie = create(:user, :active)
     create(:friendship, :befriender => alice, :befriendee => bob)
 
-    assert alice.is_friends_with?(bob)
-    assert_not alice.is_friends_with?(charlie)
-    assert_not bob.is_friends_with?(alice)
-    assert_not bob.is_friends_with?(charlie)
-    assert_not charlie.is_friends_with?(bob)
-    assert_not charlie.is_friends_with?(alice)
+    assert alice.friends_with?(bob)
+    assert_not alice.friends_with?(charlie)
+    assert_not bob.friends_with?(alice)
+    assert_not bob.friends_with?(charlie)
+    assert_not charlie.friends_with?(bob)
+    assert_not charlie.friends_with?(alice)
   end
 
   def test_users_nearby
@@ -224,29 +214,29 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_visible?
-    assert build(:user, :pending).visible?
-    assert build(:user, :active).visible?
-    assert build(:user, :confirmed).visible?
+    assert_predicate build(:user, :pending), :visible?
+    assert_predicate build(:user, :active), :visible?
+    assert_predicate build(:user, :confirmed), :visible?
     assert_not build(:user, :suspended).visible?
     assert_not build(:user, :deleted).visible?
   end
 
   def test_active?
     assert_not build(:user, :pending).active?
-    assert build(:user, :active).active?
-    assert build(:user, :confirmed).active?
+    assert_predicate build(:user, :active), :active?
+    assert_predicate build(:user, :confirmed), :active?
     assert_not build(:user, :suspended).active?
     assert_not build(:user, :deleted).active?
   end
 
   def test_moderator?
     assert_not create(:user).moderator?
-    assert create(:moderator_user).moderator?
+    assert_predicate create(:moderator_user), :moderator?
   end
 
   def test_administrator?
     assert_not create(:user).administrator?
-    assert create(:administrator_user).administrator?
+    assert_predicate create(:administrator_user), :administrator?
   end
 
   def test_has_role?
@@ -256,11 +246,11 @@ 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_predicate user.description, :blank?
     assert_nil user.home_lat
     assert_nil user.home_lon
     assert_not user.avatar.attached?