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

Remove unnecessary pipeline element; use new name for existing element

Browse Source
This commit is contained in:
Jesse Shapiro
2017-02-22 16:29:39 -05:00
parent 39fc6ce1f5
commit ff581d003f
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/djangoapps/third_party_auth/tests/test_settings.py
View File

@@ -60,5 +60,4 @@ class SettingsUnitTest(testutil.TestCase):
@unittest.skipUnless(enterprise_enabled(), 'enterprise not enabled')
def test_enterprise_elements_inserted(self):
settings.apply_settings(self.settings)
self.assertIn('enterprise.tpa_pipeline.set_data_sharing_consent_record', self.settings.SOCIAL_AUTH_PIPELINE)
self.assertIn('enterprise.tpa_pipeline.verify_data_sharing_consent', self.settings.SOCIAL_AUTH_PIPELINE)
self.assertIn('enterprise.tpa_pipeline.handle_enterprise_logistration', self.settings.SOCIAL_AUTH_PIPELINE)

3
common/djangoapps/util/enterprise_helpers.py
View File

@@ -111,8 +111,7 @@ def insert_enterprise_pipeline_elements(pipeline):
return
additional_elements = (
'enterprise.tpa_pipeline.set_data_sharing_consent_record',
'enterprise.tpa_pipeline.verify_data_sharing_consent',
'enterprise.tpa_pipeline.handle_enterprise_logistration',
)
# Find the item we need to insert the data sharing consent elements before
insert_point = pipeline.index('social.pipeline.social_auth.load_extra_data')

2
requirements/edx/base.txt
View File

@@ -51,7 +51,7 @@ edx-lint==0.4.3
astroid==1.3.8
edx-django-oauth2-provider==1.1.4
edx-django-sites-extensions==2.1.1
edx-enterprise==0.23.0
edx-enterprise==0.24.0
edx-oauth2-provider==1.2.0
edx-opaque-keys==0.4.0
edx-organizations==0.4.3