Refactoring tests.

TNL-1185

common/djangoapps/xblock_django/tests/test_user_service.py

@@ -7,6 +7,7 @@ from xblock_django.user_service import (
     ATTR_KEY_IS_AUTHENTICATED,
     ATTR_KEY_USER_ID,
     ATTR_KEY_USERNAME,
+    ATTR_KEY_USER_IS_STAFF,
 )
 from student.models import anonymous_id_for_user
 from student.tests.factories import UserFactory, AnonymousUserFactory
@@ -39,6 +40,7 @@ class UserServiceTestCase(TestCase):
         self.assertEqual(xb_user.full_name, dj_user.profile.name)
         self.assertEqual(xb_user.opt_attrs[ATTR_KEY_USERNAME], dj_user.username)
         self.assertEqual(xb_user.opt_attrs[ATTR_KEY_USER_ID], dj_user.id)
+        self.assertFalse(xb_user.opt_attrs[ATTR_KEY_USER_IS_STAFF])
 
     def test_convert_anon_user(self):
         """

common/djangoapps/xblock_django/user_service.py

@@ -4,6 +4,7 @@ Support for converting a django user to an XBlock user
 from django.contrib.auth.models import User
 from opaque_keys.edx.keys import CourseKey
 from xblock.reference.user_service import XBlockUser, UserService
+from student.models import anonymous_id_for_user, get_user_by_username_or_email
 
 ATTR_KEY_IS_AUTHENTICATED = 'edx-platform.is_authenticated'
 ATTR_KEY_USER_ID = 'edx-platform.user_id'
@@ -42,9 +43,6 @@ class DjangoXBlockUserService(UserService):
         if not self.get_current_user().opt_attrs.get(ATTR_KEY_USER_IS_STAFF):
             return None
 
-        # If we import these in start, it causes the contentstore library tests failed.
-        from student.models import anonymous_id_for_user, get_user_by_username_or_email
-
         try:
             user = get_user_by_username_or_email(username_or_email=username)
         except User.DoesNotExist:

lms/djangoapps/courseware/tests/test_module_render.py

@@ -1218,23 +1218,3 @@ class LMSXBlockServiceBindingTest(ModuleStoreTestCase):
         )
         service = runtime.service(descriptor, expected_service)
         self.assertIsNotNone(service)
-
-    @XBlock.register_temp_plugin(PureXBlock, identifier='pure')
-    @ddt.data("user")
-    def test_expected_user_service_exists_with_staff_info(self, expected_service):
-        """
-        Tests that the LMS runtime contains the 'user' service with appropriate staff info.
-        """
-        descriptor = ItemFactory(category="pure", parent=self.course)
-        runtime, _ = render.get_module_system_for_user(
-            self.user,
-            self.field_data_cache,
-            descriptor,
-            self.course.id,
-            self.track_function,
-            self.xqueue_callback_url_prefix,
-            self.request_token
-        )
-        service = runtime.service(descriptor, expected_service)
-        self.assertIsNotNone(service)
-        self.assertTrue(hasattr(service, '_user_is_staff'))