Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove deprecated runtime.course_id from edxnotes decorator

Browse Source 
We will use `context_key` instead.
This commit is contained in:
Agrendalath
2022-07-07 18:20:43 +02:00
parent 99042f6282
commit c2ac3d83c3
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/djangoapps/edxnotes/decorators.py
View File

@@ -33,8 +33,8 @@ def edxnotes(cls):
if not hasattr(runtime, 'modulestore'): if not hasattr(runtime, 'modulestore'):
return original_get_html(self, *args, **kwargs) return original_get_html(self, *args, **kwargs)
is_studio = getattr(self.system, "is_author_mode", False) is_studio = getattr(self.runtime, "is_author_mode", False)
course = getattr(self, 'descriptor', self).runtime.modulestore.get_course(self.runtime.course_id) course = getattr(self, 'descriptor', self).runtime.modulestore.get_course(self.scope_ids.usage_id.context_key)
# Must be disabled when: # Must be disabled when:
# - in Studio # - in Studio
@@ -57,10 +57,10 @@ def edxnotes(cls):
), ),
"params": { "params": {
# Use camelCase to name keys. # Use camelCase to name keys.
"usageId": str(self.scope_ids.usage_id), "usageId": self.scope_ids.usage_id,
"courseId": str(self.runtime.course_id), "courseId": course.id,
"token": get_edxnotes_id_token(user), "token": get_edxnotes_id_token(user),
"tokenUrl": get_token_url(self.runtime.course_id), "tokenUrl": get_token_url(course.id),
"endpoint": get_public_endpoint(), "endpoint": get_public_endpoint(),
"debug": settings.DEBUG, "debug": settings.DEBUG,
"eventStringLimit": settings.TRACK_MAX_EVENT / 6, "eventStringLimit": settings.TRACK_MAX_EVENT / 6,

9
lms/djangoapps/edxnotes/tests.py
View File

@@ -79,11 +79,10 @@ class TestProblem:
The purpose of this class is to imitate any problem. The purpose of this class is to imitate any problem.
""" """
def __init__(self, course, user=None): def __init__(self, course, user=None):
self.system = MagicMock(is_author_mode=False) self.scope_ids = MagicMock(usage_id=course.id.make_usage_key('test_problem', 'test_usage_id'))
self.scope_ids = MagicMock(usage_id="test_usage_id")
user = user or UserFactory() user = user or UserFactory()
user_service = StubUserService(user) user_service = StubUserService(user)
self.runtime = MagicMock(course_id=course.id, service=lambda _a, _b: user_service) self.runtime = MagicMock(service=lambda _a, _b: user_service, is_author_mode=False)
self.descriptor = MagicMock() self.descriptor = MagicMock()
self.descriptor.runtime.modulestore.get_course.return_value = course self.descriptor.runtime.modulestore.get_course.return_value = course
@@ -136,7 +135,7 @@ class EdxNotesDecoratorTest(ModuleStoreTestCase):
"uid": "uid", "uid": "uid",
"edxnotes_visibility": "true", "edxnotes_visibility": "true",
"params": { "params": {
"usageId": "test_usage_id", "usageId": problem.scope_ids.usage_id,
"courseId": course.id, "courseId": course.id,
"token": "token", "token": "token",
"tokenUrl": "/tokenUrl", "tokenUrl": "/tokenUrl",
@@ -167,7 +166,7 @@ class EdxNotesDecoratorTest(ModuleStoreTestCase):
""" """
Tests that get_html is not wrapped when problem is rendered in Studio. Tests that get_html is not wrapped when problem is rendered in Studio.
""" """
self.problem.system.is_author_mode = True self.problem.runtime.is_author_mode = True
assert 'original_get_html' == self.problem.get_html() assert 'original_get_html' == self.problem.get_html()
def test_edxnotes_blockstore_runtime(self): def test_edxnotes_blockstore_runtime(self):