Revert "Rename values in SiteConfiguration (2/3)"
This commit is contained in:
@@ -142,10 +142,12 @@ class TestCourseDurationLimitConfig(CacheIsolationTestCase):
|
||||
non_test_course_enabled = CourseOverviewFactory.create(org='non-test-org-enabled')
|
||||
non_test_course_disabled = CourseOverviewFactory.create(org='non-test-org-disabled')
|
||||
non_test_site_cfg_enabled = SiteConfigurationFactory.create(
|
||||
site_values={'course_org_filter': non_test_course_enabled.org}
|
||||
site_values={'course_org_filter': non_test_course_enabled.org},
|
||||
values={'course_org_filter': non_test_course_enabled.org}
|
||||
)
|
||||
non_test_site_cfg_disabled = SiteConfigurationFactory.create(
|
||||
site_values={'course_org_filter': non_test_course_disabled.org}
|
||||
site_values={'course_org_filter': non_test_course_disabled.org},
|
||||
values={'course_org_filter': non_test_course_disabled.org}
|
||||
)
|
||||
|
||||
CourseDurationLimitConfig.objects.create(course=non_test_course_enabled, enabled=True)
|
||||
@@ -158,7 +160,8 @@ class TestCourseDurationLimitConfig(CacheIsolationTestCase):
|
||||
# Set up test objects
|
||||
test_course = CourseOverviewFactory.create(org='test-org')
|
||||
test_site_cfg = SiteConfigurationFactory.create(
|
||||
site_values={'course_org_filter': test_course.org}
|
||||
site_values={'course_org_filter': test_course.org},
|
||||
values={'course_org_filter': test_course.org}
|
||||
)
|
||||
|
||||
if reverse_order:
|
||||
@@ -188,7 +191,8 @@ class TestCourseDurationLimitConfig(CacheIsolationTestCase):
|
||||
CourseDurationLimitConfig.objects.create(enabled=global_setting, enabled_as_of=datetime(2018, 1, 1))
|
||||
for site_setting in (True, False, None):
|
||||
test_site_cfg = SiteConfigurationFactory.create(
|
||||
site_values={'course_org_filter': []}
|
||||
site_values={'course_org_filter': []},
|
||||
values={'course_org_filter': []}
|
||||
)
|
||||
CourseDurationLimitConfig.objects.create(
|
||||
site=test_site_cfg.site, enabled=site_setting, enabled_as_of=datetime(2018, 1, 1)
|
||||
@@ -196,7 +200,7 @@ class TestCourseDurationLimitConfig(CacheIsolationTestCase):
|
||||
|
||||
for org_setting in (True, False, None):
|
||||
test_org = "{}-{}".format(test_site_cfg.id, org_setting)
|
||||
test_site_cfg.site_values['course_org_filter'].append(test_org)
|
||||
test_site_cfg.values['course_org_filter'].append(test_org)
|
||||
test_site_cfg.save()
|
||||
|
||||
CourseDurationLimitConfig.objects.create(
|
||||
@@ -306,7 +310,8 @@ class TestCourseDurationLimitConfig(CacheIsolationTestCase):
|
||||
def test_caching_org(self):
|
||||
course = CourseOverviewFactory.create(org='test-org')
|
||||
site_cfg = SiteConfigurationFactory.create(
|
||||
site_values={'course_org_filter': course.org}
|
||||
site_values={'course_org_filter': course.org},
|
||||
values={'course_org_filter': course.org}
|
||||
)
|
||||
org_config = CourseDurationLimitConfig(org=course.org, enabled=True, enabled_as_of=datetime(2018, 1, 1))
|
||||
org_config.save()
|
||||
@@ -353,7 +358,8 @@ class TestCourseDurationLimitConfig(CacheIsolationTestCase):
|
||||
def test_caching_course(self):
|
||||
course = CourseOverviewFactory.create(org='test-org')
|
||||
site_cfg = SiteConfigurationFactory.create(
|
||||
site_values={'course_org_filter': course.org}
|
||||
site_values={'course_org_filter': course.org},
|
||||
values={'course_org_filter': course.org}
|
||||
)
|
||||
course_config = CourseDurationLimitConfig(course=course, enabled=True, enabled_as_of=datetime(2018, 1, 1))
|
||||
course_config.save()
|
||||
|
||||
Reference in New Issue
Block a user