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

Merge pull request #21520 from edx/awais786/BOM-149

Browse Source 
BOM-149
This commit is contained in:
Awais Qureshi
2019-09-05 15:15:35 +05:00
committed by GitHub
parent e0500adc90 1f78305f99
commit 898eba600f
1 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lms/djangoapps/discussion/django_comment_client/tests/test_utils.py
View File

@@ -359,6 +359,7 @@ class CategoryMapTestMixin(object):
Call `get_discussion_category_map`, and verify that it returns Call `get_discussion_category_map`, and verify that it returns
what is expected. what is expected.
""" """
self.assertEqual( self.assertEqual(
utils.get_discussion_category_map(self.course, requesting_user or self.user), utils.get_discussion_category_map(self.course, requesting_user or self.user),
expected expected
@@ -1151,38 +1152,43 @@ class ContentGroupCategoryMapTestCase(CategoryMapTestMixin, ContentGroupTestCase
Verify that the beta user can access the beta and global Verify that the beta user can access the beta and global
discussion topics. discussion topics.
""" """
self.assert_category_map_equals(
{ children = [('Visible to Beta', 'entry'), ('Visible to Everyone', 'entry')]
'subcategories': {
'Week 1': { if six.PY3:
'subcategories': {}, children = [('Visible to Everyone', 'entry'), ('Visible to Beta', 'entry')]
'children': [
('Visible to Beta', 'entry'), expected = {
('Visible to Everyone', 'entry') 'subcategories': {
], 'Week 1': {
'entries': { 'subcategories': {},
'Visible to Beta': { 'children': children,
'sort_key': None, 'entries': {
'is_divided': False, 'Visible to Beta': {
'id': 'beta_group_discussion' 'sort_key': None,
}, 'is_divided': False,
'Visible to Everyone': { 'id': 'beta_group_discussion'
'sort_key': None, },
'is_divided': False, 'Visible to Everyone': {
'id': 'global_group_discussion' 'sort_key': None,
} 'is_divided': False,
'id': 'global_group_discussion'
} }
} }
},
'children': [('General', 'entry'), ('Week 1', 'subcategory')],
'entries': {
'General': {
'sort_key': 'General',
'is_divided': False,
'id': 'i4x-org-number-course-run'
}
} }
}, },
'children': [('General', 'entry'), ('Week 1', 'subcategory')],
'entries': {
'General': {
'sort_key': 'General',
'is_divided': False,
'id': 'i4x-org-number-course-run'
}
}
}
self.assert_category_map_equals(
expected,
requesting_user=self.beta_user requesting_user=self.beta_user
) )