Merge branch 'kiram15/ENT-9670' of ssh://github.com/openedx/edx-platf…

…orm into kiram15/ENT-9670
openedx · Nov 27, 2024 · d4adeb8 · d4adeb8
2 parents a751266 + 085a5c3
commit d4adeb8
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 13 deletions.
diff --git a/common/djangoapps/third_party_auth/tests/specs/base.py b/common/djangoapps/third_party_auth/tests/specs/base.py
@@ -585,6 +585,7 @@ def test_canceling_authentication_redirects_to_account_settings_when_auth_entry_
     def test_canceling_authentication_redirects_to_root_when_auth_entry_not_set(self):
         self.assert_exception_redirect_looks_correct('/')
 
+    @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_ENTERPRISE_INTEGRATION": False})
     @mock.patch('common.djangoapps.third_party_auth.pipeline.segment.track')
     def test_full_pipeline_succeeds_for_linking_account(self, _mock_segment_track):
         # First, create, the GET request and strategy that store pipeline state,
@@ -632,6 +633,7 @@ def test_full_pipeline_succeeds_for_linking_account(self, _mock_segment_track):
         self.assert_social_auth_exists_for_user(get_request.user, strategy)
         self.assert_account_settings_context_looks_correct(account_settings_context(get_request), linked=True)
 
+    @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_ENTERPRISE_INTEGRATION": False})
     def test_full_pipeline_succeeds_for_unlinking_account(self):
         # First, create, the GET request and strategy that store pipeline state,
         # configure the backend, and mock out wire traffic.
@@ -702,6 +704,7 @@ def test_linking_already_associated_account_raises_auth_already_associated(self)
             # pylint: disable=protected-access
             actions.do_complete(backend, social_views._do_login, user=unlinked_user, request=strategy.request)
 
+    @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_ENTERPRISE_INTEGRATION": False})
     def test_already_associated_exception_populates_dashboard_with_error(self):
         # Instrument the pipeline with an exception. We test that the
         # exception is raised correctly separately, so it's ok that we're
@@ -737,6 +740,7 @@ def test_already_associated_exception_populates_dashboard_with_error(self):
         self.assert_account_settings_context_looks_correct(
             account_settings_context(post_request), duplicate=True, linked=True)
 
+    @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_ENTERPRISE_INTEGRATION": False})
     @mock.patch('common.djangoapps.third_party_auth.pipeline.segment.track')
     def test_full_pipeline_succeeds_for_signing_in_to_existing_active_account(self, _mock_segment_track):
         # First, create, the GET request and strategy that store pipeline state,
@@ -866,6 +870,7 @@ def test_pipeline_redirects_to_requested_url(self):
             requested_redirect_url,
         )
 
+    @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_ENTERPRISE_INTEGRATION": False})
     def test_full_pipeline_succeeds_registering_new_account(self):
         # First, create, the request and strategy that store pipeline state.
         # Mock out wire traffic.

diff --git a/lms/djangoapps/ccx/tests/test_field_override_performance.py b/lms/djangoapps/ccx/tests/test_field_override_performance.py
@@ -192,6 +192,7 @@ def instrument_course_progress_render(
 
     @ddt.data(*itertools.product(('no_overrides', 'ccx'), list(range(1, 4)), (True, False), (True, False)))
     @ddt.unpack
+    @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_ENTERPRISE_INTEGRATION": False})
     @override_settings(
         XBLOCK_FIELD_DATA_WRAPPERS=[],
         MODULESTORE_FIELD_OVERRIDE_PROVIDERS=[],

diff --git a/lms/djangoapps/discussion/rest_api/discussions_notifications.py b/lms/djangoapps/discussion/rest_api/discussions_notifications.py
@@ -155,7 +155,6 @@ def send_new_comment_notification(self):
                 "author_name": str(author_name),
                 "author_pronoun": str(author_pronoun),
                 "email_content": clean_thread_html_body(self.comment.body),
-                "group_by_id": self.parent_response.id
             }
             self._send_notification([self.thread.user_id], "new_comment", extra_context=context)
 

diff --git a/lms/djangoapps/discussion/rest_api/tests/test_tasks.py b/lms/djangoapps/discussion/rest_api/tests/test_tasks.py
@@ -362,7 +362,6 @@ def test_send_notification_to_parent_threads(self):
             'replier_name': self.user_3.username,
             'post_title': self.thread.title,
             'email_content': self.comment.body,
-            'group_by_id': self.thread_2.id,
             'author_name': 'dummy\'s',
             'author_pronoun': 'dummy\'s',
             'course_name': self.course.display_name,
@@ -439,7 +438,6 @@ def test_comment_creators_own_response(self):
         expected_context = {
             'replier_name': self.user_3.username,
             'post_title': self.thread.title,
-            'group_by_id': self.thread_2.id,
             'author_name': 'dummy\'s',
             'author_pronoun': 'your',
             'course_name': self.course.display_name,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -107,7 +107,7 @@
     "karma-webpack": "^5.0.1",
     "plato": "1.7.0",
     "react-test-renderer": "16.14.0",
-    "selenium-webdriver": "4.26.0",
+    "selenium-webdriver": "4.27.0",
     "sinon": "19.0.2",
     "squirejs": "0.1.0",
     "string-replace-loader": "^3.1.0",

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -135,7 +135,7 @@ optimizely-sdk<5.0
 # Date: 2023-09-18
 # pinning this version to avoid updates while the library is being developed
 # Issue for unpinning: https://github.com/openedx/edx-platform/issues/35269
-openedx-learning==0.18.0
+openedx-learning==0.18.1
 
 # Date: 2023-11-29
 # Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -827,7 +827,7 @@ openedx-filters==1.11.0
     #   -r requirements/edx/kernel.in
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.18.0
+openedx-learning==0.18.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -1386,7 +1386,7 @@ openedx-filters==1.11.0
     #   -r requirements/edx/testing.txt
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.18.0
+openedx-learning==0.18.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt

diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
@@ -997,7 +997,7 @@ openedx-filters==1.11.0
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.18.0
+openedx-learning==0.18.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -1042,7 +1042,7 @@ openedx-filters==1.11.0
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.18.0
+openedx-learning==0.18.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt