fix is_authenticated mocks

This commit is contained in:
Eric Fischer
2018-05-02 11:26:27 -04:00
parent e18448e27d
commit 4147b72f18
3 changed files with 12 additions and 6 deletions

View File

@@ -113,7 +113,10 @@ class CreatorGroupTest(TestCase):
def test_add_user_to_group_requires_authenticated(self): def test_add_user_to_group_requires_authenticated(self):
with self.assertRaises(PermissionDenied): with self.assertRaises(PermissionDenied):
with mock.patch('django.contrib.auth.models.User.is_authenticated') as mock_is_auth: with mock.patch(
'django.contrib.auth.models.User.is_authenticated',
new_callable=mock.PropertyMock
) as mock_is_auth:
mock_is_auth.return_value = False mock_is_auth.return_value = False
add_users(self.admin, CourseCreatorRole(), self.user) add_users(self.admin, CourseCreatorRole(), self.user)
@@ -129,7 +132,10 @@ class CreatorGroupTest(TestCase):
def test_remove_user_from_group_requires_authenticated(self): def test_remove_user_from_group_requires_authenticated(self):
with self.assertRaises(PermissionDenied): with self.assertRaises(PermissionDenied):
with mock.patch('django.contrib.auth.models.User.is_authenticated') as mock_is_auth: with mock.patch(
'django.contrib.auth.models.User.is_authenticated',
new_callable=mock.PropertyMock
) as mock_is_auth:
mock_is_auth.return_value = False mock_is_auth.return_value = False
remove_users(self.admin, CourseCreatorRole(), self.user) remove_users(self.admin, CourseCreatorRole(), self.user)

View File

@@ -512,9 +512,9 @@ class ViewsTestCase(ModuleStoreTestCase):
self.assertEqual(EcommerceService().is_enabled(AnonymousUser()), False) self.assertEqual(EcommerceService().is_enabled(AnonymousUser()), False)
def test_user_groups(self): def test_user_groups(self):
# depreciated function # deprecated function
mock_user = MagicMock() mock_user = MagicMock()
mock_user.is_authenticated.return_value = False type(mock_user).is_authenticated = PropertyMock(return_value=False)
self.assertEqual(views.user_groups(mock_user), []) self.assertEqual(views.user_groups(mock_user), [])
def test_get_redirect_url(self): def test_get_redirect_url(self):

View File

@@ -8,7 +8,7 @@ from django.contrib.auth.models import User
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.test import TestCase from django.test import TestCase
from django.test.client import RequestFactory from django.test.client import RequestFactory
from mock import MagicMock, patch from mock import MagicMock, patch, PropertyMock
import lti_provider.users as users import lti_provider.users as users
from lti_provider.models import LtiConsumer, LtiUser from lti_provider.models import LtiConsumer, LtiUser
@@ -124,7 +124,7 @@ class AuthenticateLtiUserTest(TestCase):
def test_authentication_with_unauthenticated_user(self, create_user, switch_user): def test_authentication_with_unauthenticated_user(self, create_user, switch_user):
lti_user = self.create_lti_user_model() lti_user = self.create_lti_user_model()
self.request.user = lti_user.edx_user self.request.user = lti_user.edx_user
with patch('django.contrib.auth.models.User.is_authenticated') as mock_is_auth: with patch('django.contrib.auth.models.User.is_authenticated', new_callable=PropertyMock) as mock_is_auth:
mock_is_auth.return_value = False mock_is_auth.return_value = False
users.authenticate_lti_user(self.request, self.lti_user_id, self.lti_consumer) users.authenticate_lti_user(self.request, self.lti_user_id, self.lti_consumer)
self.assertFalse(create_user.called) self.assertFalse(create_user.called)