Merge pull request #14549 from edx/release-mergeback-to-master

Merge release back to master
2017-02-22 10:08:23 -05:00
parent d0ddfe80eb f69e77e4fe
commit 95aa2b61ba
6 changed files with 29 additions and 61 deletions
--- a/openedx/core/djangoapps/external_auth/tests/test_shib.py
+++ b/openedx/core/djangoapps/external_auth/tests/test_shib.py
@@ -569,8 +569,7 @@ class ShibSPTestModifiedCourseware(ModuleStoreTestCase):
                          'data': dict(params),
                          'follow': False,
                          'REMOTE_USER': 'testuser@stanford.edu',
-                          'Shib-Identity-Provider': 'https://idp.stanford.edu/',
-                          'HTTP_ACCEPT': "text/html"}
+                          'Shib-Identity-Provider': 'https://idp.stanford.edu/'}
        response = self.client.get(**request_kwargs)
        # successful login is a redirect to the URL that handles auto-enrollment
        self.assertEqual(response.status_code, 302)