Bump nokogiri from 1.12.4 to 1.12.5

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

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 584f5df0e97c989a2618f25280c16dc5e99ea8a4..c34b4b81fe310f092b02088ce8b321711ad45865 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -26,7 +26,7 @@ class UserTest < ActiveSupport::TestCase
       :description => "desc"
     )
     assert_not new_user.save
       :description => "desc"
     )
     assert_not new_user.save

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

   end
 
   def test_unique_display_name
   end
 
   def test_unique_display_name


@@ -40,7 +40,7 @@ class UserTest < ActiveSupport::TestCase
       :description => "desc"
     )
     assert_not new_user.save
       :description => "desc"
     )
     assert_not new_user.save

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

   end
 
   def test_email_valid
   end
 
   def test_email_valid


@@ -52,7 +52,7 @@ class UserTest < ActiveSupport::TestCase
     ok.each do |name|
       user = build(:user)
       user.email = name
     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|
     end
 
     bad.each do |name|


@@ -76,10 +76,10 @@ 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\"@",
     # 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.",
     # 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.",


@@ -105,7 +105,7 @@ 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_not alice.is_friends_with?(charlie)
 
     assert alice.is_friends_with?(bob)
     assert_not alice.is_friends_with?(charlie)


@@ -129,30 +129,30 @@ 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
     # 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
     # 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
     # vagrant_user has no home location

-    assert_equal [], vagrant_user.nearby
+    assert_empty vagrant_user.nearby

   end
 
   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_empty sec.friends
+    assert_equal 0, sec.friends.size

   end
 
   def test_user_preferred_editor
     user = create(:user)
     assert_nil user.preferred_editor
   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"
     user.save!
 
     user.preferred_editor = "invalid_editor"


@@ -224,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


@@ -263,29 +263,9 @@ 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?
-  end
-
-  def test_to_xml
-    user = build(:user, :with_home_location)
-    xml = user.to_xml
-    assert_select Nokogiri::XML::Document.parse(xml.to_s), "user" do
-      assert_select "[display_name=?]", user.display_name
-      assert_select "[account_created=?]", user.creation_time.xmlschema
-      assert_select "home[lat=?][lon=?][zoom=?]", user.home_lat.to_s, user.home_lon.to_s, user.home_zoom.to_s
-    end
-  end
-
-  def test_to_xml_node
-    user = build(:user, :with_home_location)
-    xml = user.to_xml_node
-    assert_select Nokogiri::XML::DocumentFragment.parse(xml.to_s), "user" do
-      assert_select "[display_name=?]", user.display_name
-      assert_select "[account_created=?]", user.creation_time.xmlschema
-      assert_select "home[lat=?][lon=?][zoom=?]", user.home_lat.to_s, user.home_lon.to_s, user.home_zoom.to_s
-    end
+    assert_not user.visible?
+    assert_not user.active?

   end
 end
   end
 end