Merge pull request #4172 from tomhughes/user-predicates

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

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 50615233f971098bb67f892569d099a0e0f45c17..a4ed07e09eac0079a610f8e03762b0b89aeda105 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -239,11 +239,11 @@ class UserTest < ActiveSupport::TestCase
     assert_predicate create(:administrator_user), :administrator?
   end
 
     assert_predicate create(:administrator_user), :administrator?
   end
 

-  def test_has_role?
-    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")
+  def test_role?
+    assert_not create(:user).role?("administrator")
+    assert_not create(:user).role?("moderator")
+    assert create(:administrator_user).role?("administrator")
+    assert create(:moderator_user).role?("moderator")

   end
 
   def test_soft_destroy
   end
 
   def test_soft_destroy


@@ -259,7 +259,7 @@ class UserTest < ActiveSupport::TestCase
     assert_not user.active?
   end
 
     assert_not user.active?
   end
 

-  def test_soft_destroy_revokes_access_tokens
+  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 = create(:user)
     access_token = create(:access_token, :user => user)
     assert_equal 1, user.oauth_tokens.authorized.count


@@ -271,7 +271,7 @@ class UserTest < ActiveSupport::TestCase
     assert_predicate access_token, :invalidated?
   end
 
     assert_predicate access_token, :invalidated?
   end
 

-  def test_soft_destroy_revokes_oauth_access_tokens
+  def test_soft_destroy_revokes_oauth2_tokens

     user = create(:user)
     oauth_access_token = create(:oauth_access_token, :resource_owner_id => user.id)
     assert_equal 1, user.access_tokens.not_expired.count
     user = create(:user)
     oauth_access_token = create(:oauth_access_token, :resource_owner_id => user.id)
     assert_equal 1, user.access_tokens.not_expired.count