Merge branch 'pull/5512'

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

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 10fd3d97ec9cb533494e72946a049def4c936620..5c1c5a26f2a37f2520a10d1f368743c088804681 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -136,18 +136,18 @@ class UserTest < ActiveSupport::TestCase
     assert_predicate user, :valid?, "user_0 display_name is invalid but it hasn't been changed"
   end
 
     assert_predicate user, :valid?, "user_0 display_name is invalid but it hasn't been changed"
   end
 

-  def test_friends_with
+  def test_follows

     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(:friendship, :befriender => alice, :befriendee => bob)
-
-    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)
+    create(:follow, :follower => alice, :following => bob)
+
+    assert alice.follows?(bob)
+    assert_not alice.follows?(charlie)
+    assert_not bob.follows?(alice)
+    assert_not bob.follows?(charlie)
+    assert_not charlie.follows?(bob)
+    assert_not charlie.follows?(alice)

   end
 
   def test_users_nearby
   end
 
   def test_users_nearby


@@ -174,13 +174,13 @@ class UserTest < ActiveSupport::TestCase
   def test_friends
     norm = create(:user, :active)
     sec = create(:user, :active)
   def test_friends
     norm = create(:user, :active)
     sec = create(:user, :active)

-    create(:friendship, :befriender => norm, :befriendee => sec)
+    create(:follow, :follower => norm, :following => sec)

 
 

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

 
 

-    assert_empty sec.friends
-    assert_equal 0, sec.friends.size
+    assert_empty sec.followings
+    assert_equal 0, sec.followings.size

   end
 
   def test_user_preferred_editor
   end
 
   def test_user_preferred_editor


@@ -304,18 +304,6 @@ class UserTest < ActiveSupport::TestCase
     assert_not_predicate user, :active?
   end
 
     assert_not_predicate user, :active?
   end
 

-  def test_soft_destroy_revokes_oauth1_tokens
-    user = create(:user)
-    access_token = create(:access_token, :user => user)
-    assert_equal 1, user.oauth_tokens.authorized.count
-
-    user.soft_destroy
-
-    assert_equal 0, user.oauth_tokens.authorized.count
-    access_token.reload
-    assert_predicate access_token, :invalidated?
-  end
-

   def test_soft_destroy_revokes_oauth2_tokens
     user = create(:user)
     oauth_access_token = create(:oauth_access_token, :resource_owner_id => user.id)
   def test_soft_destroy_revokes_oauth2_tokens
     user = create(:user)
     oauth_access_token = create(:oauth_access_token, :resource_owner_id => user.id)