diff --git a/lms/djangoapps/discussion/tests/test_signals.py b/lms/djangoapps/discussion/tests/test_signals.py
index e303bc11c9be719ff4b22cf59fd12d2ab56bc4e7..f30a422e0a1576a7d1d2718ee442e4cd35672fcd 100644
--- a/lms/djangoapps/discussion/tests/test_signals.py
+++ b/lms/djangoapps/discussion/tests/test_signals.py
@@ -28,9 +28,7 @@ class SendMessageHandlerTestCase(TestCase):
@mock.patch('lms.djangoapps.discussion.signals.handlers.send_message')
def test_comment_created_signal_sends_message(self, mock_send_message, mock_get_current_site):
site_config = SiteConfigurationFactory.create(site=self.site)
- enable_notifications_cfg = {ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY: True}
- site_config.site_values = enable_notifications_cfg
- site_config.values = enable_notifications_cfg
+ site_config.values[ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY] = True
site_config.save()
mock_get_current_site.return_value = self.site
signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
@@ -58,9 +56,7 @@ class SendMessageHandlerTestCase(TestCase):
self, mock_send_message, mock_get_current_site
):
site_config = SiteConfigurationFactory.create(site=self.site)
- enable_notifications_cfg = {ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY: False}
- site_config.site_values = enable_notifications_cfg
- site_config.values = enable_notifications_cfg
+ site_config.values[ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY] = False
site_config.save()
mock_get_current_site.return_value = self.site
signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
diff --git a/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py b/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
index 52deefd82fe27c908f69aca4794df8824f39c36a..f3ee5954e599642936c9e714b3905ee46530b242 100644
--- a/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
+++ b/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
@@ -168,12 +168,7 @@ class TestInstructorDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase, XssT
"ENABLE_MANUAL_ENROLLMENT_REASON_FIELD": enbale_reason_field
}
site = Site.objects.first()
- SiteConfiguration.objects.create(
- site=site,
- site_values=configuration_values,
- values=configuration_values,
- enabled=True
- )
+ SiteConfiguration.objects.create(site=site, values=configuration_values, enabled=True)
url = reverse(
'instructor_dashboard',
@@ -201,12 +196,7 @@ class TestInstructorDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase, XssT
]
}
site = Site.objects.first()
- SiteConfiguration.objects.create(
- site=site,
- site_values=configuration_values,
- values=configuration_values,
- enabled=True
- )
+ SiteConfiguration.objects.create(site=site, values=configuration_values, enabled=True)
url = reverse(
'instructor_dashboard',
kwargs={
diff --git a/openedx/core/djangoapps/ace_common/tests/test_tracking.py b/openedx/core/djangoapps/ace_common/tests/test_tracking.py
index 1412acf252839fb3eb4d664d038048a511713aac..85f71eaf94c83235b758afb4a4c7bea6908cbcc5 100644
--- a/openedx/core/djangoapps/ace_common/tests/test_tracking.py
+++ b/openedx/core/djangoapps/ace_common/tests/test_tracking.py
@@ -122,9 +122,6 @@ class TestGoogleAnalyticsTrackingPixel(QueryStringAssertionMixin, CacheIsolation
@override_settings(GOOGLE_ANALYTICS_TRACKING_ID='UA-123456-1')
def test_site_config_override(self):
site_config = SiteConfigurationFactory.create(
- site_values=dict(
- GOOGLE_ANALYTICS_ACCOUNT='UA-654321-1'
- ),
values=dict(
GOOGLE_ANALYTICS_ACCOUNT='UA-654321-1'
)
diff --git a/openedx/core/djangoapps/catalog/views.py b/openedx/core/djangoapps/catalog/views.py
index 41874667c1eeb7dc406426ae1f6bf2ed1b30612a..ecc1fd381fb3ad5726e563719f7904b1807a0bfc 100644
--- a/openedx/core/djangoapps/catalog/views.py
+++ b/openedx/core/djangoapps/catalog/views.py
@@ -27,7 +27,6 @@ def cache_programs(request):
SiteConfiguration.objects.create(
site=request.site,
enabled=True,
- site_values={"COURSE_CATALOG_API_URL": "{catalog_url}/api/v1/".format(catalog_url=CATALOG_STUB_URL)},
values={"COURSE_CATALOG_API_URL": "{catalog_url}/api/v1/".format(catalog_url=CATALOG_STUB_URL)}
)
diff --git a/openedx/core/djangoapps/credentials/management/commands/tests/test_notify_credentials.py b/openedx/core/djangoapps/credentials/management/commands/tests/test_notify_credentials.py
index 98c2d5e4d01ab0239affe645c363f63e9ebddef4..a987d393e1a1002dcdb85d1f545d03511e862185 100644
--- a/openedx/core/djangoapps/credentials/management/commands/tests/test_notify_credentials.py
+++ b/openedx/core/djangoapps/credentials/management/commands/tests/test_notify_credentials.py
@@ -127,7 +127,6 @@ class TestNotifyCredentials(TestCase):
@mock.patch(COMMAND_MODULE + '.handle_cert_change')
def test_site(self, mock_grade_interesting, mock_cert_change):
site_config = SiteConfigurationFactory.create(
- site_values={'course_org_filter': ['testX']},
values={'course_org_filter': ['testX']},
)
diff --git a/openedx/core/djangoapps/credentials/tests/test_signals.py b/openedx/core/djangoapps/credentials/tests/test_signals.py
index ef2a8196d5259cd8f5a0085445dbfa21a3dd3de6..0ad7d47bc459105ded16c2f300f7483ee8ad4c7e 100644
--- a/openedx/core/djangoapps/credentials/tests/test_signals.py
+++ b/openedx/core/djangoapps/credentials/tests/test_signals.py
@@ -110,7 +110,6 @@ class TestCredentialsSignalsSendGrade(TestCase):
def test_send_grade_records_enabled(self, _mock_is_course_run_in_a_program, mock_send_grade_to_credentials,
_mock_is_learner_issuance_enabled):
site_config = SiteConfigurationFactory.create(
- site_values={'course_org_filter': [self.key.org]},
values={'course_org_filter': [self.key.org]},
)
diff --git a/openedx/core/djangoapps/programs/tests/test_signals.py b/openedx/core/djangoapps/programs/tests/test_signals.py
index 82c5299cb7b58aa55eb191e3fdfef9d28afa2f44..1a524bb395adffc084c8566c893a0dad82736c1d 100644
--- a/openedx/core/djangoapps/programs/tests/test_signals.py
+++ b/openedx/core/djangoapps/programs/tests/test_signals.py
@@ -146,7 +146,6 @@ class CertChangedReceiverTest(TestCase):
mock_is_learner_issuance_enabled.return_value = True
site_config = SiteConfigurationFactory.create(
- site_values={'course_org_filter': ['edX']},
values={'course_org_filter': ['edX']},
)
diff --git a/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py b/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
index 1296b87e20f4afe6e229c3f7bd7e6aaf224a62a7..c7651388d3d804960b3a67c7ea46eafedfa4b07b 100644
--- a/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
+++ b/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
@@ -306,14 +306,8 @@ class ScheduleSendEmailTestMixin(FilteredQueryCountMixin):
def test_site_config(self, this_org_list, other_org_list, expected_message_count, mock_ace):
filtered_org = 'filtered_org'
unfiltered_org = 'unfiltered_org'
- this_config = SiteConfigurationFactory.create(
- site_values={'course_org_filter': this_org_list},
- values={'course_org_filter': this_org_list}
- )
- other_config = SiteConfigurationFactory.create(
- site_values={'course_org_filter': other_org_list},
- values={'course_org_filter': other_org_list}
- )
+ this_config = SiteConfigurationFactory.create(values={'course_org_filter': this_org_list})
+ other_config = SiteConfigurationFactory.create(values={'course_org_filter': other_org_list})
for config in (this_config, other_config):
ScheduleConfigFactory.create(site=config.site)
diff --git a/openedx/core/djangoapps/schedules/tests/test_resolvers.py b/openedx/core/djangoapps/schedules/tests/test_resolvers.py
index 83c801b9b154b9c5f0702da695f399f8c08f2ec1..e47458f5e897d27a080d3841a953efb25eef30e3 100644
--- a/openedx/core/djangoapps/schedules/tests/test_resolvers.py
+++ b/openedx/core/djangoapps/schedules/tests/test_resolvers.py
@@ -88,7 +88,6 @@ class TestBinnedSchedulesBaseResolver(SchedulesResolverTestMixin, TestCase):
)
def test_get_course_org_filter_exclude__in(self, course_org_filter, expected_org_list):
SiteConfigurationFactory.create(
- site_values={'course_org_filter': course_org_filter},
values={'course_org_filter': course_org_filter},
)
mock_query = Mock()
diff --git a/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py b/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py
index 2c670b513fbd1b9d99af59d8c751050c5962ff1d..7c57b10e2a5c7522b904a2d1052a02658ad58b99 100644
--- a/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py
+++ b/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py
@@ -107,10 +107,6 @@ class Command(BaseCommand):
site_configuration.values.update(site_configuration_values)
else:
site_configuration.values = site_configuration_values
- if site_configuration.site_values:
- site_configuration.site_values.update(site_configuration_values)
- else:
- site_configuration.site_values = site_configuration_values
if enabled is not None:
site_configuration.enabled = enabled
diff --git a/openedx/core/djangoapps/site_configuration/migrations/0003_add_site_values_field.py b/openedx/core/djangoapps/site_configuration/migrations/0003_add_site_values_field.py
deleted file mode 100644
index e9750d686888368edd0bfbd934e00340fe76c368..0000000000000000000000000000000000000000
--- a/openedx/core/djangoapps/site_configuration/migrations/0003_add_site_values_field.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-01-02 22:05
-from __future__ import unicode_literals
-
-from django.db import migrations
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('site_configuration', '0002_auto_20160720_0231'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='siteconfiguration',
- name='site_values',
- field=jsonfield.fields.JSONField(blank=True),
- ),
- migrations.AddField(
- model_name='siteconfigurationhistory',
- name='site_values',
- field=jsonfield.fields.JSONField(blank=True),
- ),
- ]
diff --git a/openedx/core/djangoapps/site_configuration/models.py b/openedx/core/djangoapps/site_configuration/models.py
index 42869389835b456e55ef0a3224baf88a4f69e9bd..fb5d885447f886904d8e34f7395c2e0d8ec3c983 100644
--- a/openedx/core/djangoapps/site_configuration/models.py
+++ b/openedx/core/djangoapps/site_configuration/models.py
@@ -25,19 +25,12 @@ class SiteConfiguration(models.Model):
Fields:
site (OneToOneField): one to one field relating each configuration to a single site
- site_values (JSONField): json field to store configurations for a site
+ values (JSONField): json field to store configurations for a site
.. no_pii:
"""
site = models.OneToOneField(Site, related_name='configuration', on_delete=models.CASCADE)
enabled = models.BooleanField(default=False, verbose_name=u"Enabled")
- site_values = JSONField(
- null=False,
- blank=True,
- load_kwargs={'object_pairs_hook': collections.OrderedDict}
- )
- # TODO: Delete this deprecated field during the later stages of the rollout
- # which renames 'values' to 'site_values'.
values = JSONField(
null=False,
blank=True,
@@ -153,19 +146,12 @@ class SiteConfigurationHistory(TimeStampedModel):
Fields:
site (ForeignKey): foreign-key to django Site
- site_values (JSONField): json field to store configurations for a site
+ values (JSONField): json field to store configurations for a site
.. no_pii:
"""
site = models.ForeignKey(Site, related_name='configuration_histories', on_delete=models.CASCADE)
enabled = models.BooleanField(default=False, verbose_name=u"Enabled")
- site_values = JSONField(
- null=False,
- blank=True,
- load_kwargs={'object_pairs_hook': collections.OrderedDict}
- )
- # TODO: Delete this deprecated field during the later stages of the rollout
- # which renames 'values' to 'site_values'.
values = JSONField(
null=False,
blank=True,
@@ -199,7 +185,6 @@ def update_site_configuration_history(sender, instance, **kwargs): # pylint: di
"""
SiteConfigurationHistory.objects.create(
site=instance.site,
- site_values=instance.values,
values=instance.values,
enabled=instance.enabled,
)
diff --git a/openedx/core/djangoapps/site_configuration/tests/mixins.py b/openedx/core/djangoapps/site_configuration/tests/mixins.py
index 95294d2891927c0de4b1fee35bd7b87b629f9ff4..6c30b747b93832d837c27f7672bcb55244aaa6d7 100644
--- a/openedx/core/djangoapps/site_configuration/tests/mixins.py
+++ b/openedx/core/djangoapps/site_configuration/tests/mixins.py
@@ -14,39 +14,33 @@ class SiteMixin(object):
super(SiteMixin, self).setUp()
self.site = SiteFactory.create()
- site_config = {
- "SITE_NAME": self.site.domain,
- "course_email_from_addr": "fake@example.com",
- "course_email_template_name": "fake_email_template",
- "course_org_filter": "fakeX"
- }
self.site_configuration = SiteConfigurationFactory.create(
site=self.site,
- site_values=site_config,
- # TODO: Remove this deprecated value eventually.
- values=site_config
+ values={
+ "SITE_NAME": self.site.domain,
+ "course_email_from_addr": "fake@example.com",
+ "course_email_template_name": "fake_email_template",
+ "course_org_filter": "fakeX"
+ }
)
self.site_other = SiteFactory.create(
domain='testserver.fakeother',
name='testserver.fakeother'
)
- site_config_other = {
- "SITE_NAME": self.site_other.domain,
- "SESSION_COOKIE_DOMAIN": self.site_other.domain,
- "course_org_filter": "fakeOtherX",
- "ENABLE_MKTG_SITE": True,
- "SHOW_ECOMMERCE_REPORTS": True,
- "MKTG_URLS": {
- "ROOT": "https://marketing.fakeother",
- "ABOUT": "/fake-about"
- }
- }
self.site_configuration_other = SiteConfigurationFactory.create(
site=self.site_other,
- site_values=site_config_other,
- # TODO: Remove this deprecated value eventually.
- values=site_config_other
+ values={
+ "SITE_NAME": self.site_other.domain,
+ "SESSION_COOKIE_DOMAIN": self.site_other.domain,
+ "course_org_filter": "fakeOtherX",
+ "ENABLE_MKTG_SITE": True,
+ "SHOW_ECOMMERCE_REPORTS": True,
+ "MKTG_URLS": {
+ "ROOT": "https://marketing.fakeother",
+ "ABOUT": "/fake-about"
+ }
+ }
)
# Initialize client with default site domain
@@ -62,8 +56,6 @@ class SiteMixin(object):
)
__ = SiteConfigurationFactory.create(
site=site,
- site_values=site_configuration_values,
- # TODO: Remove this deprecated value eventually.
values=site_configuration_values
)
self.use_site(site)
diff --git a/openedx/core/djangoapps/site_configuration/tests/test_middleware.py b/openedx/core/djangoapps/site_configuration/tests/test_middleware.py
index c66ec84114d831c391bcad7d5785a6d514d2c829..890c6453c2df918e5e9fee381f569d80a4841283 100644
--- a/openedx/core/djangoapps/site_configuration/tests/test_middleware.py
+++ b/openedx/core/djangoapps/site_configuration/tests/test_middleware.py
@@ -41,9 +41,6 @@ class SessionCookieDomainTests(TestCase):
)
self.site_configuration = SiteConfigurationFactory.create(
site=self.site,
- site_values={
- "SESSION_COOKIE_DOMAIN": self.site.domain,
- },
values={
"SESSION_COOKIE_DOMAIN": self.site.domain,
}
@@ -79,9 +76,6 @@ class SessionCookieDomainSiteConfigurationOverrideTests(TestCase):
)
self.site_configuration = SiteConfigurationFactory.create(
site=self.site,
- site_values={
- "SESSION_COOKIE_DOMAIN": self.site.domain,
- },
values={
"SESSION_COOKIE_DOMAIN": self.site.domain,
}
diff --git a/openedx/core/djangoapps/site_configuration/tests/test_models.py b/openedx/core/djangoapps/site_configuration/tests/test_models.py
index 4b69d57f5870e4adc6f67a2b9fe02688085b0b77..0200c5881235f029b2ae77039f775ec7c3764223 100644
--- a/openedx/core/djangoapps/site_configuration/tests/test_models.py
+++ b/openedx/core/djangoapps/site_configuration/tests/test_models.py
@@ -82,8 +82,6 @@ class SiteConfigurationTests(TestCase):
site=self.site,
)
- site_configuration.site_values = {'test': 'test'}
- # TODO: Remove this deprecated value eventually.
site_configuration.values = {'test': 'test'}
site_configuration.save()
@@ -133,8 +131,6 @@ class SiteConfigurationTests(TestCase):
# add SiteConfiguration to database
site_configuration = SiteConfigurationFactory.create(
site=self.site,
- site_values=self.test_config1,
- # TODO: Remove this deprecated value eventually.
values=self.test_config1,
)
@@ -183,8 +179,6 @@ class SiteConfigurationTests(TestCase):
# add SiteConfiguration to database
site_configuration = SiteConfigurationFactory.create(
site=self.site,
- site_values=invalid_data,
- # TODO: Remove this deprecated value eventually.
values=invalid_data,
)
@@ -206,14 +200,10 @@ class SiteConfigurationTests(TestCase):
# add SiteConfiguration to database
SiteConfigurationFactory.create(
site=self.site,
- site_values=self.test_config1,
- # TODO: Remove this deprecated value eventually.
values=self.test_config1,
)
SiteConfigurationFactory.create(
site=self.site2,
- site_values=self.test_config2,
- # TODO: Remove this deprecated value eventually.
values=self.test_config2,
)
@@ -295,14 +285,10 @@ class SiteConfigurationTests(TestCase):
# add SiteConfiguration to database
config1 = SiteConfigurationFactory.create(
site=self.site,
- site_values=self.test_config1,
- # TODO: Remove this deprecated value eventually.
values=self.test_config1,
)
config2 = SiteConfigurationFactory.create(
site=self.site2,
- site_values=self.test_config2,
- # TODO: Remove this deprecated value eventually.
values=self.test_config2,
)
@@ -328,14 +314,10 @@ class SiteConfigurationTests(TestCase):
# add SiteConfiguration to database
SiteConfigurationFactory.create(
site=self.site,
- site_values=self.test_config1,
- # TODO: Remove this deprecated value eventually.
values=self.test_config1,
)
SiteConfigurationFactory.create(
site=self.site2,
- site_values=self.test_config2,
- # TODO: Remove this deprecated value eventually.
values=self.test_config2,
)
@@ -350,15 +332,11 @@ class SiteConfigurationTests(TestCase):
# add SiteConfiguration to database
SiteConfigurationFactory.create(
site=self.site,
- site_values=self.test_config1,
- # TODO: Remove this deprecated value eventually.
values=self.test_config1,
enabled=False,
)
SiteConfigurationFactory.create(
site=self.site2,
- site_values=self.test_config2,
- # TODO: Remove this deprecated value eventually.
values=self.test_config2,
)
diff --git a/openedx/core/djangoapps/site_configuration/tests/test_util.py b/openedx/core/djangoapps/site_configuration/tests/test_util.py
index 6c13a5fadc143c53af5cc617808ae7ca8ce8a6e8..bd6277dcc80b0491324aca7bd22ff2c8fa6ec10c 100644
--- a/openedx/core/djangoapps/site_configuration/tests/test_util.py
+++ b/openedx/core/djangoapps/site_configuration/tests/test_util.py
@@ -29,10 +29,9 @@ def with_site_configuration(domain="test.localhost", configuration=None):
site, __ = Site.objects.get_or_create(domain=domain, name=domain)
site_configuration, created = SiteConfiguration.objects.get_or_create(
site=site,
- defaults={"enabled": True, "site_values": configuration, "values": configuration},
+ defaults={"enabled": True, "values": configuration},
)
if not created:
- site_configuration.site_values = configuration
site_configuration.values = configuration
site_configuration.save()
@@ -57,10 +56,9 @@ def with_site_configuration_context(domain="test.localhost", configuration=None)
site, __ = Site.objects.get_or_create(domain=domain, name=domain)
site_configuration, created = SiteConfiguration.objects.get_or_create(
site=site,
- defaults={"enabled": True, "site_values": configuration, "values": configuration},
+ defaults={"enabled": True, "values": configuration},
)
if not created:
- site_configuration.site_values = configuration
site_configuration.values = configuration
site_configuration.save()
diff --git a/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py b/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py
index 255188c719eafc59a1521234c54bb859dd8e624d..148655a43e47ac3246cdf9142147f91b5e3e99c9 100644
--- a/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py
+++ b/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py
@@ -109,12 +109,7 @@ class Command(BaseCommand):
SiteTheme.objects.create(site=site, theme_dir_name=theme_dir_name)
LOG.info(u"Creating '{site_name}' SiteConfiguration".format(site_name=site_domain))
- SiteConfiguration.objects.create(
- site=site,
- site_values=site_configuration,
- values=site_configuration,
- enabled=True
- )
+ SiteConfiguration.objects.create(site=site, values=site_configuration, enabled=True)
else:
LOG.info(u"'{site_domain}' site already exists".format(site_domain=site_domain))
diff --git a/openedx/core/djangoapps/user_api/management/tests/test_sync_hubspot_contacts.py b/openedx/core/djangoapps/user_api/management/tests/test_sync_hubspot_contacts.py
index d61bd05f484a078641561dadb471b874583fb773..912a5e4fcf0eb7965d53f40644b35ecd34b435b9 100644
--- a/openedx/core/djangoapps/user_api/management/tests/test_sync_hubspot_contacts.py
+++ b/openedx/core/djangoapps/user_api/management/tests/test_sync_hubspot_contacts.py
@@ -31,7 +31,6 @@ class TestHubspotSyncCommand(TestCase):
super(TestHubspotSyncCommand, cls).setUpClass()
cls.site_config = SiteConfigurationFactory()
cls.hubspot_site_config = SiteConfigurationFactory.create(
- site_values={'HUBSPOT_API_KEY': 'test_key'},
values={'HUBSPOT_API_KEY': 'test_key'},
)
cls.users = []
diff --git a/openedx/features/content_type_gating/tests/test_models.py b/openedx/features/content_type_gating/tests/test_models.py
index c6cf276bdcfb4c9325688b05cb9d7f7f1cae2cab..a13c6bf75658380644be3c10a51b0eb9366a6b4d 100644
--- a/openedx/features/content_type_gating/tests/test_models.py
+++ b/openedx/features/content_type_gating/tests/test_models.py
@@ -131,14 +131,8 @@ class TestContentTypeGatingConfig(CacheIsolationTestCase):
# there are no leaks of configuration across contexts
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},
- 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},
- values={'course_org_filter': non_test_course_disabled.org}
- )
+ non_test_site_cfg_enabled = SiteConfigurationFactory.create(values={'course_org_filter': non_test_course_enabled.org})
+ non_test_site_cfg_disabled = SiteConfigurationFactory.create(values={'course_org_filter': non_test_course_disabled.org})
ContentTypeGatingConfig.objects.create(course=non_test_course_enabled, enabled=True, enabled_as_of=datetime(2018, 1, 1))
ContentTypeGatingConfig.objects.create(course=non_test_course_disabled, enabled=False)
@@ -149,10 +143,7 @@ class TestContentTypeGatingConfig(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},
- values={'course_org_filter': test_course.org}
- )
+ test_site_cfg = SiteConfigurationFactory.create(values={'course_org_filter': test_course.org})
ContentTypeGatingConfig.objects.create(enabled=global_setting, enabled_as_of=datetime(2018, 1, 1))
ContentTypeGatingConfig.objects.create(course=test_course, enabled=course_setting, enabled_as_of=datetime(2018, 1, 1))
@@ -175,10 +166,7 @@ class TestContentTypeGatingConfig(CacheIsolationTestCase):
for global_setting in (True, False, None):
ContentTypeGatingConfig.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': []},
- values={'course_org_filter': []}
- )
+ test_site_cfg = SiteConfigurationFactory.create(values={'course_org_filter': []})
ContentTypeGatingConfig.objects.create(site=test_site_cfg.site, enabled=site_setting, enabled_as_of=datetime(2018, 1, 1))
for org_setting in (True, False, None):
@@ -291,10 +279,7 @@ class TestContentTypeGatingConfig(CacheIsolationTestCase):
def test_caching_org(self):
course = CourseOverviewFactory.create(org='test-org')
- site_cfg = SiteConfigurationFactory.create(
- site_values={'course_org_filter': course.org},
- values={'course_org_filter': course.org}
- )
+ site_cfg = SiteConfigurationFactory.create(values={'course_org_filter': course.org})
org_config = ContentTypeGatingConfig(org=course.org, enabled=True, enabled_as_of=datetime(2018, 1, 1))
org_config.save()
@@ -339,10 +324,7 @@ class TestContentTypeGatingConfig(CacheIsolationTestCase):
def test_caching_course(self):
course = CourseOverviewFactory.create(org='test-org')
- site_cfg = SiteConfigurationFactory.create(
- site_values={'course_org_filter': course.org},
- values={'course_org_filter': course.org}
- )
+ site_cfg = SiteConfigurationFactory.create(values={'course_org_filter': course.org})
course_config = ContentTypeGatingConfig(course=course, enabled=True, enabled_as_of=datetime(2018, 1, 1))
course_config.save()
diff --git a/openedx/features/course_duration_limits/tests/test_models.py b/openedx/features/course_duration_limits/tests/test_models.py
index fe4865fd774c49e89f261f737881739ac4d35aeb..58078777f1a9302fbcb534a4161ca015084b3806 100644
--- a/openedx/features/course_duration_limits/tests/test_models.py
+++ b/openedx/features/course_duration_limits/tests/test_models.py
@@ -142,11 +142,9 @@ 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},
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},
values={'course_org_filter': non_test_course_disabled.org}
)
@@ -159,10 +157,7 @@ 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},
- values={'course_org_filter': test_course.org}
- )
+ test_site_cfg = SiteConfigurationFactory.create(values={'course_org_filter': test_course.org})
if reverse_order:
CourseDurationLimitConfig.objects.create(site=test_site_cfg.site, enabled=site_setting)
@@ -190,10 +185,7 @@ class TestCourseDurationLimitConfig(CacheIsolationTestCase):
for global_setting in (True, False, None):
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': []},
- values={'course_org_filter': []}
- )
+ test_site_cfg = SiteConfigurationFactory.create(values={'course_org_filter': []})
CourseDurationLimitConfig.objects.create(
site=test_site_cfg.site, enabled=site_setting, enabled_as_of=datetime(2018, 1, 1)
)
@@ -309,10 +301,7 @@ 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},
- values={'course_org_filter': course.org}
- )
+ site_cfg = SiteConfigurationFactory.create(values={'course_org_filter': course.org})
org_config = CourseDurationLimitConfig(org=course.org, enabled=True, enabled_as_of=datetime(2018, 1, 1))
org_config.save()
@@ -357,10 +346,7 @@ 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},
- values={'course_org_filter': course.org}
- )
+ site_cfg = SiteConfigurationFactory.create(values={'course_org_filter': course.org})
course_config = CourseDurationLimitConfig(course=course, enabled=True, enabled_as_of=datetime(2018, 1, 1))
course_config.save()
diff --git a/openedx/features/discounts/tests/test_discount_restriction_models.py b/openedx/features/discounts/tests/test_discount_restriction_models.py
index 1de2ca7c7202dc0741354f98e27f5a9acf9cfb96..60343d052a36e9e3f9593a82fc8ada8b0034b08b 100644
--- a/openedx/features/discounts/tests/test_discount_restriction_models.py
+++ b/openedx/features/discounts/tests/test_discount_restriction_models.py
@@ -59,11 +59,9 @@ class TestDiscountRestrictionConfig(CacheIsolationTestCase):
non_test_course_disabled = CourseOverviewFactory.create(org='non-test-org-disabled')
non_test_course_enabled = CourseOverviewFactory.create(org='non-test-org-enabled')
non_test_site_cfg_disabled = SiteConfigurationFactory.create(
- site_values={'course_org_filter': non_test_course_disabled.org},
values={'course_org_filter': non_test_course_disabled.org}
)
non_test_site_cfg_enabled = SiteConfigurationFactory.create(
- site_values={'course_org_filter': non_test_course_enabled.org},
values={'course_org_filter': non_test_course_enabled.org}
)
@@ -76,10 +74,7 @@ class TestDiscountRestrictionConfig(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},
- values={'course_org_filter': test_course.org}
- )
+ test_site_cfg = SiteConfigurationFactory.create(values={'course_org_filter': test_course.org})
DiscountRestrictionConfig.objects.create(disabled=global_setting)
DiscountRestrictionConfig.objects.create(course=test_course, disabled=course_setting)