From bc8b0b98b43a95f7e855e1a552a7c99b6af58346 Mon Sep 17 00:00:00 2001 From: Hammad Ahmad Waqas Date: Mon, 3 Jun 2019 14:05:06 +0500 Subject: [PATCH] added enable_audit_data_reporting in EnterpriseCustomerSerializer --- CHANGELOG.rst | 5 +++++ enterprise/__init__.py | 2 +- enterprise/api/v1/serializers.py | 2 +- tests/test_enterprise/api/test_views.py | 8 +++++--- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0340085301..e57d08aa9a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,11 @@ Change Log Unreleased ---------- +[1.6.7] - 2019-06-11 +-------------------- + +* added enable_audit_data_reporting in EnterpriseCustomerSerializer + [1.6.6] - 2019-06-10 -------------------- diff --git a/enterprise/__init__.py b/enterprise/__init__.py index 0401c49bb5..a26c6f3c28 100644 --- a/enterprise/__init__.py +++ b/enterprise/__init__.py @@ -4,6 +4,6 @@ from __future__ import absolute_import, unicode_literals -__version__ = "1.6.6" +__version__ = "1.6.7" default_app_config = "enterprise.apps.EnterpriseConfig" # pylint: disable=invalid-name diff --git a/enterprise/api/v1/serializers.py b/enterprise/api/v1/serializers.py index 06b5a8c3c2..be17493151 100644 --- a/enterprise/api/v1/serializers.py +++ b/enterprise/api/v1/serializers.py @@ -116,7 +116,7 @@ class Meta: 'uuid', 'name', 'slug', 'active', 'site', 'enable_data_sharing_consent', 'enforce_data_sharing_consent', 'branding_configuration', 'enterprise_customer_entitlements', 'identity_provider', 'enable_audit_enrollment', 'replace_sensitive_sso_username', - 'enable_portal_code_management_screen', 'sync_learner_profile_data', + 'enable_portal_code_management_screen', 'sync_learner_profile_data', 'enable_audit_data_reporting' ) site = SiteSerializer() diff --git a/tests/test_enterprise/api/test_views.py b/tests/test_enterprise/api/test_views.py index 5575e245db..70cefb59ef 100644 --- a/tests/test_enterprise/api/test_views.py +++ b/tests/test_enterprise/api/test_views.py @@ -495,7 +495,7 @@ def test_post_enterprise_customer_user_logged_out(self): [{ 'uuid': FAKE_UUIDS[0], 'name': 'Test Enterprise Customer', 'slug': TEST_SLUG, 'active': True, 'enable_data_sharing_consent': True, - 'enforce_data_sharing_consent': 'at_enrollment', + 'enforce_data_sharing_consent': 'at_enrollment', 'enable_audit_data_reporting': True, 'site__domain': 'example.com', 'site__name': 'example.com', }], [{ @@ -503,7 +503,7 @@ def test_post_enterprise_customer_user_logged_out(self): 'active': True, 'enable_data_sharing_consent': True, 'enforce_data_sharing_consent': 'at_enrollment', 'branding_configuration': None, 'enterprise_customer_entitlements': [], - 'enable_audit_enrollment': False, 'identity_provider': None, + 'enable_audit_enrollment': False, 'enable_audit_data_reporting': True, 'identity_provider': None, 'replace_sensitive_sso_username': False, 'enable_portal_code_management_screen': False, 'site': { 'domain': 'example.com', 'name': 'example.com' @@ -535,6 +535,7 @@ def test_post_enterprise_customer_user_logged_out(self): 'branding_configuration': None, 'enterprise_customer_entitlements': [], 'enable_audit_enrollment': False, 'identity_provider': None, 'replace_sensitive_sso_username': False, 'enable_portal_code_management_screen': False, + 'enable_audit_data_reporting': False, 'site': { 'domain': 'example.com', 'name': 'example.com' }, @@ -590,6 +591,7 @@ def test_post_enterprise_customer_user_logged_out(self): 'branding_configuration': None, 'enterprise_customer_entitlements': [], 'enable_audit_enrollment': False, 'identity_provider': FAKE_UUIDS[0], 'replace_sensitive_sso_username': False, 'enable_portal_code_management_screen': False, + 'enable_audit_data_reporting': False, 'site': { 'domain': 'example.com', 'name': 'example.com' }, @@ -757,7 +759,7 @@ def test_enterprise_customer_with_access_to( 'active': True, 'enable_data_sharing_consent': True, 'enforce_data_sharing_consent': 'at_enrollment', 'branding_configuration': None, 'enterprise_customer_entitlements': [], - 'enable_audit_enrollment': False, 'identity_provider': None, + 'enable_audit_enrollment': False, 'enable_audit_data_reporting': False, 'identity_provider': None, 'replace_sensitive_sso_username': False, 'enable_portal_code_management_screen': True, 'site': { 'domain': 'example.com', 'name': 'example.com'