Merge branch 'master' into pwnage101/ENT-11563

Author: kiram15

lms/djangoapps/grades/tests/test_events.py

@@ -254,7 +254,7 @@ def test_filter_called_with_context(self, mock_run_filter):
         and merge the returned context.
         """
         enriched = {"org": "test_org", "enterprise_uuid": "abc-123"}
-        mock_run_filter.return_value = enriched
+        mock_run_filter.return_value = (enriched, self.user.id, self.course.id)
 
         from lms.djangoapps.grades.events import course_grade_passed_first_time
         with patch('lms.djangoapps.grades.events.tracker'):
@@ -270,7 +270,7 @@ def test_filter_none_return_leaves_context_intact(self, mock_run_filter):
         """
         If run_filter returns None (fail_silently path), context is not overwritten.
         """
-        mock_run_filter.return_value = None
+        mock_run_filter.return_value = (None, self.user.id, self.course.id)
         from lms.djangoapps.grades.events import course_grade_passed_first_time
         with patch('lms.djangoapps.grades.events.tracker'):
             # Should not raise even when filter returns None

lms/envs/common.py

@@ -3293,7 +3293,7 @@ def _should_send_certificate_events(settings):
         "fail_silently": False,
         "pipeline": ["enterprise.filters.accounts.AccountSettingsReadOnlyFieldsStep"],
     },
-    "org.openedx.learning.dashboard.render.started.v1": {
+    "org.openedx.learning.grade.context.requested.v1": {
         "fail_silently": False,
         "pipeline": ["enterprise.filters.dashboard.DashboardContextEnricher"],
     },

package-lock.json

@@ -47,7 +47,7 @@
     "@testing-library/jest-dom": "^6",
     "@testing-library/react": "^12",
     "@testing-library/user-event": "^12",
-    "babel-loader": "^9",
+    "babel-loader": "^10.0.0",
     "babel-plugin-transform-class-properties": "^6",
     "babel-polyfill": "^6",
     "backbone": "^1",