Update iD initialization for v2.18.1

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

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 8af701ca03171a02f00fddd4e023f5a22e94a5a0..330f40df28d13bf4e7ac3579a76109fefbb29345 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -5,7 +5,7 @@ class UserTest < ActiveSupport::TestCase
 
   def test_invalid_with_empty_attributes
     user = User.new
 
   def test_invalid_with_empty_attributes
     user = User.new

-    assert !user.valid?
+    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[:pass_crypt].any?
     assert user.errors[:display_name].any?


@@ -25,8 +25,8 @@ class UserTest < ActiveSupport::TestCase
       :data_public => 1,
       :description => "desc"
     )
       :data_public => 1,
       :description => "desc"
     )

-    assert !new_user.save
-    assert new_user.errors[:email].include?("has already been taken")
+    assert_not new_user.save
+    assert_includes new_user.errors[:email], "has already been taken"

   end
 
   def test_unique_display_name
   end
 
   def test_unique_display_name


@@ -39,8 +39,8 @@ class UserTest < ActiveSupport::TestCase
       :data_public => 1,
       :description => "desc"
     )
       :data_public => 1,
       :description => "desc"
     )

-    assert !new_user.save
-    assert new_user.errors[:display_name].include?("has already been taken")
+    assert_not new_user.save
+    assert_includes new_user.errors[:display_name], "has already been taken"

   end
 
   def test_email_valid
   end
 
   def test_email_valid


@@ -65,16 +65,13 @@ class UserTest < ActiveSupport::TestCase
   def test_display_name_length
     user = build(:user)
     user.display_name = "123"
   def test_display_name_length
     user = build(:user)
     user.display_name = "123"

-    assert user.valid?, " should allow nil display name"
+    assert user.valid?, "should allow 3 char name name"

     user.display_name = "12"
     user.display_name = "12"

-    assert !user.valid?, "should not allow 2 char name"
+    assert_not user.valid?, "should not allow 2 char name"

     user.display_name = ""
     user.display_name = ""

-    assert !user.valid?
+    assert_not user.valid?, "should not allow blank/0 char name"

     user.display_name = nil
     user.display_name = nil

-    # Don't understand why it isn't allowing a nil value,
-    # when the validates statements specifically allow it
-    # It appears the database does not allow null values
-    assert !user.valid?
+    assert_not user.valid?, "should not allow nil value"

   end
 
   def test_display_name_valid
   end
 
   def test_display_name_valid


@@ -82,14 +79,15 @@ class UserTest < ActiveSupport::TestCase
     # expact are allowed
     # However, would they affect the xml planet dumps?
     ok = ["Name", "'me", "he\"", "<hr>", "*ho", "\"help\"@",
     # expact are allowed
     # However, would they affect the xml planet dumps?
     ok = ["Name", "'me", "he\"", "<hr>", "*ho", "\"help\"@",

-          "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲"]
+          "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲", "space space"]

     # These need to be 3 chars in length, otherwise the length test above
     # should be used.
     bad = ["<hr/>", "test@example.com", "s/f", "aa/", "aa;", "aa.",
            "aa,", "aa?", "/;.,?", "も対応します/", "#ping",
            "foo\x1fbar", "foo\x7fbar", "foo\ufffebar", "foo\uffffbar",
            "new", "terms", "save", "confirm", "confirm-email",
     # These need to be 3 chars in length, otherwise the length test above
     # should be used.
     bad = ["<hr/>", "test@example.com", "s/f", "aa/", "aa;", "aa.",
            "aa,", "aa?", "/;.,?", "も対応します/", "#ping",
            "foo\x1fbar", "foo\x7fbar", "foo\ufffebar", "foo\uffffbar",
            "new", "terms", "save", "confirm", "confirm-email",

-           "go_public", "reset-password", "forgot-password", "suspended"]
+           "go_public", "reset-password", "forgot-password", "suspended",
+           "trailing whitespace ", " leading whitespace"]

     ok.each do |display_name|
       user = build(:user)
       user.display_name = display_name
     ok.each do |display_name|
       user = build(:user)
       user.display_name = display_name


@@ -99,7 +97,7 @@ class UserTest < ActiveSupport::TestCase
     bad.each do |display_name|
       user = build(:user)
       user.display_name = display_name
     bad.each do |display_name|
       user = build(:user)
       user.display_name = display_name

-      assert !user.valid?, "#{display_name} is valid when it shouldn't be"
+      assert_not user.valid?, "#{display_name} is valid when it shouldn't be"

     end
   end
 
     end
   end
 


@@ -107,14 +105,14 @@ class UserTest < ActiveSupport::TestCase
     alice = create(:user, :active)
     bob = create(:user, :active)
     charlie = create(:user, :active)
     alice = create(:user, :active)
     bob = create(:user, :active)
     charlie = create(:user, :active)

-    create(:friend, :befriender => alice, :befriendee => bob)
+    create(:friendship, :befriender => alice, :befriendee => bob)

 
     assert alice.is_friends_with?(bob)
 
     assert alice.is_friends_with?(bob)

-    assert !alice.is_friends_with?(charlie)
-    assert !bob.is_friends_with?(alice)
-    assert !bob.is_friends_with?(charlie)
-    assert !charlie.is_friends_with?(bob)
-    assert !charlie.is_friends_with?(alice)
+    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)

   end
 
   def test_users_nearby
   end
 
   def test_users_nearby


@@ -138,16 +136,16 @@ class UserTest < ActiveSupport::TestCase
     assert_equal [], vagrant_user.nearby
   end
 
     assert_equal [], vagrant_user.nearby
   end
 

-  def test_friend_users
+  def test_friends

     norm = create(:user, :active)
     sec = create(:user, :active)
     norm = create(:user, :active)
     sec = create(:user, :active)

-    create(:friend, :befriender => norm, :befriendee => sec)
+    create(:friendship, :befriender => norm, :befriendee => sec)

 
 

-    assert_equal [sec], norm.friend_users
-    assert_equal 1, norm.friend_users.size
+    assert_equal [sec], norm.friends
+    assert_equal 1, norm.friends.size

 
 

-    assert_equal [], sec.friend_users
-    assert_equal 0, sec.friend_users.size
+    assert_equal [], sec.friends
+    assert_equal 0, sec.friends.size

   end
 
   def test_user_preferred_editor
   end
 
   def test_user_preferred_editor


@@ -226,36 +224,36 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_visible?
   end
 
   def test_visible?

-    assert_equal true, build(:user, :pending).visible?
-    assert_equal true, build(:user, :active).visible?
-    assert_equal true, build(:user, :confirmed).visible?
-    assert_equal false, build(:user, :suspended).visible?
-    assert_equal false, build(:user, :deleted).visible?
+    assert build(:user, :pending).visible?
+    assert build(:user, :active).visible?
+    assert build(:user, :confirmed).visible?
+    assert_not build(:user, :suspended).visible?
+    assert_not build(:user, :deleted).visible?

   end
 
   def test_active?
   end
 
   def test_active?

-    assert_equal false, build(:user, :pending).active?
-    assert_equal true, build(:user, :active).active?
-    assert_equal true, build(:user, :confirmed).active?
-    assert_equal false, build(:user, :suspended).active?
-    assert_equal false, build(:user, :deleted).active?
+    assert_not build(:user, :pending).active?
+    assert build(:user, :active).active?
+    assert build(:user, :confirmed).active?
+    assert_not build(:user, :suspended).active?
+    assert_not build(:user, :deleted).active?

   end
 
   def test_moderator?
   end
 
   def test_moderator?

-    assert_equal false, create(:user).moderator?
-    assert_equal true, create(:moderator_user).moderator?
+    assert_not create(:user).moderator?
+    assert create(:moderator_user).moderator?

   end
 
   def test_administrator?
   end
 
   def test_administrator?

-    assert_equal false, create(:user).administrator?
-    assert_equal true, create(:administrator_user).administrator?
+    assert_not create(:user).administrator?
+    assert create(:administrator_user).administrator?

   end
 
   def test_has_role?
   end
 
   def test_has_role?

-    assert_equal false, create(:user).has_role?("administrator")
-    assert_equal false, create(:user).has_role?("moderator")
-    assert_equal true, create(:administrator_user).has_role?("administrator")
-    assert_equal true, create(:moderator_user).has_role?("moderator")
+    assert_not create(:user).has_role?("administrator")
+    assert_not create(:user).has_role?("moderator")
+    assert create(:administrator_user).has_role?("administrator")
+    assert create(:moderator_user).has_role?("moderator")

   end
 
   def test_delete
   end
 
   def test_delete


@@ -265,10 +263,10 @@ class UserTest < ActiveSupport::TestCase
     assert user.description.blank?
     assert_nil user.home_lat
     assert_nil user.home_lon
     assert user.description.blank?
     assert_nil user.home_lat
     assert_nil user.home_lon

-    assert_equal false, user.image.file?
+    assert_not user.avatar.attached?

     assert_equal "deleted", user.status
     assert_equal "deleted", user.status

-    assert_equal false, user.visible?
-    assert_equal false, user.active?
+    assert_not user.visible?
+    assert_not user.active?

   end
 
   def test_to_xml
   end
 
   def test_to_xml