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

Enable the ContentTypeGatePartition when the ContentTypeGatingConfig.studio_override_enabled is True

Browse Source
This commit is contained in:
Calen Pennington
2018-11-28 13:59:49 -05:00
parent 2a42628e19
commit f8833e1ffc
2 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openedx/features/content_type_gating/partitions.py
View File

@@ -44,7 +44,9 @@ def create_content_gating_partition(course):
Create and return the Content Gating user partition.
"""
if not ContentTypeGatingConfig.enabled_for_course(course_key=course.id):
enabled_for_course = ContentTypeGatingConfig.enabled_for_course(course_key=course.id)
studio_override_for_course = ContentTypeGatingConfig.current(course_key=course.id).studio_override_enabled
if not (enabled_for_course or studio_override_for_course):
return None
try:

54
openedx/features/content_type_gating/tests/test_partitions.py Normal file
View File

@@ -0,0 +1,54 @@
from datetime import date
from mock import Mock, patch
from opaque_keys.edx.keys import CourseKey
from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
from openedx.features.content_type_gating.partitions import create_content_gating_partition, CONTENT_GATING_PARTITION_ID
from openedx.features.content_type_gating.models import ContentTypeGatingConfig
from xmodule.partitions.partitions import UserPartitionError
class TestContentTypeGatingPartition(CacheIsolationTestCase):
def setUp(self):
self.course_key = CourseKey.from_string('course-v1:test+course+key')
def test_create_content_gating_partition_happy_path(self):
mock_course = Mock(id=self.course_key, user_partitions={})
ContentTypeGatingConfig.objects.create(enabled=True, enabled_as_of=date(2018, 1, 1))
with patch('openedx.features.content_type_gating.partitions.ContentTypeGatingPartitionScheme.create_user_partition') as mock_create:
partition = create_content_gating_partition(mock_course)
self.assertEqual(partition, mock_create.return_value)
def test_create_content_gating_partition_override_only(self):
mock_course = Mock(id=self.course_key, user_partitions={})
ContentTypeGatingConfig.objects.create(enabled=False, studio_override_enabled=True)
partition = create_content_gating_partition(mock_course)
self.assertIsNotNone(partition)
def test_create_content_gating_partition_disabled(self):
mock_course = Mock(id=self.course_key, user_partitions={})
ContentTypeGatingConfig.objects.create(enabled=False, studio_override_enabled=False)
partition = create_content_gating_partition(mock_course)
self.assertIsNone(partition)
def test_create_content_gating_partition_no_scheme_installed(self):
mock_course = Mock(id=self.course_key, user_partitions={})
ContentTypeGatingConfig.objects.create(enabled=True, enabled_as_of=date(2018, 1, 1))
with patch('openedx.features.content_type_gating.partitions.UserPartition.get_scheme', side_effect=UserPartitionError):
partition = create_content_gating_partition(mock_course)
self.assertIsNone(partition)
def test_create_content_gating_partition_partition_id_used(self):
mock_course = Mock(id=self.course_key, user_partitions={Mock(name='partition', id=CONTENT_GATING_PARTITION_ID): object()})
ContentTypeGatingConfig.objects.create(enabled=True, enabled_as_of=date(2018, 1, 1))
with patch('openedx.features.content_type_gating.partitions.LOG') as mock_log:
partition = create_content_gating_partition(mock_course)
mock_log.warning.assert_called()
self.assertIsNone(partition)