From b3ff509767b306dbcecba8c2b6875829fac95080 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Mar 2026 10:23:25 +0000
Subject: [PATCH 01/13] chore(deps): update dependency jasmine-core to v2.99.1

---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 743dca2ec852..17793c8397c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -77,7 +77,7 @@
       "devDependencies": {
         "@edx/stylelint-config-edx": "^2",
         "babel-jest": "^29",
-        "jasmine-core": "2.6.4",
+        "jasmine-core": "2.99.1",
         "jasmine-jquery": "git+https://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
         "jest": "^29",
         "karma": "^6.0.0",
@@ -10775,9 +10775,9 @@
       }
     },
     "node_modules/jasmine-core": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.4.tgz",
-      "integrity": "sha512-HUYBYi/hlSnCIr8QH9xuDBJUAzSHS0El3HxTomovIQcNxtbNhoOtKwpEZaB/jq3sfW/qyhqwW/VDUtoB2RZ4Tg==",
+      "version": "2.99.1",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
+      "integrity": "sha512-ra97U4qu3OCcIxvN6eg3kyy8bLrID/TgxafSGMMICg3SFx5C/sUfDPpiOh7yoIsHdtjrOVdtT9rieYhqOsh9Ww==",
       "dev": true,
       "license": "MIT"
     },
@@ -16951,6 +16951,7 @@
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
diff --git a/package.json b/package.json
index 749c937f7ecb..bcfb2b964005 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
   "devDependencies": {
     "@edx/stylelint-config-edx": "^2",
     "babel-jest": "^29",
-    "jasmine-core": "2.6.4",
+    "jasmine-core": "2.99.1",
     "jasmine-jquery": "git+https://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
     "jest": "^29",
     "karma": "^6.0.0",

From 1c68c6c463b6a63312005b4193695ad36d079f11 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Wed, 4 Mar 2026 14:21:57 -0500
Subject: [PATCH 02/13] fix: refactor certificate_editor_spec to not call
 AjaxHelpers inside it()

Jasmine 2.99.x added ensureIsNotNested() which throws
'afterEach' should only be used in 'describe' function
when afterEach() is called from inside a running spec.

AjaxHelpers.requests() calls afterEach() internally, so it must
be called from a describe() body. Replicate the createFakeRequests()
pattern in beforeEach/afterEach instead:
- Set up sinon.useFakeXMLHttpRequest() in describe('Basic') beforeEach
- Tear down in afterEach via requests.restore()
- Remove inline AjaxHelpers.requests(this) from 3 it() bodies
- Remove AjaxHelpers.requests(that) from clickDeleteItem() helper
  (uses the module-level requests variable instead)

This file was a cascade-causing failure: sinon's fake XHR was left
active after the suite ran, intercepting requests from later suites.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../spec/views/certificate_editor_spec.js     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/cms/static/js/certificates/spec/views/certificate_editor_spec.js b/cms/static/js/certificates/spec/views/certificate_editor_spec.js
index 64ef492c82ca..bace47fe0b4d 100644
--- a/cms/static/js/certificates/spec/views/certificate_editor_spec.js
+++ b/cms/static/js/certificates/spec/views/certificate_editor_spec.js
@@ -2,6 +2,7 @@
 
 define([
     'underscore',
+    'sinon',
     'js/models/course',
     'js/certificates/models/certificate',
     'js/certificates/models/signatory',
@@ -14,11 +15,12 @@ define([
     'js/spec_helpers/validation_helpers',
     'js/certificates/spec/custom_matchers'
 ],
-function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, CertificateEditorView,
+function(_, sinon, Course, CertificateModel, SignatoryModel, CertificatesCollection, CertificateEditorView,
     Notification, AjaxHelpers, TemplateHelpers, ViewHelpers, ValidationHelpers, CustomMatchers) {
     'use strict';
 
     var MAX_SIGNATORIES_LIMIT = 10;
+    var requests, xhrFactory;
     var SELECTORS = {
         detailsView: '.certificate-details',
         editView: '.certificate-edit',
@@ -45,8 +47,7 @@ function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, Ce
     };
 
     var clickDeleteItem = function(that, promptText, element, url) {
-        var requests = AjaxHelpers.requests(that),
-            promptSpy = ViewHelpers.createPromptSpy(),
+        var promptSpy = ViewHelpers.createPromptSpy(),
             notificationSpy = ViewHelpers.createNotificationSpy();
         that.view.$(element).click();
 
@@ -129,6 +130,11 @@ function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, Ce
 
         describe('Basic', function() {
             beforeEach(function() {
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
                 appendSetFixtures(
                     $('<script>', {id: 'basic-modal-tpl', type: 'text/template'}).text(basicModalTpl)
                 );
@@ -141,6 +147,7 @@ function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, Ce
             });
 
             afterEach(function() {
+                requests.restore();
                 $('.wrapper-modal-window-assetupload').remove();
             });
 
@@ -157,8 +164,7 @@ function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, Ce
             });
 
             it('should save properly', function() {
-                var requests = AjaxHelpers.requests(this),
-                    notificationSpy = ViewHelpers.createNotificationSpy();
+                var notificationSpy = ViewHelpers.createNotificationSpy();
                 this.view.$('.action-add').click();
 
                 setValuesToInputs(this.view, {
@@ -174,8 +180,7 @@ function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, Ce
             });
 
             it('does not hide saving message if failure', function() {
-                var requests = AjaxHelpers.requests(this),
-                    notificationSpy = ViewHelpers.createNotificationSpy();
+                var notificationSpy = ViewHelpers.createNotificationSpy();
                 this.view.$(SELECTORS.inputCertificateName).val('New Test Name');
                 this.view.$(SELECTORS.inputCertificateDescription).val('New Test Description');
                 ViewHelpers.submitAndVerifyFormError(this.view, requests, notificationSpy);
@@ -293,8 +298,7 @@ function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, Ce
             });
 
             it('signatories should save properly', function() {
-                var requests = AjaxHelpers.requests(this),
-                    notificationSpy = ViewHelpers.createNotificationSpy();
+                var notificationSpy = ViewHelpers.createNotificationSpy();
                 this.view.$('.action-add').click();
 
                 setValuesToInputs(this.view, {

From c772d50cc272e3534304c54d3309879b68b687c3 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Wed, 4 Mar 2026 14:55:58 -0500
Subject: [PATCH 03/13] fix: refactor group_configuration_spec to not call
 AjaxHelpers inside it()

Jasmine 2.99.x throws when afterEach() is called from inside a running
spec. AjaxHelpers.requests() calls afterEach() internally, so it must
be called from a describe() body.

Move fake XHR setup to the top-level beforeEach/afterEach using
sinon.useFakeXMLHttpRequest() directly, so all nested describe blocks
share a single module-level requests array. Remove all inline
AjaxHelpers.requests() calls (12 it() bodies + 2 helper functions).

This file was a cascade-causing failure: sinon's fake XHR was left
active after the suite ran, intercepting requests from later suites.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../js/spec/views/group_configuration_spec.js | 82 ++++++++++++-------
 1 file changed, 52 insertions(+), 30 deletions(-)

diff --git a/cms/static/js/spec/views/group_configuration_spec.js b/cms/static/js/spec/views/group_configuration_spec.js
index d197c64d10f8..c13b86aadbbc 100644
--- a/cms/static/js/spec/views/group_configuration_spec.js
+++ b/cms/static/js/spec/views/group_configuration_spec.js
@@ -1,18 +1,49 @@
 define([
-    'underscore', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/template_helpers',
+    'underscore', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/template_helpers',
     'common/js/spec_helpers/view_helpers', 'js/models/course', 'js/models/group_configuration', 'js/models/group',
     'js/collections/group_configuration', 'js/collections/group', 'js/views/group_configuration_details',
     'js/views/group_configurations_list', 'js/views/group_configuration_editor', 'js/views/group_configuration_item',
     'js/views/experiment_group_edit', 'js/views/partition_group_list', 'js/views/partition_group_details',
     'js/views/content_group_editor', 'js/views/partition_group_item'
 ], function(
-    _, AjaxHelpers, TemplateHelpers, ViewHelpers, Course, GroupConfigurationModel, GroupModel,
+    _, sinon, AjaxHelpers, TemplateHelpers, ViewHelpers, Course, GroupConfigurationModel, GroupModel,
     GroupConfigurationCollection, GroupCollection, GroupConfigurationDetailsView, GroupConfigurationsListView,
     GroupConfigurationEditorView, GroupConfigurationItemView, ExperimentGroupEditView, GroupList,
     PartitionGroupDetailsView, ContentGroupEditorView, PartitionGroupItemView
 ) {
     'use strict';
 
+    // Wrap all specs in a single describe so that the beforeEach/afterEach below are
+    // scoped to this file only. Without this wrapper those hooks sit at the top level of
+    // the AMD factory, which Jasmine treats as global hooks — they run before/after every
+    // spec in the entire test suite, not just the ones in this file. That causes two problems:
+    //
+    //   1. sinon conflict: other spec files also call sinon.useFakeXMLHttpRequest() in their
+    //      own beforeEach. In sinon v19, restoring one factory clears the .restore() method
+    //      on all other active factories. When the global afterEach then calls
+    //      xhrFactory.restore(), it throws "TypeError: xhrFactory.restore is not a function".
+    //
+    //   2. State leak: the global afterEach deletes window.course, corrupting tests in other
+    //      spec files that set up window.course in their own beforeEach.
+    describe('Group Configurations', function() {
+
+    // Pre-populate the jasmine-fixtures cache for every template used in the inner
+    // beforeEach blocks below. The outer beforeEach installs sinon.useFakeXMLHttpRequest(),
+    // which intercepts the synchronous XHR that readFixtures() uses to load .underscore
+    // files from the Karma server. Calling readFixtures() here — at describe-body level,
+    // before any beforeEach runs — loads the files over real XHR and caches the results.
+    // Subsequent readFixtures() calls inside beforeEach then return from cache without
+    // making a new (intercepted) request.
+    readFixtures(
+        'group-configuration-details.underscore',
+        'group-configuration-editor.underscore',
+        'group-edit.underscore',
+        'list.underscore',
+        'content-group-editor.underscore',
+        'partition-group-details.underscore'
+    );
+
+    var requests, xhrFactory;
     var SELECTORS = {
         detailsView: '.group-configuration-details',
         editView: '.group-configuration-edit',
@@ -101,8 +132,7 @@ define([
         expect(view.$(editView)).not.toExist();
     };
     var assertAndDeleteItemError = function(that, url, promptText) {
-        var requests = AjaxHelpers.requests(that),
-            promptSpy = ViewHelpers.createPromptSpy(),
+        var promptSpy = ViewHelpers.createPromptSpy(),
             notificationSpy = ViewHelpers.createNotificationSpy();
 
         ViewHelpers.clickDeleteItem(that, promptSpy, promptText);
@@ -114,8 +144,7 @@ define([
         expect($(SELECTORS.itemView)).not.toExist();
     };
     var assertAndDeleteItemWithError = function(that, url, listItemView, promptText) {
-        var requests = AjaxHelpers.requests(that),
-            promptSpy = ViewHelpers.createPromptSpy(),
+        var promptSpy = ViewHelpers.createPromptSpy(),
             notificationSpy = ViewHelpers.createNotificationSpy();
 
         ViewHelpers.clickDeleteItem(that, promptSpy, promptText);
@@ -143,6 +172,11 @@ define([
     };
 
     beforeEach(function() {
+        xhrFactory = sinon.useFakeXMLHttpRequest();
+        requests = [];
+        requests.currentIndex = 0;
+        requests.restore = function() { xhrFactory.restore(); };
+        xhrFactory.onCreate = function(req) { requests.push(req); };
         window.course = new Course({
             id: '5',
             name: 'Course Name',
@@ -220,6 +254,7 @@ define([
     });
 
     afterEach(function() {
+        requests.restore();
         delete window.course;
     });
 
@@ -400,8 +435,7 @@ define([
         });
 
         it('should save properly', function() {
-            var requests = AjaxHelpers.requests(this),
-                notificationSpy = ViewHelpers.createNotificationSpy(),
+            var notificationSpy = ViewHelpers.createNotificationSpy(),
                 groups;
 
             this.view.$('.action-add-group').click();
@@ -424,8 +458,7 @@ define([
         });
 
         it('does not hide saving message if failure', function() {
-            var requests = AjaxHelpers.requests(this),
-                notificationSpy = ViewHelpers.createNotificationSpy();
+            var notificationSpy = ViewHelpers.createNotificationSpy();
 
             setValuesToInputs(this.view, {inputName: 'New Configuration'});
             ViewHelpers.submitAndVerifyFormError(this.view, requests, notificationSpy);
@@ -463,8 +496,6 @@ define([
         });
 
         it('should be possible to correct validation errors', function() {
-            var requests = AjaxHelpers.requests(this);
-
             // Set incorrect value
             setValuesToInputs(this.view, {inputName: ''});
             // Try to save
@@ -798,8 +829,7 @@ define([
         });
 
         it('can create an initial group and save', function() {
-            var requests = AjaxHelpers.requests(this),
-                newGroupName = 'New Group Name',
+            var newGroupName = 'New Group Name',
                 view = renderView();
             editNewGroup(view, {newName: newGroupName, save: true});
             respondToSave(requests, view);
@@ -808,8 +838,7 @@ define([
         });
 
         it('can add another group and save', function() {
-            var requests = AjaxHelpers.requests(this),
-                oldGroupName = 'Old Group Name',
+            var oldGroupName = 'Old Group Name',
                 newGroupName = 'New Group Name',
                 view = renderView({1: oldGroupName});
             editNewGroup(view, {newName: newGroupName, save: true});
@@ -819,8 +848,7 @@ define([
         });
 
         it('can cancel adding a group', function() {
-            var requests = AjaxHelpers.requests(this),
-                newGroupName = 'New Group Name',
+            var newGroupName = 'New Group Name',
                 view = renderView();
             editNewGroup(view, {newName: newGroupName, cancel: true});
             AjaxHelpers.expectNoRequests(requests);
@@ -829,8 +857,7 @@ define([
         });
 
         it('can cancel editing a group', function() {
-            var requests = AjaxHelpers.requests(this),
-                originalGroupName = 'Original Group Name',
+            var originalGroupName = 'Original Group Name',
                 view = renderView([originalGroupName]);
             editExistingGroup(view, {newName: 'New Group Name', cancel: true});
             verifyEditingGroup(view, false);
@@ -839,8 +866,7 @@ define([
         });
 
         it('can show and correct a validation error', function() {
-            var requests = AjaxHelpers.requests(this),
-                newGroupName = 'New Group Name',
+            var newGroupName = 'New Group Name',
                 view = renderView();
             editNewGroup(view, {newName: '', save: true});
             AjaxHelpers.expectNoRequests(requests);
@@ -848,8 +874,7 @@ define([
         });
 
         it('can not invalidate an existing content group', function() {
-            var requests = AjaxHelpers.requests(this),
-                oldGroupName = 'Old Group Name',
+            var oldGroupName = 'Old Group Name',
                 view = renderView([oldGroupName]);
             editExistingGroup(view, {newName: '', save: true});
             AjaxHelpers.expectNoRequests(requests);
@@ -857,8 +882,7 @@ define([
         });
 
         it('trims whitespace', function() {
-            var requests = AjaxHelpers.requests(this),
-                newGroupName = 'New Group Name',
+            var newGroupName = 'New Group Name',
                 view = renderView();
             editNewGroup(view, {newName: '  ' + newGroupName + '  ', save: true});
             respondToSave(requests, view);
@@ -963,8 +987,7 @@ define([
         });
 
         it('should save properly', function() {
-            var requests = AjaxHelpers.requests(this),
-                notificationSpy = ViewHelpers.createNotificationSpy();
+            var notificationSpy = ViewHelpers.createNotificationSpy();
 
             this.view.$('.action-add').click();
             this.view.$(SELECTORS.inputName).val('New Content Group');
@@ -978,8 +1001,7 @@ define([
         });
 
         it('does not hide saving message if failure', function() {
-            var requests = AjaxHelpers.requests(this),
-                notificationSpy = ViewHelpers.createNotificationSpy();
+            var notificationSpy = ViewHelpers.createNotificationSpy();
             this.view.$(SELECTORS.inputName).val('New Content Group');
 
             ViewHelpers.submitAndVerifyFormError(this.view, requests, notificationSpy);

From 5e48fbab5e220cce55f504add92dbb588a696e00 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Wed, 4 Mar 2026 15:16:20 -0500
Subject: [PATCH 04/13] fix: refactor paged_container_spec to not call
 AjaxHelpers inside it()

Move fake XHR setup to describe-level beforeEach/afterEach using
sinon.useFakeXMLHttpRequest() directly. Remove ~50 inline
AjaxHelpers.requests(this) calls from it() bodies including the
testSendsAjax() helper that generated it() blocks inline.

AjaxHelpers is still imported and used for its utility functions
(respondWithJson, expectJsonRequest, expectNoRequests, etc.) which
only operate on the requests array and don't call afterEach() internally.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../js/spec/views/paged_container_spec.js     | 77 +++++--------------
 1 file changed, 21 insertions(+), 56 deletions(-)

diff --git a/cms/static/js/spec/views/paged_container_spec.js b/cms/static/js/spec/views/paged_container_spec.js
index ad9c5891ab90..3add3711ba94 100644
--- a/cms/static/js/spec/views/paged_container_spec.js
+++ b/cms/static/js/spec/views/paged_container_spec.js
@@ -1,7 +1,8 @@
-define(['jquery', 'underscore', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'URI', 'js/models/xblock_info',
+define(['jquery', 'underscore', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'URI', 'js/models/xblock_info',
     'js/views/paged_container', 'js/views/paging_header',
     'common/js/components/views/paging_footer', 'js/views/xblock'],
-function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, PagingFooter, XBlockView) {
+function($, _, sinon, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, PagingFooter, XBlockView) {
+    var requests, xhrFactory;
     var htmlResponseTpl = _.template(''
             + '<div class="xblock-container-paging-parameters" '
                 + 'data-start="<%= start %>" '
@@ -73,16 +74,24 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
         var pagingContainer;
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             pagingContainer = new MockPagingView({
                 page_size: PAGE_SIZE,
                 page: jasmine.createSpyObj('page', ['updatePreviewButton', 'renderAddXBlockComponents'])
             });
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         describe('Container', function() {
             describe('rendering', function() {
                 it('should set show_previews', function() {
-                    var requests = AjaxHelpers.requests(this);
                     expect(pagingContainer.collection.showChildrenPreviews).toBe(true); // precondition check
 
                     pagingContainer.setPage(0);
@@ -97,7 +106,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
 
             describe('setPage', function() {
                 it('can set the current page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     expect(pagingContainer.collection.currentPage).toBe(0);
@@ -107,7 +115,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('should not change page after a server error', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     pagingContainer.setPage(1);
@@ -118,7 +125,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
 
             describe('nextPage', function() {
                 it('does not move forward after a server error', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     pagingContainer.nextPage();
@@ -127,7 +133,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('can move to the next page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     pagingContainer.nextPage();
@@ -136,7 +141,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('can not move forward from the final page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     pagingContainer.nextPage();
@@ -146,7 +150,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
 
             describe('previousPage', function() {
                 it('can move back a page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     pagingContainer.previousPage();
@@ -155,7 +158,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('can not move back from the first page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     pagingContainer.previousPage();
@@ -163,7 +165,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('does not move back after a server error', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     pagingContainer.previousPage();
@@ -177,19 +178,18 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
             describe('Next page button', function() {
                 beforeEach(function() {
                     pagingContainer.render();
+                    respondWithMockPage(requests);
                 });
 
                 it('does not move forward if a server error occurs', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     pagingContainer.pagingHeader.$('.next-page-link').click();
-                    requests[1].respond(500);
+                    requests[2].respond(500);
                     expect(pagingContainer.collection.currentPage).toBe(0);
                 });
 
                 it('can move to the next page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     pagingContainer.pagingHeader.$('.next-page-link').click();
@@ -198,21 +198,18 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('should be enabled when there is at least one more page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingHeader.$('.next-page-link')).not.toHaveClass('is-disabled');
                 });
 
                 it('should be disabled on the final page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingHeader.$('.next-page-link')).toHaveClass('is-disabled');
                 });
 
                 it('should be disabled on an empty page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingContainer.pagingHeader.$('.next-page-link')).toHaveClass('is-disabled');
@@ -222,19 +219,18 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
             describe('Previous page button', function() {
                 beforeEach(function() {
                     pagingContainer.render();
+                    respondWithMockPage(requests);
                 });
 
                 it('does not move back if a server error occurs', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     pagingContainer.pagingHeader.$('.previous-page-link').click();
-                    requests[1].respond(500);
+                    requests[2].respond(500);
                     expect(pagingContainer.collection.currentPage).toBe(1);
                 });
 
                 it('can go back a page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     pagingContainer.pagingHeader.$('.previous-page-link').click();
@@ -243,21 +239,18 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('should be disabled on the first page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingHeader.$('.previous-page-link')).toHaveClass('is-disabled');
                 });
 
                 it('should be enabled on the second page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingHeader.$('.previous-page-link')).not.toHaveClass('is-disabled');
                 });
 
                 it('should be disabled for an empty page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingContainer.pagingHeader.$('.previous-page-link')).toHaveClass('is-disabled');
@@ -266,8 +259,7 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
 
             describe('Page metadata section', function() {
                 it('shows the correct metadata for the current page', function() {
-                    var requests = AjaxHelpers.requests(this),
-                        message;
+                    var message;
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     message = pagingContainer.pagingHeader.$('.meta').html().trim();
@@ -279,21 +271,18 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
 
             describe('Children count label', function() {
                 it('should show correct count on first page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingHeader.$('.count-current-shown')).toHaveHtml('1-3');
                 });
 
                 it('should show correct count on second page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingHeader.$('.count-current-shown')).toHaveHtml('4-4');
                 });
 
                 it('should show correct count for an empty collection', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingContainer.pagingHeader.$('.count-current-shown')).toHaveHtml('0-0');
@@ -302,21 +291,18 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
 
             describe('Children total label', function() {
                 it('should show correct total on the first page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingHeader.$('.count-total')).toHaveText('4 total');
                 });
 
                 it('should show correct total on the second page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingHeader.$('.count-total')).toHaveText('4 total');
                 });
 
                 it('should show zero total for an empty collection', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingContainer.pagingHeader.$('.count-total')).toHaveText('0 total');
@@ -329,19 +315,18 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 beforeEach(function() {
                     // Render the page and header so that they can react to events
                     pagingContainer.render();
+                    respondWithMockPage(requests);
                 });
 
                 it('does not move forward if a server error occurs', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     pagingContainer.pagingFooter.$('.next-page-link').click();
-                    requests[1].respond(500);
+                    requests[2].respond(500);
                     expect(pagingContainer.collection.currentPage).toBe(0);
                 });
 
                 it('can move to the next page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     pagingContainer.pagingFooter.$('.next-page-link').click();
@@ -350,21 +335,18 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('should be enabled when there is at least one more page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingFooter.$('.next-page-link')).not.toHaveClass('is-disabled');
                 });
 
                 it('should be disabled on the final page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingFooter.$('.next-page-link')).toHaveClass('is-disabled');
                 });
 
                 it('should be disabled on an empty page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingContainer.pagingFooter.$('.next-page-link')).toHaveClass('is-disabled');
@@ -375,19 +357,18 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 beforeEach(function() {
                     // Render the page and header so that they can react to events
                     pagingContainer.render();
+                    respondWithMockPage(requests);
                 });
 
                 it('does not move back if a server error occurs', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     pagingContainer.pagingFooter.$('.previous-page-link').click();
-                    requests[1].respond(500);
+                    requests[2].respond(500);
                     expect(pagingContainer.collection.currentPage).toBe(1);
                 });
 
                 it('can go back a page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     pagingContainer.pagingFooter.$('.previous-page-link').click();
@@ -396,21 +377,18 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('should be disabled on the first page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingFooter.$('.previous-page-link')).toHaveClass('is-disabled');
                 });
 
                 it('should be enabled on the second page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingFooter.$('.previous-page-link')).not.toHaveClass('is-disabled');
                 });
 
                 it('should be disabled for an empty page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingContainer.pagingFooter.$('.previous-page-link')).toHaveClass('is-disabled');
@@ -419,21 +397,18 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
 
             describe('Current page label', function() {
                 it('should show 1 on the first page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingFooter.$('.current-page')).toHaveText('1');
                 });
 
                 it('should show 2 on the second page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(1);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingFooter.$('.current-page')).toHaveText('2');
                 });
 
                 it('should show 1 for an empty collection', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingContainer.pagingFooter.$('.current-page')).toHaveText('1');
@@ -442,14 +417,12 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
 
             describe('Page total label', function() {
                 it('should show the correct value with more than one page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingFooter.$('.total-pages')).toHaveText('2');
                 });
 
                 it('should show page 1 when there are no assets', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingContainer.pagingFooter.$('.total-pages')).toHaveText('1');
@@ -460,14 +433,12 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 var input;
 
                 it('should initially have a blank page input', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     expect(pagingContainer.pagingFooter.$('.page-number-input')).toHaveValue('');
                 });
 
                 it('should handle invalid page requests', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     pagingContainer.pagingFooter.$('.page-number-input').val('abc');
@@ -477,7 +448,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('should switch pages via the input field', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     pagingContainer.pagingFooter.$('.page-number-input').val('2');
@@ -488,7 +458,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('should handle AJAX failures when switching pages via the input field', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     pagingContainer.pagingFooter.$('.page-number-input').val('2');
@@ -507,7 +476,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
 
                 testSendsAjax = function(show_previews) {
                     it('should send ' + (!show_previews) + ' when showChildrenPreviews was ' + show_previews, function() {
-                        var requests = AjaxHelpers.requests(this);
                         pagingContainer.collection.showChildrenPreviews = show_previews;
                         pagingContainer.togglePreviews();
                         AjaxHelpers.expectJsonRequest(requests, 'POST', defaultUrl, {showChildrenPreviews: !show_previews});
@@ -519,7 +487,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
 
                 it('should trigger render on success', function() {
                     spyOn(pagingContainer, 'render');
-                    var requests = AjaxHelpers.requests(this);
 
                     pagingContainer.togglePreviews();
                     AjaxHelpers.respondWithJson(requests, {showChildrenPreviews: true});
@@ -529,7 +496,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
 
                 it('should not trigger render on failure', function() {
                     spyOn(pagingContainer, 'render');
-                    var requests = AjaxHelpers.requests(this);
 
                     pagingContainer.togglePreviews();
                     AjaxHelpers.respondWithError(requests);
@@ -538,7 +504,6 @@ function($, _, AjaxHelpers, URI, XBlockInfo, PagedContainer, PagingHeader, Pagin
                 });
 
                 it('should send force_render when new block causes page change', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingContainer.setPage(0);
                     respondWithMockPage(requests);
                     spyOn(pagingContainer, 'render');

From 73b23142aeeb4674a04c4b864a6743a539ea7fdc Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Wed, 4 Mar 2026 15:20:30 -0500
Subject: [PATCH 05/13] fix: refactor paging_spec to not call AjaxHelpers
 inside it()

Move fake XHR setup to describe-level beforeEach/afterEach.
Remove ~30 inline AjaxHelpers.requests(this) calls from it() bodies.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 cms/static/js/spec/views/paging_spec.js | 48 ++++++++-----------------
 1 file changed, 15 insertions(+), 33 deletions(-)

diff --git a/cms/static/js/spec/views/paging_spec.js b/cms/static/js/spec/views/paging_spec.js
index f01edf9fed3a..316356aa8681 100644
--- a/cms/static/js/spec/views/paging_spec.js
+++ b/cms/static/js/spec/views/paging_spec.js
@@ -1,14 +1,17 @@
 define([
     'jquery',
     'URI',
+    'sinon',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'edx-ui-toolkit/js/pagination/paging-collection',
     'js/views/paging',
     'js/views/paging_header'
 ],
-function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
+function($, URI, sinon, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
     'use strict';
 
+    var requests, xhrFactory;
+
     var createPageableItem = function(index) {
         var id = 'item_' + index;
         return {
@@ -78,15 +81,23 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
             });
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             var collection = new TestPagingCollection();
             collection.url = '/dummy/';
             pagingView = new MockPagingView({collection: collection});
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         describe('PagingView', function() {
             describe('setPage', function() {
                 it('can set the current page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     expect(pagingView.collection.getPageNumber()).toBe(1);
@@ -96,7 +107,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('should not change page after a server error', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     pagingView.setPage(2);
@@ -109,7 +119,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
 
             describe('nextPage', function() {
                 it('does not move forward after a server error', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     pagingView.nextPage();
@@ -118,7 +127,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('can move to the next page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     pagingView.nextPage();
@@ -129,7 +137,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('can not move forward from the final page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(2);
                     respondWithMockItems(requests);
                     pagingView.nextPage();
@@ -139,7 +146,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
 
             describe('previousPage', function() {
                 it('can move back a page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(2);
                     respondWithMockItems(requests);
                     pagingView.previousPage();
@@ -148,7 +154,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('can not move back from the first page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     pagingView.previousPage();
@@ -156,7 +161,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('does not move back after a server error', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(2);
                     respondWithMockItems(requests);
                     pagingView.previousPage();
@@ -167,7 +171,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
 
             describe('toggleSortOrder', function() {
                 it('can toggle direction of the current sort', function() {
-                    var requests = AjaxHelpers.requests(this);
                     expect(pagingView.collection.sortDirection).toBe('desc');
                     pagingView.toggleSortOrder('date-col');
                     respondWithMockItems(requests);
@@ -178,7 +181,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('sets the correct default sort direction for a column', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.toggleSortOrder('name-col');
                     respondWithMockItems(requests);
                     expect(pagingView.sortDisplayName()).toBe('Name');
@@ -222,7 +224,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('does not move forward if a server error occurs', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     pagingHeader.$('.next-page-link').click();
@@ -232,7 +233,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('can move to the next page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     pagingHeader.$('.next-page-link').click();
@@ -241,21 +241,18 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('should be enabled when there is at least one more page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     expect(pagingHeader.$('.next-page-link')).not.toHaveClass('is-disabled');
                 });
 
                 it('should be disabled on the final page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(2);
                     respondWithMockItems(requests);
                     expect(pagingHeader.$('.next-page-link')).toHaveClass('is-disabled');
                 });
 
                 it('should be disabled on an empty page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingHeader.$('.next-page-link')).toHaveClass('is-disabled');
@@ -270,7 +267,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('does not move back if a server error occurs', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(2);
                     respondWithMockItems(requests);
                     pagingHeader.$('.previous-page-link').click();
@@ -279,7 +275,6 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('can go back a page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(2);
                     respondWithMockItems(requests);
                     pagingHeader.$('.previous-page-link').click();
@@ -288,21 +283,18 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('should be disabled on the first page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     expect(pagingHeader.$('.previous-page-link')).toHaveClass('is-disabled');
                 });
 
                 it('should be enabled on the second page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(2);
                     respondWithMockItems(requests);
                     expect(pagingHeader.$('.previous-page-link')).not.toHaveClass('is-disabled');
                 });
 
                 it('should be disabled for an empty page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingHeader.$('.previous-page-link')).toHaveClass('is-disabled');
@@ -311,8 +303,7 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
 
             describe('Page metadata section', function() {
                 it('shows the correct metadata for the current page', function() {
-                    var requests = AjaxHelpers.requests(this),
-                        message;
+                    var message;
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     message = pagingHeader.$('.meta').html().trim();
@@ -322,8 +313,7 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
                 });
 
                 it('shows the correct metadata when sorted ascending', function() {
-                    var requests = AjaxHelpers.requests(this),
-                        message;
+                    var message;
                     pagingView.setPage(1);
                     pagingView.toggleSortOrder('name-col');
                     respondWithMockItems(requests);
@@ -336,21 +326,18 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
 
             describe('Item count label', function() {
                 it('should show correct count on first page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     expect(pagingHeader.$('.count-current-shown')).toHaveHtml('1-3');
                 });
 
                 it('should show correct count on second page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(2);
                     respondWithMockItems(requests);
                     expect(pagingHeader.$('.count-current-shown')).toHaveHtml('4-4');
                 });
 
                 it('should show correct count for an empty collection', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingHeader.$('.count-current-shown')).toHaveHtml('0-0');
@@ -359,21 +346,18 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
 
             describe('Item total label', function() {
                 it('should show correct total on the first page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     expect(pagingHeader.$('.count-total')).toHaveText('4 total');
                 });
 
                 it('should show correct total on the second page', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(2);
                     respondWithMockItems(requests);
                     expect(pagingHeader.$('.count-total')).toHaveText('4 total');
                 });
 
                 it('should show zero total for an empty collection', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     AjaxHelpers.respondWithJson(requests, mockEmptyPage);
                     expect(pagingHeader.$('.count-total')).toHaveText('0 total');
@@ -382,14 +366,12 @@ function($, URI, AjaxHelpers, PagingCollection, PagingView, PagingHeader) {
 
             describe('Sort order label', function() {
                 it('should show correct initial sort order', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.setPage(1);
                     respondWithMockItems(requests);
                     expect(pagingHeader.$('.sort-order')).toHaveText('Date');
                 });
 
                 it('should show updated sort order', function() {
-                    var requests = AjaxHelpers.requests(this);
                     pagingView.toggleSortOrder('name-col');
                     respondWithMockItems(requests);
                     expect(pagingHeader.$('.sort-order')).toHaveText('Name');

From 6bd198461a7c4a61b5525ccbcbd7bce57849fa34 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Wed, 4 Mar 2026 15:28:16 -0500
Subject: [PATCH 06/13] fix: refactor assets, settings/main, pages/index specs
 to not call AjaxHelpers inside it()

Move fake XHR setup to describe-level beforeEach/afterEach in each file.
Remove inline AjaxHelpers.requests(this) calls from it() bodies and helper
functions (assets_spec.js setup() helper).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 cms/static/js/spec/views/assets_spec.js       | 52 +++++++++++++++----
 cms/static/js/spec/views/pages/index_spec.js  | 16 +++---
 .../js/spec/views/settings/main_spec.js       | 41 +++++++--------
 3 files changed, 70 insertions(+), 39 deletions(-)

diff --git a/cms/static/js/spec/views/assets_spec.js b/cms/static/js/spec/views/assets_spec.js
index e2105df2d73a..bb1e76b831a0 100644
--- a/cms/static/js/spec/views/assets_spec.js
+++ b/cms/static/js/spec/views/assets_spec.js
@@ -1,6 +1,7 @@
-define(['jquery', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'URI', 'js/views/assets',
+define(['jquery', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'URI', 'js/views/assets',
     'js/collections/asset', 'common/js/spec_helpers/view_helpers'],
-function($, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
+function($, sinon, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
+    var requests, xhrFactory;
     describe('Assets', function() {
         var assetsView, mockEmptyAssetsResponse, mockAssetUploadResponse, mockFileUpload,
             assetLibraryTpl, assetTpl, uploadModalTpl;
@@ -10,6 +11,36 @@ function($, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
         uploadModalTpl = readFixtures('asset-upload-modal.underscore');
 
         beforeEach(function() {
+            // Fake XHR must be installed BEFORE new AssetsView() for two reasons:
+            //
+            // 1. AssetsView.initialize() calls createPagingView() which immediately calls
+            //    pagingView.setPage(1), firing an AJAX request. If real XHR is active at that
+            //    point, the request goes to Karma's server which returns 404. Jasmine 2.x
+            //    schedules beforeEach and it() with setTimeout(0) between them, giving the
+            //    browser event loop a window to process pending async work. The Karma 404
+            //    response fires during that window, triggering AssetsView's error callback
+            //    -> getTableBody() -> DOM creation -> .upload-button becomes visible. Tests
+            //    that check this button is hidden (in loading state) then fail.
+            //
+            // 2. This test suite tests the loading -> loaded state transition. Several tests
+            //    call setup() inside it(), which calls setPage(1) and responds to it, driving
+            //    the view from "loading" to "loaded". That precondition requires the view to
+            //    still be in "loading" state at the start of it(). Responding to the init
+            //    request in beforeEach (to avoid the dangling request) would put the view
+            //    into "loaded" state too early and break those assertions.
+            //
+            // With sinon installed first, the init setPage(1) is captured as requests[0] —
+            // a frozen pending fake request that never gets a response unless explicitly told
+            // to. No response means no callbacks, no DOM mutation, view stays in "loading"
+            // state. We advance currentIndex to 1 so AjaxHelpers treats that request as
+            // already consumed; test-driven setPage() calls start at index 1. The pending
+            // requests[0] is abandoned when xhrFactory.restore() runs in afterEach.
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
+
             setFixtures($('<script>', {id: 'asset-library-tpl', type: 'text/template'}).text(assetLibraryTpl));
             appendSetFixtures($('<script>', {id: 'asset-tpl', type: 'text/template'}).text(assetTpl));
             appendSetFixtures(uploadModalTpl);
@@ -29,8 +60,16 @@ function($, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
                 collection: collection,
                 el: $('#asset_table_body')
             });
-
+            // render() calls afterRender(), which binds the close-button click handler
+            // against the upload modal already in the fixture DOM (from appendSetFixtures
+            // above). render() itself issues no XHR (pagingView.render() is a no-op), so
+            // requests[0] is still the init setPage from new AssetsView() above.
             assetsView.render();
+            requests.currentIndex = 1;
+        });
+
+        afterEach(function() {
+            requests.restore();
         });
 
         var mockAsset = {
@@ -143,7 +182,6 @@ function($, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
         describe('AssetsView', function() {
             var setup;
             setup = function(responseData) {
-                var requests = AjaxHelpers.requests(this);
                 assetsView.pagingView.setPage(1);
                 if (!responseData) {
                     AjaxHelpers.respondWithJson(requests, mockEmptyAssetsResponse);
@@ -274,7 +312,6 @@ function($, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
 
             it('make sure _toggleFilterColumn filters asset list', function() {
                 expect(assetsView).toBeDefined();
-                var requests = AjaxHelpers.requests(this);
                 $.each(assetsView.pagingView.filterableColumns, function(columnID, columnData) {
                     var $typeColumn = $('#' + columnID);
                     assetsView.pagingView.setPage(1);
@@ -306,7 +343,6 @@ function($, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
 
             it('check filtering works with sorting by column on', function() {
                 expect(assetsView).toBeDefined();
-                var requests = AjaxHelpers.requests(this);
                 assetsView.pagingView.registerSortableColumn('name-col', 'Name Column', 'nameField', 'asc');
                 assetsView.pagingView.registerFilterableColumn('js-asset-type-col', gettext('Type'), 'asset_type');
                 assetsView.pagingView.setInitialSortColumn('name-col');
@@ -323,7 +359,6 @@ function($, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
 
             it('shows type select menu, selects type, and filters results', function() {
                 expect(assetsView).toBeDefined();
-                var requests = AjaxHelpers.requests(this);
                 $.each(assetsView.pagingView.filterableColumns, function(columnID, columnData) {
                     assetsView.pagingView.setPage(1);
                     respondWithMockAssets(requests);
@@ -420,7 +455,6 @@ function($, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
                     };
 
                 it('can move forward a page using the next page button', function() {
-                    var requests = AjaxHelpers.requests(this);
                     assetsView.pagingView.setPage(1);
                     AjaxHelpers.respondWithJson(requests, firstPageAssets);
                     expect(assetsView.pagingView.pagingFooter).toBeDefined();
@@ -433,7 +467,6 @@ function($, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
                 });
 
                 it('can move back a page using the previous page button', function() {
-                    var requests = AjaxHelpers.requests(this);
                     assetsView.pagingView.setPage(2);
                     AjaxHelpers.respondWithJson(requests, secondPageAssets);
                     expect(assetsView.pagingView.pagingFooter).toBeDefined();
@@ -446,7 +479,6 @@ function($, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
                 });
 
                 it('can set the current page using the page number input', function() {
-                    var requests = AjaxHelpers.requests(this);
                     assetsView.pagingView.setPage(1);
                     AjaxHelpers.respondWithJson(requests, firstPageAssets);
                     assetsView.pagingView.pagingFooter.$('#page-number-input').val('2');
diff --git a/cms/static/js/spec/views/pages/index_spec.js b/cms/static/js/spec/views/pages/index_spec.js
index 2c91d803dfea..2b76a169f3a4 100644
--- a/cms/static/js/spec/views/pages/index_spec.js
+++ b/cms/static/js/spec/views/pages/index_spec.js
@@ -1,8 +1,10 @@
 define(['jquery',
+    'sinon',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'common/js/spec_helpers/view_helpers', 'js/index',
     'common/js/components/utils/view_utils'],
-function($, AjaxHelpers, ViewHelpers, IndexUtils, ViewUtils) {
+function($, sinon, AjaxHelpers, ViewHelpers, IndexUtils, ViewUtils) {
+    var requests, xhrFactory;
     describe('Course listing page', function() {
         var mockIndexPageHTML = readFixtures('mock/mock-index-page.underscore');
 
@@ -20,18 +22,23 @@ function($, AjaxHelpers, ViewHelpers, IndexUtils, ViewUtils) {
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             ViewHelpers.installMockAnalytics();
             appendSetFixtures(mockIndexPageHTML);
             IndexUtils.onReady();
         });
 
         afterEach(function() {
+            requests.restore();
             ViewHelpers.removeMockAnalytics();
             delete window.source_course_key;
         });
 
         it('can dismiss notifications', function() {
-            var requests = AjaxHelpers.requests(this);
             var reloadSpy = spyOn(ViewUtils, 'reload');
             $('.dismiss-button').click();
             AjaxHelpers.expectJsonRequest(requests, 'DELETE', 'dummy_dismiss_url');
@@ -40,7 +47,6 @@ function($, AjaxHelpers, ViewHelpers, IndexUtils, ViewUtils) {
         });
 
         it('saves new courses', function() {
-            var requests = AjaxHelpers.requests(this);
             var redirectSpy = spyOn(ViewUtils, 'redirect');
             $('.new-course-button').click();
             AjaxHelpers.expectJsonRequest(requests, 'GET', '/organizations');
@@ -70,7 +76,6 @@ function($, AjaxHelpers, ViewHelpers, IndexUtils, ViewUtils) {
         });
 
         it('displays an error when saving fails', function() {
-            var requests = AjaxHelpers.requests(this);
             $('.new-course-button').click();
             AjaxHelpers.expectJsonRequest(requests, 'GET', '/organizations');
             AjaxHelpers.respondWithJson(requests, ['DemoX', 'DemoX2', 'DemoX3']);
@@ -87,7 +92,6 @@ function($, AjaxHelpers, ViewHelpers, IndexUtils, ViewUtils) {
         });
 
         it('saves new libraries', function() {
-            var requests = AjaxHelpers.requests(this);
             var redirectSpy = spyOn(ViewUtils, 'redirect');
             $('.new-library-button').click();
             fillInLibraryFields('DemoX', 'DM101', 'Demo library');
@@ -104,7 +108,6 @@ function($, AjaxHelpers, ViewHelpers, IndexUtils, ViewUtils) {
         });
 
         it('displays an error when a required field is blank', function() {
-            var requests = AjaxHelpers.requests(this);
             $('.new-library-button').click();
             var values = ['DemoX', 'DM101', 'Demo library'];
             // Try making each of these three values empty one at a time and ensure the form won't submit:
@@ -131,7 +134,6 @@ function($, AjaxHelpers, ViewHelpers, IndexUtils, ViewUtils) {
         });
 
         it('displays an error when saving a library fails', function() {
-            var requests = AjaxHelpers.requests(this);
             $('.new-library-button').click();
             fillInLibraryFields('DemoX', 'DM101', 'Demo library');
             $('.new-library-save').click();
diff --git a/cms/static/js/spec/views/settings/main_spec.js b/cms/static/js/spec/views/settings/main_spec.js
index 52ebad8707b8..43f95d584f05 100644
--- a/cms/static/js/spec/views/settings/main_spec.js
+++ b/cms/static/js/spec/views/settings/main_spec.js
@@ -1,9 +1,11 @@
 define([
-    'jquery', 'js/models/settings/course_details', 'js/views/settings/main',
+    'jquery', 'sinon', 'js/models/settings/course_details', 'js/views/settings/main',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/template_helpers'
-], function($, CourseDetailsModel, MainView, AjaxHelpers, TemplateHelpers) {
+], function($, sinon, CourseDetailsModel, MainView, AjaxHelpers, TemplateHelpers) {
     'use strict';
 
+    var requests, xhrFactory;
+
     var SELECTORS = {
         entrance_exam_min_score: '#entrance-exam-minimum-score-pct',
         entrance_exam_enabled_field: '#entrance-exam-enabled',
@@ -60,6 +62,11 @@ define([
             instructorInfoTpl = readFixtures('course-instructor-details.underscore');
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             TemplateHelpers.installTemplates(['course-settings-learning-fields', 'course-instructor-details'], true);
             appendSetFixtures(mockSettingsPage);
             appendSetFixtures(
@@ -84,6 +91,7 @@ define([
         });
 
         afterEach(function() {
+            requests.restore();
             // Clean up after the $.datepicker
             $('#start_date').datepicker('destroy');
             $('#due_date').datepicker('destroy');
@@ -91,8 +99,7 @@ define([
         });
 
         it('Changing the time field do not affect other time fields', function() {
-            var requests = AjaxHelpers.requests(this),
-                expectedJson = $.extend(true, {}, modelData, {
+            var expectedJson = $.extend(true, {}, modelData, {
                     // Expect to see changes just in `start_date` field.
                     start_date: '2014-10-05T22:00:00.000Z'
                 });
@@ -110,8 +117,7 @@ define([
 
         it('Selecting a course in pre-requisite drop down should save it as part of course details', function() {
             var pre_requisite_courses = ['test/CSS101/2012_T1'];
-            var requests = AjaxHelpers.requests(this),
-                expectedJson = $.extend(true, {}, modelData, {
+            var expectedJson = $.extend(true, {}, modelData, {
                     pre_requisite_courses: pre_requisite_courses
                 });
             this.view.$el.find('#pre-requisite-course')
@@ -168,8 +174,7 @@ define([
                 entrance_exam_min_score = this.view.$(SELECTORS.entrance_exam_min_score),
                 entrance_exam_enabled_field = this.view.$(SELECTORS.entrance_exam_enabled_field);
 
-            var requests = AjaxHelpers.requests(this),
-                expectedJson = $.extend(true, {}, modelData, {
+            var expectedJson = $.extend(true, {}, modelData, {
                     entrance_exam_enabled: entrance_exam_enabled,
                     entrance_exam_minimum_score_pct: entrance_exam_minimum_score_pct
                 });
@@ -190,7 +195,6 @@ define([
         });
 
         it('should save language as part of course details', function() {
-            var requests = AjaxHelpers.requests(this);
             var expectedJson = $.extend(true, {}, modelData, {
                 language: 'en'
             });
@@ -203,7 +207,6 @@ define([
         });
 
         it('should not error if about_page_editable is False', function() {
-            var requests = AjaxHelpers.requests(this);
             // if about_page_editable is false, there is no section.course_details
             $('.course_details').remove();
             expect(this.model.get('language')).toEqual('');
@@ -212,8 +215,7 @@ define([
         });
 
         it('should save title', function() {
-            var requests = AjaxHelpers.requests(this),
-                expectedJson = $.extend(true, {}, modelData, {
+            var expectedJson = $.extend(true, {}, modelData, {
                     title: 'course title'
                 });
 
@@ -228,8 +230,7 @@ define([
         });
 
         it('should save subtitle', function() {
-            var requests = AjaxHelpers.requests(this),
-                expectedJson = $.extend(true, {}, modelData, {
+            var expectedJson = $.extend(true, {}, modelData, {
                     subtitle: 'course subtitle'
                 });
 
@@ -244,8 +245,7 @@ define([
         });
 
         it('should save duration', function() {
-            var requests = AjaxHelpers.requests(this),
-                expectedJson = $.extend(true, {}, modelData, {
+            var expectedJson = $.extend(true, {}, modelData, {
                     duration: '8 weeks'
                 });
 
@@ -260,8 +260,7 @@ define([
         });
 
         it('should save description', function() {
-            var requests = AjaxHelpers.requests(this),
-                expectedJson = $.extend(true, {}, modelData, {
+            var expectedJson = $.extend(true, {}, modelData, {
                     description: 'course description'
                 });
 
@@ -295,8 +294,7 @@ define([
 
         it('can save learning information', function() {
             expect(this.model.get('learning_info').length).toEqual(1);
-            var requests = AjaxHelpers.requests(this),
-                expectedJson = $.extend(true, {}, modelData, {
+            var expectedJson = $.extend(true, {}, modelData, {
                     learning_info: ['testing info']
                 });
 
@@ -327,8 +325,7 @@ define([
         });
 
         it('can save instructor information', function() {
-            var requests = AjaxHelpers.requests(this),
-                expectedJson = $.extend(true, {}, modelData, {
+            var expectedJson = $.extend(true, {}, modelData, {
                     instructor_info: {
                         instructors:
                         [{

From 2b4097ad9a3aed33973374317e94f949b8621954 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Wed, 4 Mar 2026 15:31:47 -0500
Subject: [PATCH 07/13] fix: refactor certificate_details and
 certificate_preview specs

Move fake XHR setup to describe-level beforeEach/afterEach.
Remove inline AjaxHelpers.requests(this) calls from it() bodies.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../spec/views/certificate_details_spec.js      | 14 +++++++++++---
 .../spec/views/certificate_preview_spec.js      | 17 ++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/cms/static/js/certificates/spec/views/certificate_details_spec.js b/cms/static/js/certificates/spec/views/certificate_details_spec.js
index b803bd0cbe76..ed93e3942f81 100644
--- a/cms/static/js/certificates/spec/views/certificate_details_spec.js
+++ b/cms/static/js/certificates/spec/views/certificate_details_spec.js
@@ -2,6 +2,7 @@
 
 define([
     'underscore',
+    'sinon',
     'js/models/course',
     'js/certificates/collections/certificates',
     'js/certificates/models/certificate',
@@ -14,10 +15,12 @@ define([
     'js/spec_helpers/validation_helpers',
     'js/certificates/spec/custom_matchers'
 ],
-function(_, Course, CertificatesCollection, CertificateModel, CertificateDetailsView, CertificatePreview,
+function(_, sinon, Course, CertificatesCollection, CertificateModel, CertificateDetailsView, CertificatePreview,
     Notification, AjaxHelpers, TemplateHelpers, ViewHelpers, ValidationHelpers, CustomMatchers) {
     'use strict';
 
+    var requests, xhrFactory;
+
     var SELECTORS = {
         detailsView: '.certificate-details',
         editView: '.certificate-edit',
@@ -58,6 +61,11 @@ function(_, Course, CertificatesCollection, CertificateModel, CertificateDetails
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             window.course = new Course({
                 id: '5',
                 name: 'Course Name',
@@ -108,6 +116,7 @@ function(_, Course, CertificatesCollection, CertificateModel, CertificateDetails
         });
 
         afterEach(function() {
+            requests.restore();
             delete window.course;
             delete window.certWebPreview;
             delete window.CMS.User;
@@ -228,8 +237,7 @@ function(_, Course, CertificatesCollection, CertificateModel, CertificateDetails
             });
 
             it('correctly persists changes made during in-line signatory editing', function() {
-                var requests = AjaxHelpers.requests(this),
-                    notificationSpy = ViewHelpers.createNotificationSpy();
+            var notificationSpy = ViewHelpers.createNotificationSpy();
 
                 this.view.$(SELECTORS.edit_signatory).click();
 
diff --git a/cms/static/js/certificates/spec/views/certificate_preview_spec.js b/cms/static/js/certificates/spec/views/certificate_preview_spec.js
index ed7f07895173..eccaf94c5326 100644
--- a/cms/static/js/certificates/spec/views/certificate_preview_spec.js
+++ b/cms/static/js/certificates/spec/views/certificate_preview_spec.js
@@ -3,15 +3,18 @@
 define([
     'underscore',
     'jquery',
+    'sinon',
     'js/models/course',
     'js/certificates/views/certificate_preview',
     'common/js/spec_helpers/template_helpers',
     'common/js/spec_helpers/view_helpers',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers'
 ],
-function(_, $, Course, CertificatePreview, TemplateHelpers, ViewHelpers, AjaxHelpers) {
+function(_, $, sinon, Course, CertificatePreview, TemplateHelpers, ViewHelpers, AjaxHelpers) {
     'use strict';
 
+    var requests, xhrFactory;
+
     var SELECTORS = {
         course_modes: '#course-modes',
         activate_certificate: '.activate-cert',
@@ -27,6 +30,11 @@ function(_, $, Course, CertificatePreview, TemplateHelpers, ViewHelpers, AjaxHel
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             window.course = new Course({
                 id: '5',
                 name: 'Course Name',
@@ -50,6 +58,7 @@ function(_, $, Course, CertificatePreview, TemplateHelpers, ViewHelpers, AjaxHel
         });
 
         afterEach(function() {
+            requests.restore();
             delete window.course;
             delete window.CMS.User;
         });
@@ -84,8 +93,7 @@ function(_, $, Course, CertificatePreview, TemplateHelpers, ViewHelpers, AjaxHel
             });
 
             it('certificate deactivation works fine', function() {
-                var requests = AjaxHelpers.requests(this),
-                    notificationSpy = ViewHelpers.createNotificationSpy();
+            var notificationSpy = ViewHelpers.createNotificationSpy();
                 this.view.$(SELECTORS.activate_certificate).click();
                 AjaxHelpers.expectJsonRequest(requests, 'POST', '/certificates/activation/' + window.course.id, {
                     is_active: false
@@ -94,8 +102,7 @@ function(_, $, Course, CertificatePreview, TemplateHelpers, ViewHelpers, AjaxHel
             });
 
             it('certificate activation works fine', function() {
-                var requests = AjaxHelpers.requests(this),
-                    notificationSpy = ViewHelpers.createNotificationSpy();
+            var notificationSpy = ViewHelpers.createNotificationSpy();
                 this.view.is_active = false;
                 this.view.$(SELECTORS.activate_certificate).click();
                 AjaxHelpers.expectJsonRequest(requests, 'POST', '/certificates/activation/' + window.course.id, {

From 5c6815be59ef259888d3ff539998bcaf0a185d6e Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Wed, 4 Mar 2026 15:48:37 -0500
Subject: [PATCH 08/13] fix: refactor main_spec and section_spec from
 AjaxHelpers.server() pattern

AjaxHelpers.server() calls afterEach() internally, which throws in
jasmine 2.99.x when called from inside an it() body.

Replace AjaxHelpers.server([...]) in each it() with:
- sinon.fakeServer.create() in beforeEach
- server.respondWith([...]) per test
- server.restore() in afterEach

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 cms/static/cms/js/spec/main_spec.js       | 26 ++++++-----------------
 cms/static/js/spec/models/section_spec.js | 14 +++++++-----
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/cms/static/cms/js/spec/main_spec.js b/cms/static/cms/js/spec/main_spec.js
index 8b9f27d0bd73..ec92021fab54 100644
--- a/cms/static/cms/js/spec/main_spec.js
+++ b/cms/static/cms/js/spec/main_spec.js
@@ -4,8 +4,8 @@
     'use strict';
 
     // eslint-disable-next-line global-require
-    require(['jquery', 'backbone', 'cms/js/main', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'jquery.cookie'],
-        function($, Backbone, main, AjaxHelpers) {
+    require(['jquery', 'backbone', 'sinon', 'cms/js/main', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'jquery.cookie'],
+        function($, Backbone, sinon, main, AjaxHelpers) {
             describe('CMS', function() {
                 it('should initialize URL', function() {
                     expect(window.CMS.URL).toBeDefined();
@@ -34,21 +34,17 @@
             });
             describe('AJAX Errors', function() {
                 var server;
-                server = null;
                 beforeEach(function() {
+                    server = sinon.fakeServer.create();
                     appendSetFixtures(sandbox({
                         id: 'page-notification'
                     }));
                 });
                 afterEach(function() {
-                    return server && server.restore();
+                    server.restore();
                 });
                 it('successful AJAX request does not pop an error notification', function() {
-                    server = AjaxHelpers.server([
-                        200, {
-                            'Content-Type': 'application/json'
-                        }, '{}'
-                    ]);
+                    server.respondWith([200, {'Content-Type': 'application/json'}, '{}']);
                     expect($('#page-notification')).toBeEmpty();
                     $.ajax('/test');
                     expect($('#page-notification')).toBeEmpty();
@@ -56,22 +52,14 @@
                     expect($('#page-notification')).toBeEmpty();
                 });
                 it('AJAX request with error should pop an error notification', function() {
-                    server = AjaxHelpers.server([
-                        500, {
-                            'Content-Type': 'application/json'
-                        }, '{}'
-                    ]);
+                    server.respondWith([500, {'Content-Type': 'application/json'}, '{}']);
                     $.ajax('/test');
                     server.respond();
                     expect($('#page-notification')).not.toBeEmpty();
                     expect($('#page-notification')).toContainElement('div.wrapper-notification-error');
                 });
                 it('can override AJAX request with error so it does not pop an error notification', function() {
-                    server = AjaxHelpers.server([
-                        500, {
-                            'Content-Type': 'application/json'
-                        }, '{}'
-                    ]);
+                    server.respondWith([500, {'Content-Type': 'application/json'}, '{}']);
                     $.ajax({
                         url: '/test',
                         notifyOnError: false
diff --git a/cms/static/js/spec/models/section_spec.js b/cms/static/js/spec/models/section_spec.js
index c0c89c2d15d8..d5e9350bc355 100644
--- a/cms/static/js/spec/models/section_spec.js
+++ b/cms/static/js/spec/models/section_spec.js
@@ -3,7 +3,7 @@
  * DS102: Remove unnecessary code created because of implicit returns
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-define(["js/models/section", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "js/utils/module"], (Section, AjaxHelpers, ModuleUtils) =>
+define(["js/models/section", "sinon", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "js/utils/module"], (Section, sinon, AjaxHelpers, ModuleUtils) =>
     describe("Section", function() {
         describe("basic", function() {
             beforeEach(function() {
@@ -36,7 +36,9 @@ define(["js/models/section", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers"
         });
 
         describe("XHR", function() {
+            var server;
             beforeEach(function() {
+                server = sinon.fakeServer.create();
                 spyOn(Section.prototype, 'showNotification');
                 spyOn(Section.prototype, 'hideNotification');
                 this.model = new Section({
@@ -45,9 +47,12 @@ define(["js/models/section", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers"
                 });
             });
 
-            it("show/hide a notification when it saves to the server", function() {
-                const server = AjaxHelpers.server([200, {"Content-Type": "application/json"}, "{}"]);
+            afterEach(function() {
+                server.restore();
+            });
 
+            it("show/hide a notification when it saves to the server", function() {
+                server.respondWith([200, {"Content-Type": "application/json"}, "{}"]);
                 this.model.save();
                 expect(Section.prototype.showNotification).toHaveBeenCalled();
                 server.respond();
@@ -56,8 +61,7 @@ define(["js/models/section", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers"
 
             it("don't hide notification when saving fails", function() {
                 // this is handled by the global AJAX error handler
-                const server = AjaxHelpers.server([500, {"Content-Type": "application/json"}, "{}"]);
-
+                server.respondWith([500, {"Content-Type": "application/json"}, "{}"]);
                 this.model.save();
                 server.respond();
                 expect(Section.prototype.hideNotification).not.toHaveBeenCalled();

From 1059a0743e2a0487d4b9f6b70a64e79130e9530d Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Thu, 5 Mar 2026 08:32:30 -0500
Subject: [PATCH 09/13] fix: refactor remaining CMS specs to not call
 AjaxHelpers inside it()

Files fixed:
- upload_spec.js: add XHR setup to describe("Uploads") lifecycle hooks
- xblock_spec.js: add XHR setup to describe('XBlockView') lifecycle hooks;
  fix postXBlockRequest(AjaxHelpers.requests(this), []) inline call
- unit_outline_spec.js: remove AjaxHelpers.requests(test) from
  createUnitOutlineView() helper; use describe-level lifecycle hooks
- move_xblock_modal_spec.js: add XHR setup to describe lifecycle hooks
- course_rerun_spec.js: add XHR setup to describe lifecycle hooks
- library_users_spec.js: add XHR setup to both describe blocks
- drag_and_drop_spec.js: add XHR setup to describe('AJAX') lifecycle hooks
  (sinon already imported)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../js/spec/utils/drag_and_drop_spec.js       | 13 ++++++---
 .../js/spec/views/group_configuration_spec.js |  2 ++
 .../views/modals/move_xblock_modal_spec.js    | 17 +++++++----
 .../js/spec/views/pages/course_rerun_spec.js  | 14 ++++++----
 .../js/spec/views/pages/library_users_spec.js | 23 ++++++++++-----
 cms/static/js/spec/views/unit_outline_spec.js | 17 ++++++++---
 cms/static/js/spec/views/upload_spec.js       | 10 +++++--
 cms/static/js/spec/views/xblock_spec.js       | 28 +++++++++++--------
 8 files changed, 83 insertions(+), 41 deletions(-)

diff --git a/cms/static/js/spec/utils/drag_and_drop_spec.js b/cms/static/js/spec/utils/drag_and_drop_spec.js
index 36fa061a0e65..166d33e8c046 100644
--- a/cms/static/js/spec/utils/drag_and_drop_spec.js
+++ b/cms/static/js/spec/utils/drag_and_drop_spec.js
@@ -303,18 +303,24 @@ function(sinon, ContentDragger, Notification, AjaxHelpers, $, _) {
             });
         });
         describe('AJAX', function() {
+            var requests, xhrFactory;
             beforeEach(function() {
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
                 this.savingSpies = jasmine.stealth.spyOnConstructor(Notification, 'Mini', ['show', 'hide']);
                 this.savingSpies.show.and.returnValue(this.savingSpies);
                 this.clock = sinon.useFakeTimers();
             });
             afterEach(function() {
+                requests.restore();
                 this.clock.restore();
                 jasmine.stealth.clearSpies();
             });
             it('should send an update on reorder from one parent to another', function() {
-                var requests, request, savingOptions;
-                requests = AjaxHelpers.requests(this);
+                var request, savingOptions;
                 ContentDragger.dragState.dropDestination = $('#unit-4');
                 ContentDragger.dragState.attachMethod = 'after';
                 ContentDragger.dragState.parentList = $('#subsection-2');
@@ -345,8 +351,7 @@ function(sinon, ContentDragger, Notification, AjaxHelpers, $, _) {
                 expect($('#subsection-2').data('refresh')).toHaveBeenCalled();
             });
             it('should send an update on reorder within the same parent', function() {
-                var requests = AjaxHelpers.requests(this),
-                    request;
+                var request;
                 ContentDragger.dragState.dropDestination = $('#unit-2');
                 ContentDragger.dragState.attachMethod = 'after';
                 ContentDragger.dragState.parentList = $('#subsection-1');
diff --git a/cms/static/js/spec/views/group_configuration_spec.js b/cms/static/js/spec/views/group_configuration_spec.js
index c13b86aadbbc..d05be0f1515d 100644
--- a/cms/static/js/spec/views/group_configuration_spec.js
+++ b/cms/static/js/spec/views/group_configuration_spec.js
@@ -1074,4 +1074,6 @@ define([
             );
         });
     });
+
+    }); // end describe('Group Configurations')
 });
diff --git a/cms/static/js/spec/views/modals/move_xblock_modal_spec.js b/cms/static/js/spec/views/modals/move_xblock_modal_spec.js
index 747fd7875b51..b78d15807f91 100644
--- a/cms/static/js/spec/views/modals/move_xblock_modal_spec.js
+++ b/cms/static/js/spec/views/modals/move_xblock_modal_spec.js
@@ -1,10 +1,11 @@
-define(['jquery', 'underscore', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
+define(['jquery', 'underscore', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'common/js/spec_helpers/template_helpers', 'common/js/spec_helpers/view_helpers',
     'js/views/modals/move_xblock_modal', 'js/models/xblock_info'],
-function($, _, AjaxHelpers, TemplateHelpers, ViewHelpers, MoveXBlockModal, XBlockInfo) {
+function($, _, sinon, AjaxHelpers, TemplateHelpers, ViewHelpers, MoveXBlockModal, XBlockInfo) {
     'use strict';
 
     describe('MoveXBlockModal', function() {
+        var requests, xhrFactory;
         var modal,
             showModal,
             DISPLAY_NAME = 'HTML 101',
@@ -32,6 +33,11 @@ function($, _, AjaxHelpers, TemplateHelpers, ViewHelpers, MoveXBlockModal, XBloc
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             setFixtures('<div id="page-notification"></div><div id="reader-feedback"></div>');
             TemplateHelpers.installTemplates([
                 'basic-modal',
@@ -41,6 +47,7 @@ function($, _, AjaxHelpers, TemplateHelpers, ViewHelpers, MoveXBlockModal, XBloc
         });
 
         afterEach(function() {
+            requests.restore();
             modal.hide();
         });
 
@@ -56,8 +63,7 @@ function($, _, AjaxHelpers, TemplateHelpers, ViewHelpers, MoveXBlockModal, XBloc
         });
 
         it('sends request to fetch course outline', function() {
-            var requests = AjaxHelpers.requests(this),
-                renderViewsSpy;
+            var renderViewsSpy;
             showModal();
             expect(modal.$el.find('.ui-loading.is-hidden')).not.toExist();
             renderViewsSpy = spyOn(modal, 'renderViews');
@@ -71,8 +77,7 @@ function($, _, AjaxHelpers, TemplateHelpers, ViewHelpers, MoveXBlockModal, XBloc
         });
 
         it('shows error notification when fetch course outline request fails', function() {
-            var requests = AjaxHelpers.requests(this),
-                notificationSpy = ViewHelpers.createNotificationSpy('Error');
+            var notificationSpy = ViewHelpers.createNotificationSpy('Error');
             showModal();
             AjaxHelpers.respondWithError(requests);
             ViewHelpers.verifyNotificationShowing(notificationSpy, "Studio's having trouble saving your work");
diff --git a/cms/static/js/spec/views/pages/course_rerun_spec.js b/cms/static/js/spec/views/pages/course_rerun_spec.js
index 806fc3e2e329..d15c79a7b638 100644
--- a/cms/static/js/spec/views/pages/course_rerun_spec.js
+++ b/cms/static/js/spec/views/pages/course_rerun_spec.js
@@ -1,7 +1,8 @@
-define(['jquery', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/view_helpers',
+define(['jquery', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/view_helpers',
     'js/views/course_rerun', 'js/views/utils/create_course_utils', 'common/js/components/utils/view_utils',
     'jquery.simulate'],
-function($, AjaxHelpers, ViewHelpers, CourseRerunUtils, CreateCourseUtilsFactory, ViewUtils) {
+function($, sinon, AjaxHelpers, ViewHelpers, CourseRerunUtils, CreateCourseUtilsFactory, ViewUtils) {
+    var requests, xhrFactory;
     describe('Create course rerun page', function() {
         var selectors = {
                 org: '.rerun-course-org',
@@ -37,6 +38,11 @@ function($, AjaxHelpers, ViewHelpers, CourseRerunUtils, CreateCourseUtilsFactory
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             ViewHelpers.installMockAnalytics();
             window.source_course_key = 'test_course_key';
             appendSetFixtures(mockCreateCourseRerunHTML);
@@ -44,6 +50,7 @@ function($, AjaxHelpers, ViewHelpers, CourseRerunUtils, CreateCourseUtilsFactory
         });
 
         afterEach(function() {
+            requests.restore();
             ViewHelpers.removeMockAnalytics();
             delete window.source_course_key;
         });
@@ -157,7 +164,6 @@ function($, AjaxHelpers, ViewHelpers, CourseRerunUtils, CreateCourseUtilsFactory
         });
 
         it('saves course reruns', function() {
-            var requests = AjaxHelpers.requests(this);
             var redirectSpy = spyOn(ViewUtils, 'redirect');
             fillInFields('DemoX', 'DM101', '2014', 'Demo course');
             $(selectors.save).click();
@@ -178,7 +184,6 @@ function($, AjaxHelpers, ViewHelpers, CourseRerunUtils, CreateCourseUtilsFactory
         });
 
         it('displays an error when saving fails', function() {
-            var requests = AjaxHelpers.requests(this);
             fillInFields('DemoX', 'DM101', '2014', 'Demo course');
             $(selectors.save).click();
             AjaxHelpers.respondWithJson(requests, {
@@ -191,7 +196,6 @@ function($, AjaxHelpers, ViewHelpers, CourseRerunUtils, CreateCourseUtilsFactory
         });
 
         it('does not save if there are validation errors', function() {
-            var requests = AjaxHelpers.requests(this);
             fillInFields('DemoX', 'DM101', '', 'Demo course');
             $(selectors.save).click();
             AjaxHelpers.expectNoRequests(requests);
diff --git a/cms/static/js/spec/views/pages/library_users_spec.js b/cms/static/js/spec/views/pages/library_users_spec.js
index 4d8f8463eb77..08dd6065eb9c 100644
--- a/cms/static/js/spec/views/pages/library_users_spec.js
+++ b/cms/static/js/spec/views/pages/library_users_spec.js
@@ -1,10 +1,12 @@
 define([
-    'jquery', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/view_helpers',
+    'jquery', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/view_helpers',
     'js/factories/manage_users_lib', 'common/js/components/utils/view_utils'
 ],
-function($, AjaxHelpers, ViewHelpers, ManageUsersFactory, ViewUtils) {
+function($, sinon, AjaxHelpers, ViewHelpers, ManageUsersFactory, ViewUtils) {
     'use strict';
 
+    var requests, xhrFactory;
+
     describe('Library Instructor Access Page', function() {
         var changeRoleUrl = 'dummy_change_role_url/@@EMAIL@@';
         var team_member_fixture = readFixtures('team-member.underscore');
@@ -24,6 +26,11 @@ function($, AjaxHelpers, ViewHelpers, ManageUsersFactory, ViewUtils) {
             var mockHTML = readFixtures('mock/mock-manage-users-lib.underscore');
 
             beforeEach(function(done) {
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
                 ViewHelpers.installMockAnalytics();
                 setFixtures(mockHTML);
                 appendSetFixtures($('<script>', {id: 'team-member-tpl', type: 'text/template'}).text(team_member_fixture));
@@ -51,12 +58,12 @@ function($, AjaxHelpers, ViewHelpers, ManageUsersFactory, ViewUtils) {
             });
 
             afterEach(function() {
+                requests.restore();
                 ViewHelpers.removeMockAnalytics();
             });
 
             it('can give a user permission to use the library', function() {
                 var email = 'other@example.com';
-                var requests = AjaxHelpers.requests(this);
                 var reloadSpy = spyOn(ViewUtils, 'reload');
                 $('.create-user-button').click();
                 expect($('.wrapper-create-user')).toHaveClass('is-shown');
@@ -69,7 +76,6 @@ function($, AjaxHelpers, ViewHelpers, ManageUsersFactory, ViewUtils) {
 
             it('can promote user', function() {
                 var email = 'staff@example.com';
-                var requests = AjaxHelpers.requests(this);
                 var reloadSpy = spyOn(ViewUtils, 'reload');
                 setRole('staff@example.com', 'staff');
                 AjaxHelpers.expectJsonRequest(requests, 'POST', getUrl(email), {role: 'staff'});
@@ -84,7 +90,6 @@ function($, AjaxHelpers, ViewHelpers, ManageUsersFactory, ViewUtils) {
             });
 
             it('displays an error when the required field is blank', function() {
-                var requests = AjaxHelpers.requests(this);
                 $('.create-user-button').click();
                 $('.user-email-input').val('');
                 var errorPromptSelector = '.wrapper-prompt.is-shown .prompt.error';
@@ -96,7 +101,6 @@ function($, AjaxHelpers, ViewHelpers, ManageUsersFactory, ViewUtils) {
             });
 
             it('displays an error when the user has already been added', function() {
-                var requests = AjaxHelpers.requests(this);
                 var promptSpy = ViewHelpers.createPromptSpy();
                 $('.create-user-button').click();
                 $('.user-email-input').val('honor@example.com');
@@ -106,7 +110,6 @@ function($, AjaxHelpers, ViewHelpers, ManageUsersFactory, ViewUtils) {
             });
 
             it("can remove a user's permission to access the library", function() {
-                var requests = AjaxHelpers.requests(this);
                 var promptSpy = ViewHelpers.createPromptSpy();
                 var reloadSpy = spyOn(ViewUtils, 'reload');
                 var email = 'honor@example.com';
@@ -124,6 +127,11 @@ function($, AjaxHelpers, ViewHelpers, ManageUsersFactory, ViewUtils) {
             var mockHTML = readFixtures('mock/mock-manage-users-lib-ro.underscore');
 
             beforeEach(function() {
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
                 ViewHelpers.installMockAnalytics();
                 setFixtures(mockHTML);
                 appendSetFixtures($('<script>', {id: 'team-member-tpl', type: 'text/template'}).text(team_member_fixture));
@@ -147,6 +155,7 @@ function($, AjaxHelpers, ViewHelpers, ManageUsersFactory, ViewUtils) {
             });
 
             afterEach(function() {
+                requests.restore();
                 ViewHelpers.removeMockAnalytics();
             });
 
diff --git a/cms/static/js/spec/views/unit_outline_spec.js b/cms/static/js/spec/views/unit_outline_spec.js
index c8df5a0b566f..99eb7d5da399 100644
--- a/cms/static/js/spec/views/unit_outline_spec.js
+++ b/cms/static/js/spec/views/unit_outline_spec.js
@@ -1,16 +1,19 @@
-define(['jquery', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/template_helpers',
+define(['jquery', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/template_helpers',
     'common/js/spec_helpers/view_helpers', 'common/js/components/utils/view_utils', 'js/models/course',
     'js/views/unit_outline', 'js/models/xblock_info'],
-function($, AjaxHelpers, TemplateHelpers, ViewHelpers, ViewUtils,
+function($, sinon, AjaxHelpers, TemplateHelpers, ViewHelpers, ViewUtils,
     Course, UnitOutlineView, XBlockInfo) {
     'use strict';
 
     describe('UnitOutlineView', function() {
+        // Preload before beforeEach installs fake XHR, so readFixtures uses real XHR
+        // and the result is cached. See group_configuration_spec.js for full explanation.
+        readFixtures('unit-outline.underscore');
+
         var createUnitOutlineView, createMockXBlockInfo,
-            requests, model, unitOutlineView;
+            requests, xhrFactory, model, unitOutlineView;
 
         createUnitOutlineView = function(test, unitJSON, createOnly) {
-            requests = AjaxHelpers.requests(test);
             model = new XBlockInfo(unitJSON, {parse: true});
             unitOutlineView = new UnitOutlineView({
                 model: model,
@@ -74,6 +77,11 @@ function($, AjaxHelpers, TemplateHelpers, ViewHelpers, ViewUtils,
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             window.course = new Course({
                 id: '5',
                 name: 'Course Name',
@@ -89,6 +97,7 @@ function($, AjaxHelpers, TemplateHelpers, ViewHelpers, ViewUtils,
         });
 
         afterEach(function() {
+            requests.restore();
             delete window.course;
             ViewHelpers.removeMockAnalytics();
         });
diff --git a/cms/static/js/spec/views/upload_spec.js b/cms/static/js/spec/views/upload_spec.js
index 8e0a1af83a91..51f193d9e7b5 100644
--- a/cms/static/js/spec/views/upload_spec.js
+++ b/cms/static/js/spec/views/upload_spec.js
@@ -117,17 +117,23 @@ define(["underscore", "sinon", "js/models/uploads", "js/views/uploads",
             });
 
             describe("Uploads", function() {
+                var requests, xhrFactory;
                 beforeEach(function() {
+                    xhrFactory = sinon.useFakeXMLHttpRequest();
+                    requests = [];
+                    requests.currentIndex = 0;
+                    requests.restore = function() { xhrFactory.restore(); };
+                    xhrFactory.onCreate = function(req) { requests.push(req); };
                     this.clock = sinon.useFakeTimers();
                 });
 
                 afterEach(function() {
+                    requests.restore();
                     modal_helpers.cancelModalIfShowing();
                     this.clock.restore();
                 });
 
                 it("can upload correctly", function() {
-                    const requests = AjaxHelpers.requests(this);
                     const view = createTestView(this);
                     view.render();
                     view.upload();
@@ -143,7 +149,6 @@ define(["underscore", "sinon", "js/models/uploads", "js/views/uploads",
                 });
 
                 it("can handle upload errors", function() {
-                    const requests = AjaxHelpers.requests(this);
                     const view = createTestView(this);
                     view.render();
                     view.upload();
@@ -153,7 +158,6 @@ define(["underscore", "sinon", "js/models/uploads", "js/views/uploads",
                 });
 
                 it("removes itself after two seconds on successful upload", function() {
-                    const requests = AjaxHelpers.requests(this);
                     const view = createTestView(this);
                     view.render();
                     view.upload();
diff --git a/cms/static/js/spec/views/xblock_spec.js b/cms/static/js/spec/views/xblock_spec.js
index 52060cd470c6..41787abbee95 100644
--- a/cms/static/js/spec/views/xblock_spec.js
+++ b/cms/static/js/spec/views/xblock_spec.js
@@ -1,12 +1,18 @@
-define(['jquery', 'URI', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/components/utils/view_utils',
+define(['jquery', 'URI', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/components/utils/view_utils',
     'js/views/xblock', 'js/models/xblock_info', 'xmodule', 'cms/js/main', 'xblock/cms.runtime.v1'],
-function($, URI, AjaxHelpers, ViewUtils, XBlockView, XBlockInfo) {
+function($, URI, sinon, AjaxHelpers, ViewUtils, XBlockView, XBlockInfo) {
     'use strict';
 
+    var requests, xhrFactory;
     describe('XBlockView', function() {
         var model, xblockView, mockXBlockHtml;
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             model = new XBlockInfo({
                 id: 'testCourse/branch/draft/block/verticalFFF',
                 display_name: 'Test Unit',
@@ -17,10 +23,13 @@ function($, URI, AjaxHelpers, ViewUtils, XBlockView, XBlockInfo) {
             });
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         mockXBlockHtml = readFixtures('mock/mock-xblock.underscore');
 
         it('can render a nested xblock', function() {
-            var requests = AjaxHelpers.requests(this);
             xblockView.render();
             AjaxHelpers.respondWithJson(requests, {
                 html: mockXBlockHtml,
@@ -53,13 +62,11 @@ function($, URI, AjaxHelpers, ViewUtils, XBlockView, XBlockInfo) {
             };
 
             it('can render an xblock with no CSS or JavaScript', function() {
-                var requests = AjaxHelpers.requests(this);
                 postXBlockRequest(requests, []);
             });
 
             it('can render an xblock with required CSS', function() {
-                var requests = AjaxHelpers.requests(this),
-                    mockCssText = '// Just a comment',
+            var mockCssText = '// Just a comment',
                     mockCssUrl = 'mock.css',
                     headHtml;
                 postXBlockRequest(requests, [
@@ -72,7 +79,6 @@ function($, URI, AjaxHelpers, ViewUtils, XBlockView, XBlockInfo) {
             });
 
             it('can render an xblock with required JavaScript', function() {
-                var requests = AjaxHelpers.requests(this);
                 postXBlockRequest(requests, [
                     ['xblock_spec_hash3', {
                         mimetype: 'application/javascript', kind: 'text', data: 'window.test = 100;'
@@ -82,8 +88,7 @@ function($, URI, AjaxHelpers, ViewUtils, XBlockView, XBlockInfo) {
             });
 
             it('can render an xblock with required HTML', function() {
-                var requests = AjaxHelpers.requests(this),
-                    mockHeadTag = '<title>Test Title</title>';
+            var mockHeadTag = '<title>Test Title</title>';
                 postXBlockRequest(requests, [
                     ['xblock_spec_hash4', {mimetype: 'text/html', placement: 'head', data: mockHeadTag}]
                 ]);
@@ -91,8 +96,7 @@ function($, URI, AjaxHelpers, ViewUtils, XBlockView, XBlockInfo) {
             });
 
             it('aborts rendering when a dependent script fails to load', function() {
-                var requests = AjaxHelpers.requests(this),
-                    missingJavaScriptUrl = 'no_such_file.js',
+            var missingJavaScriptUrl = 'no_such_file.js',
                     promise;
                 spyOn(ViewUtils, 'loadJavaScript').and.returnValue($.Deferred().reject().promise());
                 promise = postXBlockRequest(requests, [
@@ -106,7 +110,7 @@ function($, URI, AjaxHelpers, ViewUtils, XBlockView, XBlockInfo) {
             it('Triggers an event to the runtime when a notification-action-button is clicked', function() {
                 var notifySpy = spyOn(xblockView, 'notifyRuntime').and.callThrough();
 
-                postXBlockRequest(AjaxHelpers.requests(this), []);
+                postXBlockRequest(requests, []);
                 xblockView.$el.find('.notification-action-button').click();
                 expect(notifySpy).toHaveBeenCalledWith('add-missing-groups', model.get('id'));
             });

From 0da99c29b4588aaa1a6d0c7fa3ad0b52add635fc Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Thu, 5 Mar 2026 09:28:31 -0500
Subject: [PATCH 10/13] fix: refactor additional CMS specs away from
 AjaxHelpers.requests()

Jasmine 2.99.x added ensureIsNotNested() which throws when afterEach()
is called from within a running spec. AjaxHelpers.requests() calls
afterEach() internally, so it cannot be used from it() bodies or helper
functions that are called from it() bodies.

Files fixed:
- xblock_editor_spec.js (ES6 imports)
- modals/edit_xblock_spec.js (15 calls in it() bodies)
- xblock_string_field_editor_spec.js (calls in it() and helper)
- container_spec.js (init() helper returned requests)
- move_xblock_spec.js (6 calls in it() bodies)
- pages/container_spec.js (renderContainerPage helper)
- pages/course_outline_spec.js (createCourseOutlinePage helper)
- pages/container_subviews_spec.js (called from beforeEach)
- assets_squire_spec.js (factory functions inside async beforeEach)

Pattern: move sinon.useFakeXMLHttpRequest() setup into describe-level
beforeEach/afterEach; keep AjaxHelpers utility functions unchanged.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../js/spec/views/assets_squire_spec.js       | 99 ++++++++++---------
 cms/static/js/spec/views/container_spec.js    | 27 ++---
 .../js/spec/views/modals/edit_xblock_spec.js  | 64 ++++++------
 cms/static/js/spec/views/move_xblock_spec.js  | 25 ++---
 .../js/spec/views/pages/container_spec.js     | 11 ++-
 .../views/pages/container_subviews_spec.js    | 10 +-
 .../spec/views/pages/course_outline_spec.js   | 10 +-
 .../js/spec/views/xblock_editor_spec.js       | 20 ++--
 .../views/xblock_string_field_editor_spec.js  | 24 +++--
 9 files changed, 160 insertions(+), 130 deletions(-)

diff --git a/cms/static/js/spec/views/assets_squire_spec.js b/cms/static/js/spec/views/assets_squire_spec.js
index 38abf8b0407c..1b92fd1ef6e5 100644
--- a/cms/static/js/spec/views/assets_squire_spec.js
+++ b/cms/static/js/spec/views/assets_squire_spec.js
@@ -1,10 +1,24 @@
-define(["jquery", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "squire"],
-function($, AjaxHelpers, Squire) {
+define(["jquery", "sinon", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "squire"],
+function($, sinon, AjaxHelpers, Squire) {
 
     const assetLibraryTpl = readFixtures('asset-library.underscore');
     const assetTpl = readFixtures('asset.underscore');
 
     describe("Asset view", function() {
+        var requests, xhrFactory;
+
+        beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
+        });
+
+        afterEach(function() {
+            requests.restore();
+        });
+
         beforeEach(function(done) {
             setFixtures($("<script>", {id: "asset-tpl", type: "text/template"}).text(assetTpl));
             appendSetFixtures(sandbox({id: "page-prompt"}));
@@ -46,10 +60,9 @@ function($, AjaxHelpers, Squire) {
 
                     this.collection = new AssetCollection([this.model]);
                     this.collection.url = "assets-url";
-                    this.createAssetView = test => {
+                    this.createAssetView = () => {
                         const view = new AssetView({model: this.model});
-                        const requests = test ? AjaxHelpers["requests"](test) : null;
-                        return {view, requests};
+                        return {view};
                     };
                     return done();
             });
@@ -62,15 +75,13 @@ function($, AjaxHelpers, Squire) {
 
         describe("Basic", function() {
             it("should render properly", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetView());
+                this.view = this.createAssetView().view;
                 this.view.render();
                 expect(this.view.$el).toContainText("test asset");
             });
 
             it("should pop a delete confirmation when the delete button is clicked", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetView());
+                this.view = this.createAssetView().view;
                 this.view.render().$(".remove-asset-button").click();
                 expect(this.promptSpies.constructor).toHaveBeenCalled();
                 const ctorOptions = this.promptSpies.constructor.calls.mostRecent().args[0];
@@ -83,8 +94,7 @@ function($, AjaxHelpers, Squire) {
 
         describe("AJAX", function() {
             it("should destroy itself on confirmation", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetView(this));
+                this.view = this.createAssetView().view;
 
                 this.view.render().$(".remove-asset-button").click();
                 const ctorOptions = this.promptSpies.constructor.calls.mostRecent().args[0];
@@ -105,8 +115,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("should not destroy itself if server errors", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetView(this));
+                this.view = this.createAssetView().view;
 
                 this.view.render().$(".remove-asset-button").click();
                 const ctorOptions = this.promptSpies.constructor.calls.mostRecent().args[0];
@@ -121,8 +130,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("should lock the asset on confirmation", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetView(this));
+                this.view = this.createAssetView().view;
 
                 this.view.render().$(".lock-checkbox").click();
                 // AJAX request has been sent, but not yet returned
@@ -140,8 +148,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("should not lock the asset if server errors", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetView(this));
+                this.view = this.createAssetView().view;
 
                 this.view.render().$(".lock-checkbox").click();
                 // return an error response
@@ -154,6 +161,16 @@ function($, AjaxHelpers, Squire) {
     });
 
     describe("Assets view", function() {
+        var requests, xhrFactory;
+
+        beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
+        });
+
         beforeEach(function(done) {
             setFixtures($("<script>", {id: "asset-library-tpl", type: "text/template"}).text(assetLibraryTpl));
             appendSetFixtures($("<script>", {id: "asset-tpl", type: "text/template"}).text(assetTpl));
@@ -202,14 +219,13 @@ function($, AjaxHelpers, Squire) {
                     this.AssetModel = AssetModel;
                     this.collection = new AssetCollection();
                     this.collection.url = "assets-url";
-                    this.createAssetsView = test => {
-                        const requests = AjaxHelpers.requests(test);
+                    this.createAssetsView = () => {
                         const view = new AssetsView({
                             collection: this.collection,
                             el: $('#asset_table_body')
                         });
                         view.render();
-                        return {view, requests};
+                        return {view};
                     };
                     return done();
             });
@@ -218,6 +234,7 @@ function($, AjaxHelpers, Squire) {
         });
 
         afterEach(function() {
+            requests.restore();
             delete window.analytics;
             delete window.course_location_analytics;
 
@@ -271,8 +288,7 @@ function($, AjaxHelpers, Squire) {
             const clickEvent = html_selector => $(html_selector).click();
 
             it("should show upload modal on clicking upload asset button", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 spyOn(this.view, "showUploadModal");
                 setup.call(this, requests);
                 expect(this.view.showUploadModal).not.toHaveBeenCalled();
@@ -281,8 +297,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("should show file selection menu on choose file button", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 spyOn(this.view, "showFileSelectionMenu");
                 setup.call(this, requests);
                 expect(this.view.showFileSelectionMenu).not.toHaveBeenCalled();
@@ -291,8 +306,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("should hide upload modal on clicking close button", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 spyOn(this.view, "hideModal");
                 setup.call(this, requests);
                 expect(this.view.hideModal).not.toHaveBeenCalled();
@@ -301,8 +315,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("should show a status indicator while loading", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 appendSetFixtures('<div class="ui-loading"/>');
                 expect($('.ui-loading').is(':visible')).toBe(true);
                 setup.call(this, requests);
@@ -310,8 +323,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("should hide the status indicator if an error occurs while loading", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 appendSetFixtures('<div class="ui-loading"/>');
                 expect($('.ui-loading').is(':visible')).toBe(true);
                 this.view.pagingView.setPage(1);
@@ -320,16 +332,14 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("should render both assets", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 setup.call(this, requests);
                 expect(this.view.$el).toContainText("test asset 1");
                 expect(this.view.$el).toContainText("test asset 2");
             });
 
             it("should remove the deleted asset from the view", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 AjaxHelpers.respondWithJson(requests, this.mockAssetsResponse);
                 setup.call(this, requests);
                 // Delete the 2nd asset with success from server.
@@ -341,8 +351,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("does not remove asset if deletion failed", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 setup.call(this, requests);
                 // Delete the 2nd asset, but mimic a failure from the server.
                 this.view.$(".remove-asset-button")[1].click();
@@ -353,8 +362,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("adds an asset if asset does not already exist", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 setup.call(this, requests);
                 addMockAsset.call(this, requests);
                 expect(this.view.$el).toContainText("new asset");
@@ -362,8 +370,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("does not add an asset if asset already exists", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 setup.call(this, requests);
                 spyOn(this.collection, "add").and.callThrough();
                 const model = this.collection.models[1];
@@ -380,16 +387,14 @@ function($, AjaxHelpers, Squire) {
             };
 
             it("should have the correct default sort order", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 setup.call(this, requests);
                 expect(this.view.pagingView.sortDisplayName()).toBe("Date Added");
                 expect(this.view.collection.sortDirection).toBe("desc");
             });
 
             it("should toggle the sort order when clicking on the currently sorted column", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 setup.call(this, requests);
                 expect(this.view.pagingView.sortDisplayName()).toBe("Date Added");
                 expect(this.view.collection.sortDirection).toBe("desc");
@@ -404,8 +409,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("should switch the sort order when clicking on a different column", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 setup.call(this, requests);
                 this.view.$("#js-asset-name-col").click();
                 AjaxHelpers.respondWithJson(requests, this.mockAssetsResponse);
@@ -418,8 +422,7 @@ function($, AjaxHelpers, Squire) {
             });
 
             it("should switch sort to most recent date added when a new asset is added", function() {
-                let requests;
-                ({view: this.view, requests} = this.createAssetsView(this));
+                this.view = this.createAssetsView().view;
                 setup.call(this, requests);
                 this.view.$("#js-asset-name-col").click();
                 AjaxHelpers.respondWithJson(requests, this.mockAssetsResponse);
diff --git a/cms/static/js/spec/views/container_spec.js b/cms/static/js/spec/views/container_spec.js
index f963353cc3ec..34ad84c5e24a 100644
--- a/cms/static/js/spec/views/container_spec.js
+++ b/cms/static/js/spec/views/container_spec.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import sinon from 'sinon';
 import AjaxHelpers from 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers';
 import EditHelpers from 'js/spec_helpers/edit_helpers';
 import ContainerView from 'js/views/container';
@@ -12,7 +13,7 @@ describe('Container View', () => {
     describe('Supports reordering components', () => {
         var model, containerView, mockContainerHTML, init, getComponent,
             getDragHandle, dragComponentVertically, dragComponentAbove,
-            verifyRequest, verifyNumReorderCalls, respondToRequest, notificationSpy,
+            verifyRequest, verifyNumReorderCalls, respondToRequest, notificationSpy, requests, xhrFactory,
 
             rootLocator = 'locator-container',
             containerTestUrl = '/xblock/' + rootLocator,
@@ -32,6 +33,11 @@ describe('Container View', () => {
         mockContainerHTML = readFixtures('templates/mock/mock-container-xblock.underscore');
 
         beforeEach(() => {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             EditHelpers.installMockXBlock();
             EditHelpers.installViewTemplates();
             appendSetFixtures('<div class="wrapper-xblock level-page studio-xblock-wrapper" data-locator="' + rootLocator + '"></div>');
@@ -50,12 +56,12 @@ describe('Container View', () => {
         });
 
         afterEach(() => {
+            requests.restore();
             EditHelpers.uninstallMockXBlock();
             containerView.remove();
         });
 
-        init = function(caller) {
-            var requests = AjaxHelpers.requests(caller);
+        init = function() {
             containerView.render();
 
             AjaxHelpers.respondWithJson(requests, {
@@ -76,7 +82,6 @@ describe('Container View', () => {
             // drag and drop fails as the elements on bunched on top of each other.
             $('.level-element').css('height', 230);
 
-            return requests;
         };
 
         getComponent = function(locator) {
@@ -132,7 +137,7 @@ describe('Container View', () => {
         };
 
         it('can reorder within a group', () => {
-            var requests = init(this);
+            init();
             // Drag the third component in Group A to be the first
             dragComponentAbove(groupAComponent3, groupAComponent1);
             respondToRequest(requests, 0, 200);
@@ -140,7 +145,7 @@ describe('Container View', () => {
         });
 
         it('can drag from one group to another', () => {
-            var requests = init(this);
+            init();
             // Drag the first component in Group B to the top of group A.
             dragComponentAbove(groupBComponent1, groupAComponent1);
 
@@ -154,7 +159,7 @@ describe('Container View', () => {
         });
 
         it('does not remove from old group if addition to new group fails', () => {
-            var requests = init(this);
+            init();
             // Drag the first component in Group B to the first group.
             dragComponentAbove(groupBComponent1, groupAComponent1);
             respondToRequest(requests, 0, 500);
@@ -166,7 +171,7 @@ describe('Container View', () => {
         });
 
         it('can swap group A and group B', () => {
-            var requests = init(this);
+            init();
             // Drag Group B before group A.
             dragComponentAbove(groupB, groupA);
             respondToRequest(requests, 0, 200);
@@ -175,8 +180,8 @@ describe('Container View', () => {
 
         describe('Shows a saving message', () => {
             it('hides saving message upon success', () => {
-                var requests, savingOptions;
-                requests = init(this);
+                var savingOptions;
+                init();
 
                 // Drag the first component in Group B to the first group.
                 dragComponentAbove(groupBComponent1, groupAComponent1);
@@ -188,7 +193,7 @@ describe('Container View', () => {
             });
 
             it('does not hide saving message if failure', () => {
-                var requests = init(this);
+                init();
 
                 // Drag the first component in Group B to the first group.
                 dragComponentAbove(groupBComponent1, groupAComponent1);
diff --git a/cms/static/js/spec/views/modals/edit_xblock_spec.js b/cms/static/js/spec/views/modals/edit_xblock_spec.js
index 06b4413784cb..d3055e8d5ea8 100644
--- a/cms/static/js/spec/views/modals/edit_xblock_spec.js
+++ b/cms/static/js/spec/views/modals/edit_xblock_spec.js
@@ -2,20 +2,26 @@
 
 import $ from 'jquery';
 import _ from 'underscore';
+import sinon from 'sinon';
 import AjaxHelpers from 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers';
 import EditHelpers from 'js/spec_helpers/edit_helpers';
 import EditXBlockModal from 'js/views/modals/edit_xblock';
 import XBlockInfo from 'js/models/xblock_info';
 
 describe('EditXBlockModal', function() {
-    var model, modal, showModal;
+    var model, modal, showModal, requests, xhrFactory;
 
-    showModal = function(requests, mockHtml, options) {
+    showModal = function(mockHtml, options) {
         var $xblockElement = $('.xblock');
         return EditHelpers.showEditModal(requests, $xblockElement, model, mockHtml, options);
     };
 
     beforeEach(function() {
+        xhrFactory = sinon.useFakeXMLHttpRequest();
+        requests = [];
+        requests.currentIndex = 0;
+        requests.restore = function() { xhrFactory.restore(); };
+        xhrFactory.onCreate = function(req) { requests.push(req); };
         EditHelpers.installEditTemplates();
         appendSetFixtures('<div class="xblock" data-locator="mock-xblock"></div>');
         model = new XBlockInfo({
@@ -26,6 +32,7 @@ describe('EditXBlockModal', function() {
     });
 
     afterEach(function() {
+        requests.restore();
         EditHelpers.cancelModalIfShowing();
     });
 
@@ -44,39 +51,34 @@ describe('EditXBlockModal', function() {
         });
 
         it('can show itself', function() {
-            var requests = AjaxHelpers.requests(this);
-            modal = showModal(requests, mockXBlockEditorHtml);
+            modal = showModal(mockXBlockEditorHtml);
             expect(EditHelpers.isShowingModal(modal)).toBeTruthy();
             EditHelpers.cancelModal(modal);
             expect(EditHelpers.isShowingModal(modal)).toBeFalsy();
         });
 
         it('does not show the "Save" button', function() {
-            var requests = AjaxHelpers.requests(this);
-            modal = showModal(requests, mockXBlockEditorHtml);
+            modal = showModal(mockXBlockEditorHtml);
             expect(modal.$('.action-save')).not.toBeVisible();
             expect(modal.$('.action-cancel').text()).toBe('Close');
         });
 
         it('shows the correct title', function() {
-            var requests = AjaxHelpers.requests(this);
-            modal = showModal(requests, mockXBlockEditorHtml);
+            modal = showModal(mockXBlockEditorHtml);
             expect(modal.$('.modal-window-title').text()).toBe('Editing: Component');
         });
 
         it('does not show any editor mode buttons', function() {
-            var requests = AjaxHelpers.requests(this);
-            modal = showModal(requests, mockXBlockEditorHtml);
+            modal = showModal(mockXBlockEditorHtml);
             expect(modal.$('.editor-modes a').length).toBe(0);
         });
 
         it('hides itself and refreshes after save notification', function() {
-            var requests = AjaxHelpers.requests(this),
-                refreshed = false,
+            var refreshed = false,
                 refresh = function() {
                     refreshed = true;
                 };
-            modal = showModal(requests, mockXBlockEditorHtml, {refresh: refresh});
+            modal = showModal(mockXBlockEditorHtml, {refresh: refresh});
             modal.editorView.notifyRuntime('save', {state: 'start'});
             modal.editorView.notifyRuntime('save', {state: 'end'});
             expect(EditHelpers.isShowingModal(modal)).toBeFalsy();
@@ -85,12 +87,11 @@ describe('EditXBlockModal', function() {
         });
 
         it('hides itself and does not refresh after cancel notification', function() {
-            var requests = AjaxHelpers.requests(this),
-                refreshed = false,
+            var refreshed = false,
                 refresh = function() {
                     refreshed = true;
                 };
-            modal = showModal(requests, mockXBlockEditorHtml, {refresh: refresh});
+            modal = showModal(mockXBlockEditorHtml, {refresh: refresh});
             modal.editorView.notifyRuntime('cancel');
             expect(EditHelpers.isShowingModal(modal)).toBeFalsy();
             expect(refreshed).toBeFalsy();
@@ -103,8 +104,7 @@ describe('EditXBlockModal', function() {
             mockCustomButtonsHtml = readFixtures('templates/mock/mock-xblock-editor-with-custom-buttons.underscore');
 
             it('hides the modal\'s button bar', function() {
-                var requests = AjaxHelpers.requests(this);
-                modal = showModal(requests, mockCustomButtonsHtml);
+                modal = showModal(mockCustomButtonsHtml);
                 expect(modal.$('.modal-actions')).toBeHidden();
             });
         });
@@ -124,24 +124,21 @@ describe('EditXBlockModal', function() {
         });
 
         it('can render itself', function() {
-            var requests = AjaxHelpers.requests(this);
-            modal = showModal(requests, mockXModuleEditorHtml);
+            modal = showModal(mockXModuleEditorHtml);
             expect(EditHelpers.isShowingModal(modal)).toBeTruthy();
             EditHelpers.cancelModal(modal);
             expect(EditHelpers.isShowingModal(modal)).toBeFalsy();
         });
 
         it('shows the correct title', function() {
-            var requests = AjaxHelpers.requests(this);
-            modal = showModal(requests, mockXModuleEditorHtml);
+            modal = showModal(mockXModuleEditorHtml);
             expect(modal.$('.modal-window-title span.modal-button-title').text()).toBe('Editing: Component');
         });
 
         it('shows the correct default buttons', function() {
-            var requests = AjaxHelpers.requests(this),
-                editorButton,
+            var editorButton,
                 settingsButton;
-            modal = showModal(requests, mockXModuleEditorHtml);
+            modal = showModal(mockXModuleEditorHtml);
             expect(modal.$('.editor-modes a').length).toBe(2);
             editorButton = modal.$('.editor-button');
             settingsButton = modal.$('.settings-button');
@@ -152,10 +149,9 @@ describe('EditXBlockModal', function() {
         });
 
         it('can switch tabs', function() {
-            var requests = AjaxHelpers.requests(this),
-                editorButton,
+            var editorButton,
                 settingsButton;
-            modal = showModal(requests, mockXModuleEditorHtml);
+            modal = showModal(mockXModuleEditorHtml);
             expect(modal.$('.editor-modes a').length).toBe(2);
             editorButton = modal.$('.editor-button');
             settingsButton = modal.$('.settings-button');
@@ -172,14 +168,12 @@ describe('EditXBlockModal', function() {
             mockCustomTabsHtml = readFixtures('templates/mock/mock-xmodule-editor-with-custom-tabs.underscore');
 
             it('hides the modal\'s header', function() {
-                var requests = AjaxHelpers.requests(this);
-                modal = showModal(requests, mockCustomTabsHtml);
+                modal = showModal(mockCustomTabsHtml);
                 expect(modal.$('.modal-header')).toBeHidden();
             });
 
             it('shows the correct title', function() {
-                var requests = AjaxHelpers.requests(this);
-                modal = showModal(requests, mockCustomTabsHtml);
+                modal = showModal(mockCustomTabsHtml);
                 expect(modal.$('.component-name').text()).toBe('Editing: Component');
             });
         });
@@ -199,16 +193,14 @@ describe('EditXBlockModal', function() {
         });
 
         it('can render itself', function() {
-            var requests = AjaxHelpers.requests(this);
-            modal = showModal(requests, mockXModuleEditorHtml);
+            modal = showModal(mockXModuleEditorHtml);
             expect(EditHelpers.isShowingModal(modal)).toBeTruthy();
             EditHelpers.cancelModal(modal);
             expect(EditHelpers.isShowingModal(modal)).toBeFalsy();
         });
 
         it('does not show any mode buttons', function() {
-            var requests = AjaxHelpers.requests(this);
-            modal = showModal(requests, mockXModuleEditorHtml);
+            modal = showModal(mockXModuleEditorHtml);
             expect(modal.$('.editor-modes li').length).toBe(0);
         });
     });
diff --git a/cms/static/js/spec/views/move_xblock_spec.js b/cms/static/js/spec/views/move_xblock_spec.js
index e32f8a043fc2..a4173df856b8 100644
--- a/cms/static/js/spec/views/move_xblock_spec.js
+++ b/cms/static/js/spec/views/move_xblock_spec.js
@@ -1,5 +1,6 @@
 import $ from 'jquery';
 import _ from 'underscore';
+import sinon from 'sinon';
 import AjaxHelpers from 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers';
 import EditHelpers from 'js/spec_helpers/edit_helpers';
 import TemplateHelpers from 'common/js/spec_helpers/template_helpers';
@@ -24,7 +25,7 @@ describe('MoveXBlock', function() {
         verifyNotificationStatus, sendMoveXBlockRequest, moveXBlockWithSuccess, getMovedAlertNotification,
         verifyConfirmationFeedbackTitleText, verifyConfirmationFeedbackRedirectLinkText,
         verifyUndoConfirmationFeedbackTitleText, verifyConfirmationFeedbackUndoMoveActionText,
-        sourceParentXBlockInfo, mockContainerPage, createContainerPage, containerPage,
+        sourceParentXBlockInfo, mockContainerPage, createContainerPage, containerPage, requests, xhrFactory,
         sourceDisplayName = 'component_display_name_0',
         sourceLocator = 'component_ID_0',
         sourceParentLocator = 'unit_ID_0';
@@ -91,6 +92,11 @@ describe('MoveXBlock', function() {
     };
 
     beforeEach(function() {
+        xhrFactory = sinon.useFakeXMLHttpRequest();
+        requests = [];
+        requests.currentIndex = 0;
+        requests.restore = function() { xhrFactory.restore(); };
+        xhrFactory.onCreate = function(req) { requests.push(req); };
         setFixtures("<div id='page-alert'></div>");
         mockContainerPage = readFixtures('templates/mock/mock-container-page.underscore');
         TemplateHelpers.installTemplates([
@@ -115,6 +121,7 @@ describe('MoveXBlock', function() {
     });
 
     afterEach(function() {
+        requests.restore();
         modal.hide();
         courseOutline = null;
         containerPage.remove();
@@ -723,7 +730,6 @@ describe('MoveXBlock', function() {
         });
 
         it('move an xblock when move button is clicked', function() {
-            var requests = AjaxHelpers.requests(this);
             moveXBlockWithSuccess(requests);
         });
 
@@ -734,8 +740,7 @@ describe('MoveXBlock', function() {
         });
 
         it('undo move an xblock when undo move link is clicked', function() {
-            var sourceIndex = 0,
-                requests = AjaxHelpers.requests(this);
+            var sourceIndex = 0;
             moveXBlockWithSuccess(requests);
             getMovedAlertNotification().find('.action-save').click();
             AjaxHelpers.respondWithJson(requests, {
@@ -749,8 +754,7 @@ describe('MoveXBlock', function() {
 
     describe('shows a notification', function() {
         it('mini operation message when moving an xblock', function() {
-            var requests = AjaxHelpers.requests(this),
-                notificationSpy = ViewHelpers.createNotificationSpy();
+            var notificationSpy = ViewHelpers.createNotificationSpy();
             // navigate to a target parent and click
             renderViews(courseOutline);
             _.each(_.range(3), function() {
@@ -761,8 +765,7 @@ describe('MoveXBlock', function() {
         });
 
         it('mini operation message when undo moving an xblock', function() {
-            var notificationSpy,
-                requests = AjaxHelpers.requests(this);
+            var notificationSpy;
             moveXBlockWithSuccess(requests);
             notificationSpy = ViewHelpers.createNotificationSpy();
             getMovedAlertNotification().find('.action-save').click();
@@ -770,8 +773,7 @@ describe('MoveXBlock', function() {
         });
 
         it('error message when move request fails', function() {
-            var requests = AjaxHelpers.requests(this),
-                notificationSpy = ViewHelpers.createNotificationSpy('Error');
+            var notificationSpy = ViewHelpers.createNotificationSpy('Error');
             // select a target item and click
             renderViews(courseOutline);
             _.each(_.range(3), function() {
@@ -783,8 +785,7 @@ describe('MoveXBlock', function() {
         });
 
         it('error message when undo move request fails', function() {
-            var requests = AjaxHelpers.requests(this),
-                notificationSpy = ViewHelpers.createNotificationSpy('Error');
+            var notificationSpy = ViewHelpers.createNotificationSpy('Error');
             moveXBlockWithSuccess(requests);
             getMovedAlertNotification().find('.action-save').click();
             AjaxHelpers.respondWithError(requests);
diff --git a/cms/static/js/spec/views/pages/container_spec.js b/cms/static/js/spec/views/pages/container_spec.js
index f84efdca89b6..d1bf0cdd9ea9 100644
--- a/cms/static/js/spec/views/pages/container_spec.js
+++ b/cms/static/js/spec/views/pages/container_spec.js
@@ -4,6 +4,7 @@
 import $ from 'jquery';
 import _ from 'underscore';
 import str from 'underscore.string';
+import sinon from 'sinon';
 import AjaxHelpers from 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers';
 import TemplateHelpers from 'common/js/spec_helpers/template_helpers';
 import EditHelpers from 'js/spec_helpers/edit_helpers';
@@ -17,7 +18,7 @@ import 'jquery.simulate';
 function parameterized_suite(label, globalPageOptions) {
     describe(label + ' ContainerPage', function() {
         var getContainerPage, renderContainerPage, handleContainerPageRefresh, expectComponents,
-            respondWithHtml, model, containerPage, requests, initialDisplayName,
+            respondWithHtml, model, containerPage, requests, xhrFactory, initialDisplayName,
             mockContainerPage = readFixtures('templates/mock/mock-container-page.underscore'),
             mockContainerXBlockHtml = readFixtures(globalPageOptions.initial),
             mockXBlockHtml = readFixtures(globalPageOptions.addResponse),
@@ -34,6 +35,11 @@ function parameterized_suite(label, globalPageOptions) {
         beforeEach(function() {
             var newDisplayName = 'New Display Name';
 
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             EditHelpers.installEditTemplates();
             TemplateHelpers.installTemplate('xblock-string-field-editor');
             TemplateHelpers.installTemplate('container-message');
@@ -64,6 +70,7 @@ function parameterized_suite(label, globalPageOptions) {
         });
 
         afterEach(function() {
+            requests.restore();
             EditHelpers.uninstallMockXBlock();
             if (containerPage !== undefined) {
                 containerPage.remove();
@@ -89,7 +96,6 @@ function parameterized_suite(label, globalPageOptions) {
         };
 
         renderContainerPage = function(test, html, options, componentTemplates) {
-            requests = AjaxHelpers.requests(test);
             containerPage = getContainerPage(options, componentTemplates);
             containerPage.render();
             respondWithHtml(html);
@@ -125,7 +131,6 @@ function parameterized_suite(label, globalPageOptions) {
             });
 
             it('shows a loading indicator', function() {
-                requests = AjaxHelpers.requests(this);
                 containerPage = getContainerPage();
                 containerPage.render();
                 expect(containerPage.$('.ui-loading')).not.toHaveClass('is-hidden');
diff --git a/cms/static/js/spec/views/pages/container_subviews_spec.js b/cms/static/js/spec/views/pages/container_subviews_spec.js
index e74bf82869d5..27175090f211 100644
--- a/cms/static/js/spec/views/pages/container_subviews_spec.js
+++ b/cms/static/js/spec/views/pages/container_subviews_spec.js
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import _ from 'underscore';
 import str from 'underscore.string';
+import sinon from 'sinon';
 import AjaxHelpers from 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers';
 import TemplateHelpers from 'common/js/spec_helpers/template_helpers';
 import EditHelpers from 'js/spec_helpers/edit_helpers';
@@ -14,7 +15,7 @@ import Course from 'js/models/course';
 var VisibilityState = XBlockUtils.VisibilityState;
 
 describe('Container Subviews', function() {
-    var model, containerPage, requests, createContainerPage, renderContainerPage,
+    var model, containerPage, requests, xhrFactory, createContainerPage, renderContainerPage,
         respondWithHtml, fetch,
         disabledCss = 'is-disabled',
         defaultXBlockInfo, createXBlockInfo,
@@ -22,6 +23,11 @@ describe('Container Subviews', function() {
         mockContainerXBlockHtml = readFixtures('templates/mock/mock-empty-container-xblock.underscore');
 
     beforeEach(function() {
+        xhrFactory = sinon.useFakeXMLHttpRequest();
+        requests = [];
+        requests.currentIndex = 0;
+        requests.restore = function() { xhrFactory.restore(); };
+        xhrFactory.onCreate = function(req) { requests.push(req); };
         window.course = new Course({
             id: '5',
             name: 'Course Name',
@@ -37,10 +43,10 @@ describe('Container Subviews', function() {
         TemplateHelpers.installTemplate('unit-outline');
         TemplateHelpers.installTemplate('container-message');
         appendSetFixtures(mockContainerPage);
-        requests = AjaxHelpers.requests(this);
     });
 
     afterEach(function() {
+        requests.restore();
         delete window.course;
         if (containerPage !== undefined) {
             containerPage.remove();
diff --git a/cms/static/js/spec/views/pages/course_outline_spec.js b/cms/static/js/spec/views/pages/course_outline_spec.js
index ba975bf7b054..206bb3909ec1 100644
--- a/cms/static/js/spec/views/pages/course_outline_spec.js
+++ b/cms/static/js/spec/views/pages/course_outline_spec.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import sinon from 'sinon';
 import AjaxHelpers from 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers';
 import ViewUtils from 'common/js/components/utils/view_utils';
 import CourseOutlinePage from 'js/views/pages/course_outline';
@@ -9,7 +10,7 @@ import TemplateHelpers from 'common/js/spec_helpers/template_helpers';
 import Course from 'js/models/course';
 
 describe('CourseOutlinePage', function() {
-    var createCourseOutlinePage, displayNameInput, model, outlinePage, requests, getItemsOfType, getItemHeaders,
+    var createCourseOutlinePage, displayNameInput, model, outlinePage, requests, xhrFactory, getItemsOfType, getItemHeaders,
         verifyItemsExpanded, expandItemsAndVerifyState, collapseItemsAndVerifyState, selectBasicSettings,
         selectVisibilitySettings, selectDiscussionSettings, selectAdvancedSettings, createMockCourseJSON, createMockSectionJSON,
         createMockSubsectionJSON, verifyTypePublishable, mockCourseJSON, mockEmptyCourseJSON, setSelfPaced, setSelfPacedCustomPLS,
@@ -223,7 +224,6 @@ describe('CourseOutlinePage', function() {
     };
 
     createCourseOutlinePage = function(test, courseJSON, createOnly) {
-        requests = AjaxHelpers.requests(test);
         model = new XBlockOutlineInfo(courseJSON, {parse: true});
         outlinePage = new CourseOutlinePage({
             model: model,
@@ -305,6 +305,11 @@ describe('CourseOutlinePage', function() {
     };
 
     beforeEach(function() {
+        xhrFactory = sinon.useFakeXMLHttpRequest();
+        requests = [];
+        requests.currentIndex = 0;
+        requests.restore = function() { xhrFactory.restore(); };
+        xhrFactory.onCreate = function(req) { requests.push(req); };
         window.course = new Course({
             id: '5',
             name: 'Course Name',
@@ -365,6 +370,7 @@ describe('CourseOutlinePage', function() {
     });
 
     afterEach(function() {
+        requests.restore();
         EditHelpers.cancelModalIfShowing();
         EditHelpers.removeMockAnalytics();
         // Clean up after the $.datepicker
diff --git a/cms/static/js/spec/views/xblock_editor_spec.js b/cms/static/js/spec/views/xblock_editor_spec.js
index 5791572ddde0..4ae4d5e8ea7f 100644
--- a/cms/static/js/spec/views/xblock_editor_spec.js
+++ b/cms/static/js/spec/views/xblock_editor_spec.js
@@ -1,12 +1,13 @@
 import $ from 'jquery';
 import _ from 'underscore';
+import sinon from 'sinon';
 import AjaxHelpers from 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers';
 import EditHelpers from 'js/spec_helpers/edit_helpers';
 import XBlockEditorView from 'js/views/xblock_editor';
 import XBlockInfo from 'js/models/xblock_info';
 
 describe('XBlockEditorView', function() {
-    var model, editor, testDisplayName, mockSaveResponse;
+    var model, editor, testDisplayName, mockSaveResponse, requests, xhrFactory;
 
     testDisplayName = 'Test Display Name';
     mockSaveResponse = {
@@ -17,6 +18,11 @@ describe('XBlockEditorView', function() {
     };
 
     beforeEach(function() {
+        xhrFactory = sinon.useFakeXMLHttpRequest();
+        requests = [];
+        requests.currentIndex = 0;
+        requests.restore = function() { xhrFactory.restore(); };
+        xhrFactory.onCreate = function(req) { requests.push(req); };
         EditHelpers.installEditTemplates();
         model = new XBlockInfo({
             id: 'testCourse/branch/draft/block/verticalFFF',
@@ -28,6 +34,10 @@ describe('XBlockEditorView', function() {
         });
     });
 
+    afterEach(function() {
+        requests.restore();
+    });
+
     describe('Editing an xblock', function() {
         var mockXBlockEditorHtml;
 
@@ -42,7 +52,6 @@ describe('XBlockEditorView', function() {
         mockXBlockEditorHtml = readFixtures('templates/mock/mock-xblock-editor.underscore');
 
         it('can render itself', function() {
-            var requests = AjaxHelpers.requests(this);
             editor.render();
             AjaxHelpers.respondWithJson(requests, {
                 html: mockXBlockEditorHtml,
@@ -68,7 +77,6 @@ describe('XBlockEditorView', function() {
         });
 
         it('can render itself', function() {
-            var requests = AjaxHelpers.requests(this);
             editor.render();
             AjaxHelpers.respondWithJson(requests, {
                 html: mockXModuleEditorHtml,
@@ -80,8 +88,7 @@ describe('XBlockEditorView', function() {
         });
 
         it('saves any custom metadata', function() {
-            var requests = AjaxHelpers.requests(this),
-                request, response;
+            var request, response;
             editor.render();
             AjaxHelpers.respondWithJson(requests, {
                 html: mockXModuleEditorHtml,
@@ -97,8 +104,7 @@ describe('XBlockEditorView', function() {
         });
 
         it('can render a module with only settings', function() {
-            var requests = AjaxHelpers.requests(this),
-                // eslint-disable-next-line no-shadow
+            var // eslint-disable-next-line no-shadow
                 mockXModuleEditorHtml;
             mockXModuleEditorHtml = readFixtures('templates/mock/mock-xmodule-settings-only-editor.underscore');
 
diff --git a/cms/static/js/spec/views/xblock_string_field_editor_spec.js b/cms/static/js/spec/views/xblock_string_field_editor_spec.js
index 9121b0e3342c..ce7b0ee5291b 100644
--- a/cms/static/js/spec/views/xblock_string_field_editor_spec.js
+++ b/cms/static/js/spec/views/xblock_string_field_editor_spec.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import sinon from 'sinon';
 import AjaxHelpers from 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers';
 import TemplateHelpers from 'common/js/spec_helpers/template_helpers';
 import EditHelpers from 'js/spec_helpers/edit_helpers';
@@ -6,7 +7,7 @@ import XBlockInfo from 'js/models/xblock_info';
 import XBlockStringFieldEditor from 'js/views/xblock_string_field_editor';
 
 describe('XBlockStringFieldEditorView', function() {
-    var initialDisplayName, updatedDisplayName, getXBlockInfo, getFieldEditorView;
+    var initialDisplayName, updatedDisplayName, getXBlockInfo, getFieldEditorView, requests, xhrFactory;
 
     getXBlockInfo = function(displayName) {
         return new XBlockInfo(
@@ -29,6 +30,11 @@ describe('XBlockStringFieldEditorView', function() {
     };
 
     beforeEach(function() {
+        xhrFactory = sinon.useFakeXMLHttpRequest();
+        requests = [];
+        requests.currentIndex = 0;
+        requests.restore = function() { xhrFactory.restore(); };
+        xhrFactory.onCreate = function(req) { requests.push(req); };
         initialDisplayName = 'Default Display Name';
         updatedDisplayName = 'Updated Display Name';
         TemplateHelpers.installTemplate('xblock-string-field-editor');
@@ -42,6 +48,10 @@ describe('XBlockStringFieldEditorView', function() {
         );
     });
 
+    afterEach(function() {
+        requests.restore();
+    });
+
     describe('Editing', function() {
         var expectPostedNewDisplayName, expectEditCanceled;
 
@@ -54,8 +64,7 @@ describe('XBlockStringFieldEditorView', function() {
         };
 
         expectEditCanceled = function(test, fieldEditorView, options) {
-            var requests, initialRequests, displayNameInput;
-            requests = AjaxHelpers.requests(test);
+            var displayNameInput;
             displayNameInput = EditHelpers.inlineEdit(fieldEditorView.$el, options.newTitle);
             if (options.pressEscape) {
                 displayNameInput.simulate('keydown', {keyCode: $.simulate.keyCode.ESCAPE});
@@ -72,8 +81,7 @@ describe('XBlockStringFieldEditorView', function() {
         };
 
         it('can inline edit the display name', function() {
-            var requests, fieldEditorView;
-            requests = AjaxHelpers.requests(this);
+            var fieldEditorView;
             fieldEditorView = getFieldEditorView().render();
             EditHelpers.inlineEdit(fieldEditorView.$el, updatedDisplayName);
             fieldEditorView.$('button[name=submit]').click();
@@ -86,8 +94,7 @@ describe('XBlockStringFieldEditorView', function() {
         });
 
         it('does not change the title when a display name update fails', function() {
-            var requests, fieldEditorView, initialRequests;
-            requests = AjaxHelpers.requests(this);
+            var fieldEditorView;
             fieldEditorView = getFieldEditorView().render();
             EditHelpers.inlineEdit(fieldEditorView.$el, updatedDisplayName);
             fieldEditorView.$('button[name=submit]').click();
@@ -99,8 +106,7 @@ describe('XBlockStringFieldEditorView', function() {
         });
 
         it('trims whitespace from the display name', function() {
-            var requests, fieldEditorView;
-            requests = AjaxHelpers.requests(this);
+            var fieldEditorView;
             fieldEditorView = getFieldEditorView().render();
             updatedDisplayName += ' ';
             EditHelpers.inlineEdit(fieldEditorView.$el, updatedDisplayName);

From fe1e00b4888d11e4efca7796c5a44faa17aea073 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Thu, 5 Mar 2026 10:28:57 -0500
Subject: [PATCH 11/13] fix: replace AjaxHelpers.requests() calls in spec files
 for Jasmine 2.99.x

AjaxHelpers.requests() internally calls afterEach() to restore the sinon
fake XHR, but Jasmine 2.99.x forbids calling afterEach() from within a
running spec (it() body) or helper functions called from it() bodies,
producing: 'afterEach' should only be used in 'describe' function.

Replace all occurrences across 44 spec files by moving sinon fake XHR
setup into beforeEach/afterEach at the describe scope using the pattern:
  xhrFactory = sinon.useFakeXMLHttpRequest();
  requests = []; requests.currentIndex = 0;
  requests.restore = function() { xhrFactory.restore(); };
  xhrFactory.onCreate = function(req) { requests.push(req); };

See https://jasmine.github.io/api/2.99/global.html#afterEach for the
restriction that afterEach must be called at describe scope.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../js/spec/components/paginated_view_spec.js | 24 +++++++----
 .../js/spec/components/paging_footer_spec.js  | 24 ++++++-----
 .../js/spec/components/search_field_spec.js   | 16 +++++--
 .../common/js/spec_helpers/view_helpers.js    | 10 +++--
 .../js/spec/api_admin/catalog_preview_spec.js | 16 +++++--
 lms/static/js/spec/ccx/schedule_spec.js       | 16 +++++--
 lms/static/js/spec/dashboard/donation.js      | 20 +++++----
 .../spec/discovery/discovery_factory_spec.js  | 28 +++++++-----
 .../discovery/models/course_directory_spec.js | 16 +++++--
 .../discovery/models/search_state_spec.js     | 19 +++++---
 .../js/spec/edxnotes/plugins/events_spec.js   | 14 ++++--
 .../plugins/store_error_handler_spec.js       | 13 ++++--
 .../edxnotes/utils/notes_collector_spec.js    | 15 +++++--
 .../js/spec/edxnotes/views/note_item_spec.js  | 17 ++++++--
 .../spec/edxnotes/views/notes_factory_spec.js | 15 +++++--
 .../js/spec/edxnotes/views/notes_page_spec.js | 17 ++++++--
 .../views/notes_visibility_factory_spec.js    | 15 ++++---
 .../js/spec/edxnotes/views/search_box_spec.js | 23 +++++-----
 .../views/tabs/recent_activity_spec.js        | 19 +++++---
 .../views/tabs/search_results_spec.js         | 43 +++++++++----------
 .../js/spec/groups/views/cohorts_spec.js      | 16 +++++--
 .../js/spec/groups/views/discussions_spec.js  | 16 +++++--
 .../certificates_exception_spec.js            | 30 ++++++++++---
 .../certificates_invalidation_spec.js         | 16 +++++--
 .../instructor_dashboard/certificates_spec.js | 16 +++++--
 .../membership_auth_spec.js                   | 23 +++++++---
 .../student_admin_spec.js                     | 37 ++++++----------
 .../js/spec/shoppingcart/shoppingcart_spec.js | 16 +++++--
 .../js/spec/staff_debug_actions_spec.js       | 18 ++++++--
 .../js/spec/student_account/access_spec.js    | 13 ++++--
 .../spec/student_account/emailoptin_spec.js   | 21 ++++++---
 .../spec/student_account/enrollment_spec.js   | 25 +++++------
 .../spec/student_account/finish_auth_spec.js  | 17 ++++++--
 .../js/spec/student_account/login_spec.js     | 13 ++++--
 .../multiple_enterprise_spec.js               | 28 ++++++------
 .../student_account/password_reset_spec.js    | 15 +++++--
 .../js/spec/student_account/register_spec.js  | 16 +++++--
 .../spec/student_account/shoppingcart_spec.js | 22 ++++++----
 .../make_payment_step_view_ab_testing_spec.js | 26 +++++++----
 .../make_payment_step_view_spec.js            | 26 +++++++----
 .../review_photos_step_view_spec.js           | 22 ++++++----
 lms/static/js/spec/views/fields_spec.js       | 19 ++++----
 .../js/spec/views/file_uploader_spec.js       | 30 +++++++------
 .../js/spec/preview/preview_factory_spec.js   | 24 +++++++----
 44 files changed, 585 insertions(+), 300 deletions(-)

diff --git a/common/static/common/js/spec/components/paginated_view_spec.js b/common/static/common/js/spec/components/paginated_view_spec.js
index 21797a854a3c..b0d059a2256b 100644
--- a/common/static/common/js/spec/components/paginated_view_spec.js
+++ b/common/static/common/js/spec/components/paginated_view_spec.js
@@ -2,10 +2,11 @@ define([
     'jquery',
     'backbone',
     'underscore',
+    'sinon',
     'edx-ui-toolkit/js/pagination/paging-collection',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'common/js/components/views/paginated_view'
-], function($, Backbone, _, PagingCollection, AjaxHelpers, PaginatedView) {
+], function($, Backbone, _, sinon, PagingCollection, AjaxHelpers, PaginatedView) {
     'use strict';
 
     describe('PaginatedView', function() {
@@ -23,6 +24,8 @@ define([
             TestPaginatedView = PaginatedView.extend({type: 'test', itemViewClass: TestItemView}),
             testCollection,
             testView,
+            requests,
+            xhrFactory,
             initialItems,
             nextPageButtonCss = '.next-page-link',
             previousPageButtonCss = '.previous-page-link',
@@ -35,6 +38,11 @@ define([
             };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             setFixtures('<div class="test-container"></div>');
             initialItems = generateItems(5);
             var TestPagingCollection = PagingCollection.extend({
@@ -54,6 +62,10 @@ define([
             testView = new TestPaginatedView({el: '.test-container', collection: testCollection}).render();
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         /**
          * Verify that the view's header reflects the page we're currently viewing.
          * @param matchString the header we expect to see
@@ -112,8 +124,7 @@ define([
         });
 
         it('can change to the next page', function() {
-            var requests = AjaxHelpers.requests(this),
-                newItems = generateItems(1);
+            var newItems = generateItems(1);
             expectHeader('Showing 1-5 out of 6 total');
             expectItems(initialItems);
             expectFooter({currentPage: 1, totalPages: 2, isHidden: false});
@@ -131,8 +142,7 @@ define([
         });
 
         it('can change to the previous page', function() {
-            var requests = AjaxHelpers.requests(this),
-                previousPageItems;
+            var previousPageItems;
             initialItems = generateItems(1);
             testCollection.set(
                 {
@@ -160,7 +170,6 @@ define([
         });
 
         it('sets focus for screen readers', function() {
-            var requests = AjaxHelpers.requests(this);
             spyOn($.fn, 'focus');
             testView.$(nextPageButtonCss).click();
             AjaxHelpers.respondWithJson(requests, {
@@ -173,8 +182,7 @@ define([
         });
 
         it('does not change on server error', function() {
-            var requests = AjaxHelpers.requests(this),
-                expectInitialState = function() {
+            var expectInitialState = function() {
                     expectHeader('Showing 1-5 out of 6 total');
                     expectItems(initialItems);
                     expectFooter({currentPage: 1, totalPages: 2, isHidden: false});
diff --git a/common/static/common/js/spec/components/paging_footer_spec.js b/common/static/common/js/spec/components/paging_footer_spec.js
index 39bd93b909b8..887d6240662c 100644
--- a/common/static/common/js/spec/components/paging_footer_spec.js
+++ b/common/static/common/js/spec/components/paging_footer_spec.js
@@ -2,14 +2,17 @@ define([
     'jquery',
     'URI',
     'underscore',
+    'sinon',
     'edx-ui-toolkit/js/pagination/paging-collection',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'common/js/components/views/paging_footer'
-], function($, URI, _, PagingCollection, AjaxHelpers, PagingFooter) {
+], function($, URI, _, sinon, PagingCollection, AjaxHelpers, PagingFooter) {
     'use strict';
 
     describe('PagingFooter', function() {
         var pagingFooter,
+            requests,
+            xhrFactory,
             mockPage = function(currentPage, numPages, collectionLength) {
                 if (_.isUndefined(collectionLength)) {
                     collectionLength = 1;
@@ -29,6 +32,11 @@ define([
             pageNumberInputCss = '.page-number-input';
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             setFixtures('<div class="paging-footer"></div>');
             var collection = new PagingCollection(mockPage(1, 2), {parse: true});
             collection.url = '/test/url/';
@@ -39,6 +47,10 @@ define([
             }).render();
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         describe('when hideWhenOnePage is true', function() {
             beforeEach(function() {
                 pagingFooter.hideWhenOnePage = true;
@@ -69,14 +81,12 @@ define([
 
         describe('Next page button', function() {
             it('does not move forward if a server error occurs', function() {
-                var requests = AjaxHelpers.requests(this);
                 pagingFooter.$(nextPageCss).click();
                 requests[0].respond(500);
                 expect(pagingFooter.$(currentPageCss)).toHaveText('1');
             });
 
             it('can move to the next page', function() {
-                var requests = AjaxHelpers.requests(this);
                 pagingFooter.$(nextPageCss).click();
                 AjaxHelpers.respondWithJson(requests, mockPage(2, 2));
                 expect(pagingFooter.collection.getPageNumber()).toBe(2);
@@ -88,7 +98,6 @@ define([
             });
 
             it('should be disabled on the final page', function() {
-                var requests = AjaxHelpers.requests(this);
                 pagingFooter.$(nextPageCss).click();
                 AjaxHelpers.respondWithJson(requests, mockPage(2, 2));
                 expect(pagingFooter.$(nextPageCss)).toHaveClass('is-disabled');
@@ -97,7 +106,6 @@ define([
 
         describe('Previous page button', function() {
             it('does not move back if a server error occurs', function() {
-                var requests = AjaxHelpers.requests(this);
                 pagingFooter.collection.reset(mockPage(2, 2), {parse: true});
                 pagingFooter.$(previousPageCss).click();
                 requests[0].respond(500);
@@ -105,7 +113,6 @@ define([
             });
 
             it('can go back a page', function() {
-                var requests = AjaxHelpers.requests(this);
                 pagingFooter.$(nextPageCss).click();
                 AjaxHelpers.respondWithJson(requests, mockPage(2, 2));
                 pagingFooter.$(previousPageCss).click();
@@ -118,7 +125,6 @@ define([
             });
 
             it('should be enabled on the second page', function() {
-                var requests = AjaxHelpers.requests(this);
                 pagingFooter.$(nextPageCss).click();
                 AjaxHelpers.respondWithJson(requests, mockPage(2, 2));
                 expect(pagingFooter.$(previousPageCss)).not.toHaveClass('is-disabled');
@@ -131,7 +137,6 @@ define([
             });
 
             it('should show 2 on the second page', function() {
-                var requests = AjaxHelpers.requests(this);
                 pagingFooter.$(nextPageCss).click();
                 AjaxHelpers.respondWithJson(requests, mockPage(2, 2));
                 expect(pagingFooter.$(currentPageCss)).toHaveText('2');
@@ -154,7 +159,6 @@ define([
             });
 
             it('should handle invalid page requests', function() {
-                var requests = AjaxHelpers.requests(this);
                 pagingFooter.$(pageNumberInputCss).val('abc');
                 pagingFooter.$(pageNumberInputCss).trigger('change');
                 expect(pagingFooter.$(currentPageCss)).toHaveText('1');
@@ -162,7 +166,6 @@ define([
             });
 
             it('should switch pages via the input field', function() {
-                var requests = AjaxHelpers.requests(this);
                 pagingFooter.$(pageNumberInputCss).val('2');
                 pagingFooter.$(pageNumberInputCss).trigger('change');
                 AjaxHelpers.respondWithJson(requests, mockPage(2, 2));
@@ -171,7 +174,6 @@ define([
             });
 
             it('should handle AJAX failures when switching pages via the input field', function() {
-                var requests = AjaxHelpers.requests(this);
                 pagingFooter.$(pageNumberInputCss).val('2');
                 pagingFooter.$(pageNumberInputCss).trigger('change');
                 requests[0].respond(500);
diff --git a/common/static/common/js/spec/components/search_field_spec.js b/common/static/common/js/spec/components/search_field_spec.js
index dbd4fa1bd29b..b82106822a87 100644
--- a/common/static/common/js/spec/components/search_field_spec.js
+++ b/common/static/common/js/spec/components/search_field_spec.js
@@ -1,14 +1,17 @@
 define([
     'underscore',
     'URI',
+    'sinon',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'edx-ui-toolkit/js/pagination/paging-collection',
     'common/js/components/views/search_field'
-], function(_, URI, AjaxHelpers, PagingCollection, SearchFieldView) {
+], function(_, URI, sinon, AjaxHelpers, PagingCollection, SearchFieldView) {
     'use strict';
 
     describe('SearchFieldView', function() {
         var searchFieldView,
+            requests,
+            xhrFactory,
             mockUrl = '/api/mock_collection';
 
         var newCollection = function(size, perPage) {
@@ -55,9 +58,18 @@ define([
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             setFixtures('<section class="test-search"></section>');
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('correctly displays itself', function() {
             searchFieldView = createSearchFieldView().render();
             expect(searchFieldView.$('.search-field').val(), '');
@@ -72,7 +84,6 @@ define([
         });
 
         it('refreshes the collection when performing a search', function() {
-            var requests = AjaxHelpers.requests(this);
             searchFieldView = createSearchFieldView().render();
             searchFieldView.$('.search-field').val('foo');
             searchFieldView.$('.action-search').click();
@@ -92,7 +103,6 @@ define([
         });
 
         it('can clear the search', function() {
-            var requests = AjaxHelpers.requests(this);
             searchFieldView = createSearchFieldView({
                 searchString: 'foo'
             }).render();
diff --git a/common/static/common/js/spec_helpers/view_helpers.js b/common/static/common/js/spec_helpers/view_helpers.js
index a0e11f4825b3..885e874a38a1 100644
--- a/common/static/common/js/spec_helpers/view_helpers.js
+++ b/common/static/common/js/spec_helpers/view_helpers.js
@@ -12,6 +12,13 @@ function(_, $, NotificationView, Prompt, AjaxHelpers) {
         installMockAnalytics, removeMockAnalytics, verifyPromptShowing, verifyPromptHidden,
         clickDeleteItem, patchAndVerifyRequest, submitAndVerifyFormSuccess, submitAndVerifyFormError;
 
+    // Register a single global afterEach to clean up jasmine.stealth constructor spies.
+    // Jasmine 2.99.x prohibits calling afterEach() from inside it()/beforeEach() callbacks,
+    // so we cannot register this inside createFeedbackSpy (which is called from it() blocks).
+    // Calling afterEach() at module scope (outside any describe/it) registers a global hook
+    // that runs after every spec. AMD caches this module, so the hook is registered exactly once.
+    afterEach(jasmine.stealth.clearSpies);
+
     installViewTemplates = function() {
         appendSetFixtures('<div id="page-notification"></div>');
     };
@@ -19,9 +26,6 @@ function(_, $, NotificationView, Prompt, AjaxHelpers) {
     createFeedbackSpy = function(type, intent) {
         var feedbackSpy = jasmine.stealth.spyOnConstructor(type, intent, ['show', 'hide']);
         feedbackSpy.show.and.returnValue(feedbackSpy);
-        if (afterEach) {
-            afterEach(jasmine.stealth.clearSpies);
-        }
         return feedbackSpy;
     };
 
diff --git a/lms/static/js/spec/api_admin/catalog_preview_spec.js b/lms/static/js/spec/api_admin/catalog_preview_spec.js
index 4e439fa8f0e9..ddb73f614eb1 100644
--- a/lms/static/js/spec/api_admin/catalog_preview_spec.js
+++ b/lms/static/js/spec/api_admin/catalog_preview_spec.js
@@ -1,17 +1,25 @@
 define([
+    'sinon',
     'js/api_admin/views/catalog_preview',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers'
 ], function(
-    CatalogPreviewView, AjaxHelpers
+    sinon, CatalogPreviewView, AjaxHelpers
 ) {
     'use strict';
 
     describe('Catalog preview view', function() {
         var view,
+            requests,
+            xhrFactory,
             previewUrl = 'http://example.com/api-admin/catalogs/preview/',
             catalogApiUrl = 'http://api.example.com/catalog/v1/courses/';
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             setFixtures(
                 '<div class="catalog-body">'
                 + '<textarea id="id_query"></textarea>'
@@ -26,12 +34,15 @@ define([
             view.render();
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('can render itself', function() {
             expect(view.$('button.preview-query').length).toBe(1);
         });
 
         it('can retrieve a list of catalogs and display them', function() {
-            var requests = AjaxHelpers.requests(this);
             view.$('#id_query').val('*');
             view.$('.preview-query').click();
             AjaxHelpers.expectRequest(requests, 'GET', previewUrl + '?q=*');
@@ -46,7 +57,6 @@ define([
         });
 
         it('displays an error when courses cannot be retrieved', function() {
-            var requests = AjaxHelpers.requests(this);
             view.$('#id_query').val('*');
             view.$('.preview-query').click();
             AjaxHelpers.respondWithError(requests, 500);
diff --git a/lms/static/js/spec/ccx/schedule_spec.js b/lms/static/js/spec/ccx/schedule_spec.js
index 29ce7a6dc58f..b16c90b1fd02 100644
--- a/lms/static/js/spec/ccx/schedule_spec.js
+++ b/lms/static/js/spec/ccx/schedule_spec.js
@@ -1,10 +1,16 @@
-define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/ccx/schedule'],
-    function(AjaxHelpers) {
+define(['sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/ccx/schedule'],
+    function(sinon, AjaxHelpers) {
         describe('edx.ccx.schedule.ScheduleView', function() {
             var view = null;
             var data;
+            var requests, xhrFactory;
 
             beforeEach(function() {
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
                 loadFixtures('js/fixtures/ccx/schedule.html');
 
                 var scheduleFixture = readFixtures('templates/ccx/schedule.underscore');
@@ -51,6 +57,10 @@ define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/ccx/schedule'],
                 view.render();
             });
 
+            afterEach(function() {
+                requests.restore();
+            });
+
             it('verifies correct view setup', function() {
                 expect(view.dirty).toBe(false);
                 expect(view.showing).toEqual([]);
@@ -204,7 +214,6 @@ define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/ccx/schedule'],
             });
 
             it('saves schedule changes', function() {
-                requests = AjaxHelpers.requests(this);
                 view.save();
                 expect(requests.length).toEqual(1);
                 AjaxHelpers.expectJsonRequest(requests, 'POST', 'save_ccx', view.schedule);
@@ -217,7 +226,6 @@ define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/ccx/schedule'],
             });
 
             it('displays an error if the sync fails', function() {
-                requests = AjaxHelpers.requests(this);
                 view.save();
                 requests[0].respond(500);
                 expect($('#ajax-error')).toHaveCss({display: 'block'});
diff --git a/lms/static/js/spec/dashboard/donation.js b/lms/static/js/spec/dashboard/donation.js
index 50edd8b255a9..66b07a175b9d 100644
--- a/lms/static/js/spec/dashboard/donation.js
+++ b/lms/static/js/spec/dashboard/donation.js
@@ -1,7 +1,7 @@
-define(['common/js/spec_helpers/template_helpers',
+define(['sinon', 'common/js/spec_helpers/template_helpers',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'js/dashboard/donation'],
-function(TemplateHelpers, AjaxHelpers) {
+function(sinon, TemplateHelpers, AjaxHelpers) {
     'use strict';
 
     describe('edx.dashboard.donation.DonationView', function() {
@@ -15,6 +15,7 @@ function(TemplateHelpers, AjaxHelpers) {
 
         var view = null;
         var requests = null;
+        var xhrFactory = null;
 
         beforeEach(function() {
             setFixtures('<div></div>');
@@ -34,12 +35,18 @@ function(TemplateHelpers, AjaxHelpers) {
 
             // Stub the analytics event tracker
             window.analytics = jasmine.createSpyObj('analytics', ['track']);
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
         });
 
-        it('processes a donation for a course', function() {
-            // Spy on AJAX requests
-            requests = AjaxHelpers.requests(this);
+        afterEach(function() {
+            requests.restore();
+        });
 
+        it('processes a donation for a course', function() {
             // Enter a donation amount and proceed to the payment page
             view.$amount.val(AMOUNT);
             view.donate();
@@ -119,9 +126,6 @@ function(TemplateHelpers, AjaxHelpers) {
         });
 
         it('displays an error when the server cannot be contacted', function() {
-            // Spy on AJAX requests
-            requests = AjaxHelpers.requests(this);
-
             // Simulate an error from the LMS servers
             view.donate();
             AjaxHelpers.respondWithError(requests);
diff --git a/lms/static/js/spec/discovery/discovery_factory_spec.js b/lms/static/js/spec/discovery/discovery_factory_spec.js
index 6ce1a9e2d657..25b87907be26 100644
--- a/lms/static/js/spec/discovery/discovery_factory_spec.js
+++ b/lms/static/js/spec/discovery/discovery_factory_spec.js
@@ -1,7 +1,7 @@
 define([
-    'jquery', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/template_helpers',
+    'jquery', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'common/js/spec_helpers/template_helpers',
     'js/discovery/discovery_factory'
-], function($, AjaxHelpers, TemplateHelpers, DiscoveryFactory) {
+], function($, sinon, AjaxHelpers, TemplateHelpers, DiscoveryFactory) {
     'use strict';
 
     var MEANINGS = {
@@ -94,7 +94,14 @@ define([
     };
 
     describe('discovery.DiscoveryFactory', function() {
+        var requests, xhrFactory;
+
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             loadFixtures('js/fixtures/discovery.html');
             TemplateHelpers.installTemplates([
                 'templates/discovery/course_card',
@@ -110,10 +117,10 @@ define([
 
         afterEach(function() {
             jasmine.clock().uninstall();
+            requests.restore();
         });
 
         it('does search', function() {
-            var requests = AjaxHelpers.requests(this);
             $('.discovery-input').val('test');
             $('.discovery-submit').trigger('click');
             AjaxHelpers.respondWithJson(requests, JSON_RESPONSE);
@@ -123,7 +130,6 @@ define([
         });
 
         it('loads more', function() {
-            var requests = AjaxHelpers.requests(this);
 
             $('.discovery-input').val('test');
             $('.discovery-submit').trigger('click');
@@ -141,7 +147,6 @@ define([
         });
 
         it('displays not found message', function() {
-            var requests = AjaxHelpers.requests(this);
             $('.discovery-input').val('asdfasdf');
             $('.discovery-submit').trigger('click');
             AjaxHelpers.respondWithJson(requests, {});
@@ -151,7 +156,6 @@ define([
         });
 
         it('displays error message', function() {
-            var requests = AjaxHelpers.requests(this);
             $('.discovery-input').val('asdfasdf');
             $('.discovery-submit').trigger('click');
             AjaxHelpers.respondWithError(requests, 404, {error: 'some-search-error'});
@@ -161,7 +165,6 @@ define([
         });
 
         it('check filters and bar removed on clear all', function() {
-            var requests = AjaxHelpers.requests(this);
             $('.discovery-input').val('test');
             $('.discovery-submit').trigger('click');
             AjaxHelpers.respondWithJson(requests, JSON_RESPONSE);
@@ -173,7 +176,6 @@ define([
         });
 
         it('check filters and bar removed on last filter cleared', function() {
-            var requests = AjaxHelpers.requests(this);
             $('.discovery-input').val('test');
             $('.discovery-submit').trigger('click');
             AjaxHelpers.respondWithJson(requests, JSON_RESPONSE);
@@ -184,7 +186,6 @@ define([
         });
 
         it('filter results by named facet', function() {
-            var requests = AjaxHelpers.requests(this);
             $('.discovery-input').val('test');
             $('.discovery-submit').trigger('click');
             AjaxHelpers.respondWithJson(requests, JSON_RESPONSE);
@@ -198,7 +199,14 @@ define([
     });
 
     describe('discovery.DiscoveryFactory default filters', function() {
+        var requests, xhrFactory;
+
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             loadFixtures('js/fixtures/discovery.html');
             TemplateHelpers.installTemplates([
                 'templates/discovery/course_card',
@@ -215,10 +223,10 @@ define([
 
         afterEach(function() {
             jasmine.clock().uninstall();
+            requests.restore();
         });
 
         it('filters by default language', function() {
-            var requests = AjaxHelpers.requests(this);
             $('.discovery-submit').trigger('click');
             var request = AjaxHelpers.currentRequest(requests);
             // make sure language filter is set
diff --git a/lms/static/js/spec/discovery/models/course_directory_spec.js b/lms/static/js/spec/discovery/models/course_directory_spec.js
index b7a0bb8f15ec..eafd4664b4a4 100644
--- a/lms/static/js/spec/discovery/models/course_directory_spec.js
+++ b/lms/static/js/spec/discovery/models/course_directory_spec.js
@@ -1,6 +1,6 @@
 define([
-    'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/discovery/models/course_discovery'
-], function(AjaxHelpers, CourseDiscovery) {
+    'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/discovery/models/course_discovery'
+], function(sinon, AjaxHelpers, CourseDiscovery) {
     'use strict';
 
     var JSON_RESPONSE = {
@@ -70,13 +70,23 @@ define([
     };
 
     describe('discovery.models.CourseDiscovery', function() {
+        var requests, xhrFactory;
+
         beforeEach(function() {
-            var requests = AjaxHelpers.requests(this);
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             this.discovery = new CourseDiscovery();
             this.discovery.fetch();
             AjaxHelpers.respondWithJson(requests, JSON_RESPONSE);
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('parses server response', function() {
             expect(this.discovery.courseCards.length).toBe(1);
             expect(this.discovery.facetOptions.length).toBe(27);
diff --git a/lms/static/js/spec/discovery/models/search_state_spec.js b/lms/static/js/spec/discovery/models/search_state_spec.js
index 61dc4d1d3ef5..2d5f26733f79 100644
--- a/lms/static/js/spec/discovery/models/search_state_spec.js
+++ b/lms/static/js/spec/discovery/models/search_state_spec.js
@@ -1,6 +1,6 @@
 define([
-    'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/discovery/models/search_state'
-], function(AjaxHelpers, SearchState) {
+    'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/discovery/models/search_state'
+], function(sinon, AjaxHelpers, SearchState) {
     'use strict';
 
     var JSON_RESPONSE = {
@@ -29,7 +29,14 @@ define([
     };
 
     describe('discovery.models.SearchState', function() {
+        var requests, xhrFactory;
+
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             this.search = new SearchState();
             this.onSearch = jasmine.createSpy('onSearch');
             this.onNext = jasmine.createSpy('onNext');
@@ -39,8 +46,11 @@ define([
             this.search.on('error', this.onError);
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('perform search', function() {
-            var requests = AjaxHelpers.requests(this);
             this.search.performSearch('dummy');
             AjaxHelpers.respondWithJson(requests, JSON_RESPONSE);
             expect(this.onSearch).toHaveBeenCalledWith('dummy', 365);
@@ -51,14 +61,12 @@ define([
         });
 
         it('returns an error', function() {
-            var requests = AjaxHelpers.requests(this);
             this.search.performSearch('');
             AjaxHelpers.respondWithError(requests, 500);
             expect(this.onError).toHaveBeenCalled();
         });
 
         it('loads next page', function() {
-            var requests = AjaxHelpers.requests(this);
             this.search.performSearch('dummy');
             AjaxHelpers.respondWithJson(requests, JSON_RESPONSE);
             this.search.loadNextPage();
@@ -67,7 +75,6 @@ define([
         });
 
         it('shows all results when there are none', function() {
-            var requests = AjaxHelpers.requests(this);
             this.search.performSearch('dummy', {modes: 'SomeOption'});
             // no results
             AjaxHelpers.respondWithJson(requests, {total: 0});
diff --git a/lms/static/js/spec/edxnotes/plugins/events_spec.js b/lms/static/js/spec/edxnotes/plugins/events_spec.js
index 304c5746de19..46440c954b63 100644
--- a/lms/static/js/spec/edxnotes/plugins/events_spec.js
+++ b/lms/static/js/spec/edxnotes/plugins/events_spec.js
@@ -1,7 +1,7 @@
 define([
-    'jquery', 'underscore', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/spec/edxnotes/helpers',
+    'jquery', 'underscore', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/spec/edxnotes/helpers',
     'annotator_1.2.9', 'logger', 'js/edxnotes/views/notes_factory'
-], function($, _, AjaxHelpers, Helpers, Annotator, Logger, NotesFactory) {
+], function($, _, sinon, AjaxHelpers, Helpers, Annotator, Logger, NotesFactory) {
     'use strict';
 
     describe('EdxNotes Events Plugin', function() {
@@ -20,8 +20,14 @@ define([
                 usage_id: 'usage-123',
                 tags: ['tag1', 'tag2']
             };
+        var requests, xhrFactory;
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             this.annotator = NotesFactory.factory(
                 $('<div />').get(0), {
                     endpoint: 'http://example.com/',
@@ -35,6 +41,7 @@ define([
             while (Annotator._instances.length > 0) {
                 Annotator._instances[0].destroy();
             }
+            requests.restore();
         });
 
         it('should log edx.course.student_notes.viewed event properly', function() {
@@ -57,8 +64,7 @@ define([
         });
 
         it('should log edx.course.student_notes.added event properly', function() {
-            var requests = AjaxHelpers.requests(this),
-                newNote = {
+            var newNote = {
                     user: 'user-123',
                     text: 'text-123',
                     quote: 'quote-123',
diff --git a/lms/static/js/spec/edxnotes/plugins/store_error_handler_spec.js b/lms/static/js/spec/edxnotes/plugins/store_error_handler_spec.js
index fd4d78932613..b7a407015643 100644
--- a/lms/static/js/spec/edxnotes/plugins/store_error_handler_spec.js
+++ b/lms/static/js/spec/edxnotes/plugins/store_error_handler_spec.js
@@ -1,14 +1,21 @@
 define([
-    'jquery', 'underscore', 'annotator_1.2.9',
+    'jquery', 'underscore', 'sinon', 'annotator_1.2.9',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'js/spec/edxnotes/helpers',
     'js/edxnotes/views/notes_factory',
     'js/edxnotes/utils/notes_collector'
-], function($, _, Annotator, AjaxHelpers, Helpers, NotesFactory, NotesCollector) {
+], function($, _, sinon, Annotator, AjaxHelpers, Helpers, NotesFactory, NotesCollector) {
     'use strict';
 
     describe('Store Error Handler Custom Message', function() {
+        var requests, xhrFactory;
+
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             spyOn(Annotator, 'showNotification');
             loadFixtures('js/fixtures/edxnotes/edxnotes_wrapper.html');
             NotesCollector.cleanup();
@@ -18,10 +25,10 @@ define([
             while (Annotator._instances.length > 0) { // eslint-disable-line no-underscore-dangle
                 Annotator._instances[0].destroy(); // eslint-disable-line no-underscore-dangle
             }
+            requests.restore();
         });
 
         it('can handle custom error if sent from server', function() {
-            var requests = AjaxHelpers.requests(this);
             var token = Helpers.makeToken();
             _.each($('.edx-notes-wrapper'), function(wrapper) {
                 NotesFactory.factory(wrapper, {
diff --git a/lms/static/js/spec/edxnotes/utils/notes_collector_spec.js b/lms/static/js/spec/edxnotes/utils/notes_collector_spec.js
index 1c92151cbf45..d9c2d371a198 100644
--- a/lms/static/js/spec/edxnotes/utils/notes_collector_spec.js
+++ b/lms/static/js/spec/edxnotes/utils/notes_collector_spec.js
@@ -1,13 +1,20 @@
 define([
-    'jquery', 'underscore', 'annotator_1.2.9', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
+    'jquery', 'underscore', 'sinon', 'annotator_1.2.9', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'js/edxnotes/views/notes_factory', 'js/edxnotes/utils/notes_collector', 'js/spec/edxnotes/helpers'
 ], function(
-    $, _, Annotator, AjaxHelpers, NotesFactory, NotesCollector, Helpers
+    $, _, sinon, Annotator, AjaxHelpers, NotesFactory, NotesCollector, Helpers
 ) {
     'use strict';
 
     describe('EdxNotes NotesCollector', function() {
+        var requests, xhrFactory;
+
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             loadFixtures('js/fixtures/edxnotes/edxnotes_wrapper.html');
             NotesCollector.cleanup();
         });
@@ -17,11 +24,11 @@ define([
                 Annotator._instances[0].destroy(); // eslint-disable-line no-underscore-dangle
             }
             NotesCollector.cleanup();
+            requests.restore();
         });
 
         it('sends single search request to fetch notes for all HTML components', function() {
-            var requests = AjaxHelpers.requests(this),
-                token = Helpers.makeToken();
+            var token = Helpers.makeToken();
 
             _.each($('.edx-notes-wrapper'), function(wrapper, index) {
                 NotesFactory.factory(wrapper, {
diff --git a/lms/static/js/spec/edxnotes/views/note_item_spec.js b/lms/static/js/spec/edxnotes/views/note_item_spec.js
index 5636c1e26f81..00e232e24534 100644
--- a/lms/static/js/spec/edxnotes/views/note_item_spec.js
+++ b/lms/static/js/spec/edxnotes/views/note_item_spec.js
@@ -1,13 +1,14 @@
 define([
-    'jquery', 'underscore', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
+    'jquery', 'underscore', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'common/js/spec_helpers/template_helpers', 'js/spec/edxnotes/helpers', 'logger',
     'js/edxnotes/models/note', 'js/edxnotes/views/note_item'
 ], function(
-    $, _, AjaxHelpers, TemplateHelpers, Helpers, Logger, NoteModel, NoteItemView
+    $, _, sinon, AjaxHelpers, TemplateHelpers, Helpers, Logger, NoteModel, NoteItemView
 ) {
     'use strict';
 
     describe('EdxNotes NoteItemView', function() {
+        var requests, xhrFactory;
         var getView = function(model, scrollToTag, formattedText) {
             model = new NoteModel(_.defaults(model || {}, {
                 id: 'id-123',
@@ -26,10 +27,19 @@ define([
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             TemplateHelpers.installTemplate('templates/edxnotes/note-item');
             spyOn(Logger, 'log').and.callThrough();
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('can be rendered properly', function() {
             var view = getView(),
                 unitLink = view.$('.reference-unit-link').get(0);
@@ -111,8 +121,7 @@ define([
         });
 
         it('should log the edx.course.student_notes.used_unit_link event properly', function() {
-            var requests = AjaxHelpers.requests(this),
-                view = getView();
+            var view = getView();
             spyOn(view, 'redirectTo');
             view.$('.reference-unit-link').click();
             expect(Logger.log).toHaveBeenCalledWith(
diff --git a/lms/static/js/spec/edxnotes/views/notes_factory_spec.js b/lms/static/js/spec/edxnotes/views/notes_factory_spec.js
index dba04d47ac2e..dfd721daa3e7 100644
--- a/lms/static/js/spec/edxnotes/views/notes_factory_spec.js
+++ b/lms/static/js/spec/edxnotes/views/notes_factory_spec.js
@@ -1,11 +1,18 @@
 define([
-    'jquery', 'underscore', 'annotator_1.2.9', 'js/edxnotes/views/notes_factory',
+    'jquery', 'underscore', 'sinon', 'annotator_1.2.9', 'js/edxnotes/views/notes_factory',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/edxnotes/utils/notes_collector', 'js/spec/edxnotes/helpers'
-], function($, _, Annotator, NotesFactory, AjaxHelpers, NotesCollector, Helpers) {
+], function($, _, sinon, Annotator, NotesFactory, AjaxHelpers, NotesCollector, Helpers) {
     'use strict';
 
     describe('EdxNotes NotesFactory', function() {
+        var requests, xhrFactory;
+
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             loadFixtures('js/fixtures/edxnotes/edxnotes_wrapper.html');
             NotesCollector.cleanup();
         });
@@ -14,11 +21,11 @@ define([
             while (Annotator._instances.length > 0) {
                 Annotator._instances[0].destroy();
             }
+            requests.restore();
         });
 
         it('can initialize annotator correctly', function(done) {
-            var requests = AjaxHelpers.requests(this),
-                token = Helpers.makeToken(),
+            var token = Helpers.makeToken(),
                 options = {
                     user: 'a user',
                     usage_id: 'an usage',
diff --git a/lms/static/js/spec/edxnotes/views/notes_page_spec.js b/lms/static/js/spec/edxnotes/views/notes_page_spec.js
index 0ab25cfa9183..4503e8045bc5 100644
--- a/lms/static/js/spec/edxnotes/views/notes_page_spec.js
+++ b/lms/static/js/spec/edxnotes/views/notes_page_spec.js
@@ -1,14 +1,20 @@
 define([
-    'jquery', 'underscore', 'common/js/spec_helpers/template_helpers',
+    'jquery', 'underscore', 'sinon', 'common/js/spec_helpers/template_helpers',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/spec/edxnotes/helpers',
     'js/edxnotes/views/page_factory'
-], function($, _, TemplateHelpers, AjaxHelpers, Helpers, NotesFactory) {
+], function($, _, sinon, TemplateHelpers, AjaxHelpers, Helpers, NotesFactory) {
     'use strict';
 
     describe('EdxNotes NotesPage', function() {
         var notes = Helpers.getDefaultNotes();
+        var requests, xhrFactory;
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             loadFixtures('js/fixtures/edxnotes/edxnotes.html');
             TemplateHelpers.installTemplates([
                 'templates/edxnotes/note-item', 'templates/edxnotes/tab-item'
@@ -16,9 +22,12 @@ define([
             this.view = new NotesFactory({notes: notes, pageSize: 10});
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('should be displayed properly', function() {
-            var requests = AjaxHelpers.requests(this),
-                tab;
+            var tab;
 
             expect(this.view.$('#view-search-results')).not.toExist();
             tab = this.view.$('#view-recent-activity');
diff --git a/lms/static/js/spec/edxnotes/views/notes_visibility_factory_spec.js b/lms/static/js/spec/edxnotes/views/notes_visibility_factory_spec.js
index 6416d9035a82..7c15813439a2 100644
--- a/lms/static/js/spec/edxnotes/views/notes_visibility_factory_spec.js
+++ b/lms/static/js/spec/edxnotes/views/notes_visibility_factory_spec.js
@@ -1,12 +1,13 @@
 define([
-    'jquery', 'underscore', 'annotator_1.2.9', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
+    'jquery', 'underscore', 'sinon', 'annotator_1.2.9', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'js/edxnotes/views/notes_visibility_factory', 'js/edxnotes/utils/notes_collector', 'js/spec/edxnotes/helpers'
 ], function(
-    $, _, Annotator, AjaxHelpers, NotesVisibilityFactory, NotesCollector, Helpers
+    $, _, sinon, Annotator, AjaxHelpers, NotesVisibilityFactory, NotesCollector, Helpers
 ) {
     'use strict';
 
     describe('EdxNotes ToggleNotesFactory', function() {
+        var requests, xhrFactory;
         var params = {
             endpoint: '/test_endpoint/',
             user: 'user12345',
@@ -17,6 +18,11 @@ define([
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             loadFixtures(
                 'js/fixtures/edxnotes/edxnotes_wrapper.html',
                 'js/fixtures/edxnotes/toggle_notes.html'
@@ -42,10 +48,10 @@ define([
             }
             $('.annotator-notice').remove();
             NotesCollector.cleanup();
+            requests.restore();
         });
 
         it('can toggle notes', function() {
-            var requests = AjaxHelpers.requests(this);
 
             expect(this.toggleVisibilityButton).not.toHaveClass('is-disabled');
             expect(this.label).toContainText('Hide notes');
@@ -85,8 +91,7 @@ define([
         });
 
         it('can handle errors', function() {
-            var requests = AjaxHelpers.requests(this),
-                $errorContainer = $('.annotator-notice');
+            var $errorContainer = $('.annotator-notice');
 
             this.toggleVisibilityButton.click();
             AjaxHelpers.respondWithError(requests);
diff --git a/lms/static/js/spec/edxnotes/views/search_box_spec.js b/lms/static/js/spec/edxnotes/views/search_box_spec.js
index a0ad28e4d9e2..33ada5f54587 100644
--- a/lms/static/js/spec/edxnotes/views/search_box_spec.js
+++ b/lms/static/js/spec/edxnotes/views/search_box_spec.js
@@ -1,16 +1,18 @@
 define([
     'jquery',
     'underscore',
+    'sinon',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'edx-ui-toolkit/js/utils/html-utils',
     'js/edxnotes/views/search_box',
     'js/edxnotes/collections/notes',
     'js/spec/edxnotes/helpers'
-], function($, _, AjaxHelpers, HtmlUtils, SearchBoxView, NotesCollection, Helpers) {
+], function($, _, sinon, AjaxHelpers, HtmlUtils, SearchBoxView, NotesCollection, Helpers) {
     'use strict';
 
     describe('EdxNotes SearchBoxView', function() {
         var getSearchBox, submitForm, assertBoxIsEnabled, assertBoxIsDisabled, searchResponse;
+        var requests, xhrFactory;
 
         searchResponse = {
             count: 2,
@@ -53,14 +55,22 @@ define([
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             loadFixtures('js/fixtures/edxnotes/edxnotes.html');
             spyOn(Logger, 'log');
             this.searchBox = getSearchBox();
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('sends a request with proper information on submit the form', function() {
-            var requests = AjaxHelpers.requests(this),
-                form = this.searchBox.el,
+            var form = this.searchBox.el,
                 request;
 
             submitForm(this.searchBox, 'test_text');
@@ -74,7 +84,6 @@ define([
         });
 
         it('returns success result', function() {
-            var requests = AjaxHelpers.requests(this);
             submitForm(this.searchBox, 'test_text');
             expect(this.searchBox.options.beforeSearchStart).toHaveBeenCalledWith(
                 'test_text'
@@ -91,7 +100,6 @@ define([
         });
 
         it('should log the edx.course.student_notes.searched event properly', function() {
-            var requests = AjaxHelpers.requests(this);
             submitForm(this.searchBox, 'test_text');
             AjaxHelpers.respondWithJson(requests, searchResponse);
 
@@ -102,7 +110,6 @@ define([
         });
 
         it('returns default error message if received data structure is wrong', function() {
-            var requests = AjaxHelpers.requests(this);
             submitForm(this.searchBox, 'test_text');
             AjaxHelpers.respondWithJson(requests, {});
             expect(this.searchBox.options.error).toHaveBeenCalledWith(
@@ -115,7 +122,6 @@ define([
         });
 
         it('returns default error message if network error occurs', function() {
-            var requests = AjaxHelpers.requests(this);
             submitForm(this.searchBox, 'test_text');
             AjaxHelpers.respondWithError(requests);
             expect(this.searchBox.options.error).toHaveBeenCalledWith(
@@ -128,7 +134,6 @@ define([
         });
 
         it('returns error message if server error occurs', function() {
-            var requests = AjaxHelpers.requests(this);
             submitForm(this.searchBox, 'test_text');
             assertBoxIsDisabled(this.searchBox);
 
@@ -150,7 +155,6 @@ define([
         });
 
         it('does not send second request during current search', function() {
-            var requests = AjaxHelpers.requests(this);
             submitForm(this.searchBox, 'test_text');
             assertBoxIsDisabled(this.searchBox);
             submitForm(this.searchBox, 'another_text');
@@ -160,7 +164,6 @@ define([
         });
 
         it('returns error message if the field is empty', function() {
-            var requests = AjaxHelpers.requests(this);
             submitForm(this.searchBox, '   ');
             expect(requests).toHaveLength(0);
             assertBoxIsEnabled(this.searchBox);
diff --git a/lms/static/js/spec/edxnotes/views/tabs/recent_activity_spec.js b/lms/static/js/spec/edxnotes/views/tabs/recent_activity_spec.js
index 55272793ee17..c9093bd6dc81 100644
--- a/lms/static/js/spec/edxnotes/views/tabs/recent_activity_spec.js
+++ b/lms/static/js/spec/edxnotes/views/tabs/recent_activity_spec.js
@@ -1,9 +1,9 @@
 define([
-    'jquery', 'common/js/spec_helpers/template_helpers', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
+    'jquery', 'sinon', 'common/js/spec_helpers/template_helpers', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'js/edxnotes/collections/notes', 'js/edxnotes/collections/tabs', 'js/edxnotes/views/tabs/recent_activity',
     'js/spec/edxnotes/helpers'
 ], function(
-    $, TemplateHelpers, AjaxHelpers, NotesCollection, TabsCollection, RecentActivityView, Helpers
+    $, sinon, TemplateHelpers, AjaxHelpers, NotesCollection, TabsCollection, RecentActivityView, Helpers
 ) {
     'use strict';
 
@@ -36,7 +36,8 @@ define([
                     }
                 ]
             },
-            getView, tabInfo, recentActivityTabId;
+            getView, tabInfo, recentActivityTabId,
+            requests, xhrFactory;
 
         getView = function(collection, tabsCollection, options) {
             var view;
@@ -66,6 +67,11 @@ define([
         recentActivityTabId = '#recent-panel';
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             loadFixtures('js/fixtures/edxnotes/edxnotes.html');
             TemplateHelpers.installTemplates([
                 'templates/edxnotes/note-item', 'templates/edxnotes/tab-item'
@@ -76,6 +82,10 @@ define([
             this.tabsCollection = new TabsCollection();
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('displays a tab and content with proper data and order', function() {
             var view = getView(this.collection, this.tabsCollection);
             Helpers.verifyPaginationInfo(view, 'Showing 1-3 out of 3 total', true, 1, 1);
@@ -100,7 +110,6 @@ define([
         });
 
         it('can go to a page number', function() {
-            var requests = AjaxHelpers.requests(this);
             // eslint-disable-next-line no-shadow
             var notes = Helpers.createNotesData(
                 {
@@ -141,7 +150,6 @@ define([
         });
 
         it('can navigate forward and backward', function() {
-            var requests = AjaxHelpers.requests(this);
             var page1Notes = Helpers.createNotesData(
                 {
                     numNotesToCreate: 10,
@@ -188,7 +196,6 @@ define([
         });
 
         it('sends correct page size value', function() {
-            var requests = AjaxHelpers.requests(this);
             // eslint-disable-next-line no-shadow
             var notes = Helpers.createNotesData(
                 {
diff --git a/lms/static/js/spec/edxnotes/views/tabs/search_results_spec.js b/lms/static/js/spec/edxnotes/views/tabs/search_results_spec.js
index 74f94c2273b5..e44194fe47a1 100644
--- a/lms/static/js/spec/edxnotes/views/tabs/search_results_spec.js
+++ b/lms/static/js/spec/edxnotes/views/tabs/search_results_spec.js
@@ -1,10 +1,10 @@
 define([
-    'jquery', 'underscore', 'common/js/spec_helpers/template_helpers',
+    'jquery', 'underscore', 'sinon', 'common/js/spec_helpers/template_helpers',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'logger', 'js/edxnotes/collections/tabs', 'js/edxnotes/views/tabs/search_results',
     'js/spec/edxnotes/helpers'
 ], function(
-    $, _, TemplateHelpers, AjaxHelpers, Logger, TabsCollection, SearchResultsView, Helpers
+    $, _, sinon, TemplateHelpers, AjaxHelpers, Logger, TabsCollection, SearchResultsView, Helpers
 ) {
     'use strict';
 
@@ -38,7 +38,8 @@ define([
                 previous: null,
                 results: notes
             },
-            getView, submitForm, tabInfo, searchResultsTabId;
+            getView, submitForm, tabInfo, searchResultsTabId,
+            requests, xhrFactory;
 
         getView = function(tabsCollection, perPage, options) {
             options = _.defaults(options || {}, {
@@ -70,6 +71,11 @@ define([
         searchResultsTabId = '#search-results-panel';
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             loadFixtures('js/fixtures/edxnotes/edxnotes.html');
             TemplateHelpers.installTemplates([
                 'templates/edxnotes/note-item', 'templates/edxnotes/tab-item'
@@ -78,6 +84,10 @@ define([
             this.tabsCollection = new TabsCollection();
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('does not create a tab and content on initialization', function() {
             var view = getView(this.tabsCollection);
             expect(this.tabsCollection).toHaveLength(0);
@@ -85,8 +95,7 @@ define([
         });
 
         it('displays a tab and content on search with proper data and order', function() {
-            var view = getView(this.tabsCollection),
-                requests = AjaxHelpers.requests(this);
+            var view = getView(this.tabsCollection);
 
             submitForm(view.searchBox, 'second');
             Helpers.respondToRequest(requests, responseJson, true);
@@ -95,8 +104,7 @@ define([
         });
 
         it('displays loading indicator when search is running', function() {
-            var view = getView(this.tabsCollection),
-                requests = AjaxHelpers.requests(this);
+            var view = getView(this.tabsCollection);
 
             submitForm(view.searchBox, 'test query');
             expect(view.$('.ui-loading')).not.toHaveClass('is-hidden');
@@ -109,8 +117,7 @@ define([
         });
 
         it('displays no results message', function() {
-            var view = getView(this.tabsCollection),
-                requests = AjaxHelpers.requests(this);
+            var view = getView(this.tabsCollection);
 
             submitForm(view.searchBox, 'some text');
             Helpers.respondToRequest(requests, _.extend(_.clone(responseJson), {count: 0, results: []}), true);
@@ -124,8 +131,7 @@ define([
         });
 
         it('does not send an additional request on switching between tabs', function() {
-            var view = getView(this.tabsCollection),
-                requests = AjaxHelpers.requests(this);
+            var view = getView(this.tabsCollection);
 
             spyOn(Logger, 'log');
             submitForm(view.searchBox, 'test_query');
@@ -144,8 +150,7 @@ define([
         });
 
         it('can clear search results if tab is closed', function() {
-            var view = getView(this.tabsCollection),
-                requests = AjaxHelpers.requests(this);
+            var view = getView(this.tabsCollection);
             spyOn(view.searchBox, 'clearInput').and.callThrough();
 
             submitForm(view.searchBox, 'test_query');
@@ -157,8 +162,7 @@ define([
         });
 
         it('can correctly show/hide error messages', function() {
-            var view = getView(this.tabsCollection),
-                requests = AjaxHelpers.requests(this);
+            var view = getView(this.tabsCollection);
 
             submitForm(view.searchBox, 'test error');
 
@@ -181,7 +185,6 @@ define([
 
         it('can correctly update search results', function() {
             var view = getView(this.tabsCollection),
-                requests = AjaxHelpers.requests(this),
                 newNotes = [{
                     created: 'December 11, 2014 at 11:10AM',
                     updated: 'December 11, 2014 at 11:10AM',
@@ -213,7 +216,6 @@ define([
 
         it('will not render header and footer if there are no notes', function() {
             var view = getView(this.tabsCollection),
-                requests = AjaxHelpers.requests(this),
                 // eslint-disable-next-line no-shadow
                 notes = {
                     count: 0,
@@ -232,7 +234,6 @@ define([
 
         it('can go to a page number', function() {
             var view = getView(this.tabsCollection),
-                requests = AjaxHelpers.requests(this),
                 // eslint-disable-next-line no-shadow
                 notes = Helpers.createNotesData(
                     {
@@ -271,8 +272,7 @@ define([
         });
 
         it('can navigate forward and backward', function() {
-            var requests = AjaxHelpers.requests(this),
-                page1Notes = Helpers.createNotesData(
+            var page1Notes = Helpers.createNotesData(
                     {
                         numNotesToCreate: 10,
                         count: 15,
@@ -318,8 +318,7 @@ define([
         });
 
         it('sends correct page size value', function() {
-            var requests = AjaxHelpers.requests(this),
-                view = getView(this.tabsCollection, 5);
+            var view = getView(this.tabsCollection, 5);
 
             submitForm(view.searchBox, 'awesome');
             Helpers.verifyRequestParams(
diff --git a/lms/static/js/spec/groups/views/cohorts_spec.js b/lms/static/js/spec/groups/views/cohorts_spec.js
index 0a1e75f9c447..baabcdf87a38 100644
--- a/lms/static/js/spec/groups/views/cohorts_spec.js
+++ b/lms/static/js/spec/groups/views/cohorts_spec.js
@@ -1,12 +1,12 @@
 /* globals _ */
 
-define(['backbone', 'jquery', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
+define(['backbone', 'jquery', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'common/js/spec_helpers/template_helpers',
     'js/groups/views/cohorts', 'js/groups/collections/cohort', 'js/groups/models/content_group',
     'js/groups/models/course_cohort_settings', 'js/utils/animation', 'js/vendor/jquery.qubit',
     'js/groups/views/course_cohort_settings_notification'
 ],
-function(Backbone, $, AjaxHelpers, TemplateHelpers, CohortsView, CohortCollection, ContentGroupModel,
+function(Backbone, $, sinon, AjaxHelpers, TemplateHelpers, CohortsView, CohortCollection, ContentGroupModel,
     CourseCohortSettingsModel, AnimationUtil, Qubit, CourseCohortSettingsNotificationView) {
     'use strict';
 
@@ -17,7 +17,7 @@ function(Backbone, $, AjaxHelpers, TemplateHelpers, CohortsView, CohortCollectio
             notAllowedUserMessage,
             invalidEmailMessage, createMockCohort, createMockCohorts, createMockContentGroups,
             createMockCohortSettingsJson,
-            createCohortsView, cohortsView, requests, respondToRefresh, verifyMessage, verifyNoMessage,
+            createCohortsView, cohortsView, requests, xhrFactory, respondToRefresh, verifyMessage, verifyNoMessage,
             verifyDetailedMessage, verifyHeader,
             expectCohortAddRequest, getAddModal, selectContentGroup, clearContentGroup,
             saveFormAndExpectErrors, createMockCohortSettings, MOCK_COHORTED_USER_PARTITION_ID,
@@ -85,7 +85,6 @@ function(Backbone, $, AjaxHelpers, TemplateHelpers, CohortsView, CohortCollectio
             cohortSettings.url = '/mock_service/cohorts/settings';
             cohorts.url = '/mock_service/cohorts';
 
-            requests = AjaxHelpers.requests(test);
             cohortsView = new CohortsView({
                 model: cohorts,
                 contentGroups: contentGroups,
@@ -215,6 +214,11 @@ function(Backbone, $, AjaxHelpers, TemplateHelpers, CohortsView, CohortCollectio
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             setFixtures('<ul class="instructor-nav">'
                     + '<li class="nav-item"><button type="button" data-section="cohort_management" '
                     + 'class="active-section">Cohort Management</button></li></ul><div></div>'
@@ -229,6 +233,10 @@ function(Backbone, $, AjaxHelpers, TemplateHelpers, CohortsView, CohortCollectio
             TemplateHelpers.installTemplate('templates/file-upload');
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('shows an error if no cohorts are defined', function() {
             createCohortsView(this, {cohorts: []});
             verifyMessage(
diff --git a/lms/static/js/spec/groups/views/discussions_spec.js b/lms/static/js/spec/groups/views/discussions_spec.js
index ca872911427d..e386de07e3f4 100644
--- a/lms/static/js/spec/groups/views/discussions_spec.js
+++ b/lms/static/js/spec/groups/views/discussions_spec.js
@@ -1,14 +1,14 @@
-define(['backbone', 'jquery', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
+define(['backbone', 'jquery', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'common/js/spec_helpers/template_helpers',
     'js/discussions_management/views/discussions', 'js/discussions_management/models/course_discussions_detail',
     'js/discussions_management/models/course_discussions_settings'
 ],
-function(Backbone, $, AjaxHelpers, TemplateHelpers, DiscussionsView, CourseDiscussionTopicDetailsModel,
+function(Backbone, $, sinon, AjaxHelpers, TemplateHelpers, DiscussionsView, CourseDiscussionTopicDetailsModel,
     CourseDiscussionsSettingsModel) {
     'use strict';
 
     describe('Discussions View', function() {
-        var createMockDiscussionsSettingsJson, createDiscussionsView, discussionsView, requests, verifyMessage,
+        var createMockDiscussionsSettingsJson, createDiscussionsView, discussionsView, requests, xhrFactory, verifyMessage,
             createMockDiscussionsSettings, createMockDiscussionsJson, createMockDiscussions,
             showAndAssertDiscussionTopics;
 
@@ -111,7 +111,6 @@ function(Backbone, $, AjaxHelpers, TemplateHelpers, DiscussionsView, CourseDiscu
             dividedDiscussions = discussionOptions.dividedDiscussions || createMockDiscussions();
             dividedDiscussions.url = '/mock_service/discussion/topics';
 
-            requests = AjaxHelpers.requests(test);
             discussionsView = new DiscussionsView({
                 el: $('.discussions-management'),
                 discussionSettings: discussionSettings,
@@ -147,6 +146,11 @@ function(Backbone, $, AjaxHelpers, TemplateHelpers, DiscussionsView, CourseDiscu
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             setFixtures('<ul class="instructor-nav">'
                     + '<li class="nav-item"><button type="button" data-section="discussion_management" '
                     + 'class="active-section">Discussions</button></li></ul><div></div>'
@@ -167,6 +171,10 @@ function(Backbone, $, AjaxHelpers, TemplateHelpers, DiscussionsView, CourseDiscu
             TemplateHelpers.installTemplate('templates/instructor/instructor_dashboard_2/notification');
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         describe('Discussion Topics', function() {
             var courseWideView, assertDividedTopics;
 
diff --git a/lms/static/js/spec/instructor_dashboard/certificates_exception_spec.js b/lms/static/js/spec/instructor_dashboard/certificates_exception_spec.js
index a48fa9f6fa37..a97a36998d3d 100644
--- a/lms/static/js/spec/instructor_dashboard/certificates_exception_spec.js
+++ b/lms/static/js/spec/instructor_dashboard/certificates_exception_spec.js
@@ -54,7 +54,8 @@ function($, sinon, AjaxHelpers, CertificateExceptionModel, CertificateAllowlistV
 
     describe('edx.certificates.collections.certificate_allowlist.CertificateAllowlist', function() {
         var certificateAllowlist = null,
-            certificateExceptionUrl = 'test/url/';
+            certificateExceptionUrl = 'test/url/',
+            requests, xhrFactory;
         var certificatesExceptionsJson = [
             {
                 id: 1,
@@ -77,6 +78,11 @@ function($, sinon, AjaxHelpers, CertificateExceptionModel, CertificateAllowlistV
         ];
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             certificateAllowlist = new CertificateAllowlistCollection(certificatesExceptionsJson, {
                 parse: true,
                 canBeEmpty: true,
@@ -85,6 +91,10 @@ function($, sinon, AjaxHelpers, CertificateExceptionModel, CertificateAllowlistV
             });
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('has 2 models in the collection after initialization', function() {
             expect(certificateAllowlist.models.length).toEqual(2);
         });
@@ -126,7 +136,6 @@ function($, sinon, AjaxHelpers, CertificateExceptionModel, CertificateAllowlistV
         it('sends empty certificate exceptions list if no model is added', function() {
             var successCallback = sinon.spy(),
                 errorCallback = sinon.spy(),
-                requests = AjaxHelpers.requests(this),
                 addStudents = 'all';
             var expected = {
                 url: certificateExceptionUrl + addStudents,
@@ -140,7 +149,6 @@ function($, sinon, AjaxHelpers, CertificateExceptionModel, CertificateAllowlistV
         it('syncs only newly added models with the server', function() {
             var successCallback = sinon.spy(),
                 errorCallback = sinon.spy(),
-                requests = AjaxHelpers.requests(this),
                 addStudents = 'new',
                 expected;
 
@@ -293,7 +301,8 @@ function($, sinon, AjaxHelpers, CertificateExceptionModel, CertificateAllowlistV
     describe('edx.certificates.views.certificate_allowlist_editor.CertificateAllowlistEditorView', function() {
         var view = null,
             listView = null,
-            certificateExceptionUrl = 'test/url/';
+            certificateExceptionUrl = 'test/url/',
+            requests, xhrFactory;
         var certificatesExceptionsJson = [
             {
                 url: certificateExceptionUrl,
@@ -319,6 +328,11 @@ function($, sinon, AjaxHelpers, CertificateExceptionModel, CertificateAllowlistV
         ];
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             var fixture, fixture2, certificateAllowlist;
             setFixtures();
 
@@ -357,6 +371,10 @@ function($, sinon, AjaxHelpers, CertificateExceptionModel, CertificateAllowlistV
             listView.render();
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('verifies view is initialized and rendered successfully', function() {
             expect(view).not.toBe(undefined);
             expect(view.$el.find('#certificate-exception').length).toBe(1);
@@ -368,7 +386,6 @@ function($, sinon, AjaxHelpers, CertificateExceptionModel, CertificateAllowlistV
             var messageSelector = '.message',
                 successMessage = 'test_user has been successfully added to the exception list. Click Generate'
                         + ' Exception Certificate below to send the certificate.',
-                requests = AjaxHelpers.requests(this),
                 duplicateUser = 'test_user';
 
             var errorMessages = {
@@ -417,8 +434,7 @@ function($, sinon, AjaxHelpers, CertificateExceptionModel, CertificateAllowlistV
         it('verifies certificate exception can be deleted by clicking "delete" ', function() {
             var username = 'test1',
                 certificateExceptionSelector = "div.allowlisted-students table tr:contains('" + username + "')",
-                deleteBtnSelector = certificateExceptionSelector + ' td .delete-exception',
-                requests = AjaxHelpers.requests(this);
+                deleteBtnSelector = certificateExceptionSelector + ' td .delete-exception';
 
             $(deleteBtnSelector).click();
             AjaxHelpers.respondWithJson(requests, {});
diff --git a/lms/static/js/spec/instructor_dashboard/certificates_invalidation_spec.js b/lms/static/js/spec/instructor_dashboard/certificates_invalidation_spec.js
index bedb7c970aba..3fb517a1fa5c 100644
--- a/lms/static/js/spec/instructor_dashboard/certificates_invalidation_spec.js
+++ b/lms/static/js/spec/instructor_dashboard/certificates_invalidation_spec.js
@@ -1,12 +1,13 @@
 /* global define */
 define([
     'jquery',
+    'sinon',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'js/certificates/models/certificate_invalidation',
     'js/certificates/views/certificate_invalidation_view',
     'js/certificates/collections/certificate_invalidation_collection'
 ],
-function($, AjaxHelpers, CertificateInvalidationModel, CertificateInvalidationView,
+function($, sinon, AjaxHelpers, CertificateInvalidationModel, CertificateInvalidationView,
     CertificateInvalidationCollection) {
     'use strict';
 
@@ -99,7 +100,8 @@ function($, AjaxHelpers, CertificateInvalidationModel, CertificateInvalidationVi
             invalidate_button = null,
             duplicate_user = 'test2',
             new_user = 'test4@test.com',
-            requests = null;
+            requests = null,
+            xhrFactory = null;
 
         var messages = {
             error: {
@@ -163,7 +165,15 @@ function($, AjaxHelpers, CertificateInvalidationModel, CertificateInvalidationVi
             notes_field = $('#certificate-invalidation-notes');
             invalidate_button = $('#invalidate-certificate');
 
-            requests = AjaxHelpers.requests(this);
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
+        });
+
+        afterEach(function() {
+            requests.restore();
         });
 
         it('verifies view is initialized and rendered successfully', function() {
diff --git a/lms/static/js/spec/instructor_dashboard/certificates_spec.js b/lms/static/js/spec/instructor_dashboard/certificates_spec.js
index e0558d558337..b2e1df912638 100644
--- a/lms/static/js/spec/instructor_dashboard/certificates_spec.js
+++ b/lms/static/js/spec/instructor_dashboard/certificates_spec.js
@@ -1,16 +1,18 @@
 /* global define, onCertificatesReady */
 define([
     'jquery',
+    'sinon',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'js/instructor_dashboard/certificates'
 ],
-function($, AjaxHelpers) {
+function($, sinon, AjaxHelpers) {
     'use strict';
 
     describe('edx.instructor_dashboard.certificates.regenerate_certificates', function() {
         var $regenerate_certificates_button = null,
             $certificate_regeneration_status = null,
-            requests = null;
+            requests = null,
+            xhrFactory = null;
         var MESSAGES = {
             success_message: 'Certificate regeneration task has been started. '
                     + 'You can view the status of the generation task in the "Pending Tasks" section.',
@@ -62,7 +64,15 @@ function($, AjaxHelpers) {
             onCertificatesReady();
             $regenerate_certificates_button = $('#btn-start-regenerating-certificates');
             $certificate_regeneration_status = $('.certificate-regeneration-status');
-            requests = AjaxHelpers.requests(this);
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
+        });
+
+        afterEach(function() {
+            requests.restore();
         });
 
         it('does not regenerate certificates if user cancels operation in confirm popup', function() {
diff --git a/lms/static/js/spec/instructor_dashboard/membership_auth_spec.js b/lms/static/js/spec/instructor_dashboard/membership_auth_spec.js
index 0d4ba1bb273f..2eaaea35458b 100644
--- a/lms/static/js/spec/instructor_dashboard/membership_auth_spec.js
+++ b/lms/static/js/spec/instructor_dashboard/membership_auth_spec.js
@@ -1,13 +1,16 @@
 /* global define, Membership */
 define(['jquery',
+    'sinon',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'js/instructor_dashboard/membership'],
-function($, AjaxHelpers) {
+function($, sinon, AjaxHelpers) {
     'use strict';
 
     describe('Membership.AuthListWidget', function() {
         var membership, // eslint-disable-line no-unused-vars
-            changeSelectedList;
+            changeSelectedList,
+            requests,
+            xhrFactory;
 
         changeSelectedList = function(listName) {
             var i, options;
@@ -22,6 +25,11 @@ function($, AjaxHelpers) {
         };
 
         beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
             var membershipMain, membershipTpl;
             membershipMain = readFixtures('js/fixtures/instructor_dashboard/membership.html');
             membershipTpl = readFixtures(
@@ -34,9 +42,12 @@ function($, AjaxHelpers) {
             membership = new window.InstructorDashboard.sections.Membership($('#membership'));
         });
 
+        afterEach(function() {
+            requests.restore();
+        });
+
         it('binds the ajax call and the result will be success for Group Moderator', function() {
-            var requests = AjaxHelpers.requests(this),
-                data,
+            var data,
                 url = '/courses/course-v1:edx+ed202+2017_T3/instructor/api/list_forum_members';
 
             data = {
@@ -66,7 +77,6 @@ function($, AjaxHelpers) {
 
         it('Error message is shown if user with given identifier does not exist', function() {
             var url, params;
-            var requests = AjaxHelpers.requests(this);
             $('.active .add-field').val('smth');
             $('.active .add').click();
             expect(requests.length).toEqual(1);
@@ -90,8 +100,7 @@ function($, AjaxHelpers) {
         });
 
         it('When no discussions division scheme is selected error is shown and inputs are disabled', function() {
-            var requests = AjaxHelpers.requests(this),
-                data,
+            var data,
                 url = '/courses/course-v1:edx+ed202+2017_T3/instructor/api/list_forum_members';
 
             data = {
diff --git a/lms/static/js/spec/instructor_dashboard/student_admin_spec.js b/lms/static/js/spec/instructor_dashboard/student_admin_spec.js
index a4314228e006..efaedc646caf 100644
--- a/lms/static/js/spec/instructor_dashboard/student_admin_spec.js
+++ b/lms/static/js/spec/instructor_dashboard/student_admin_spec.js
@@ -1,12 +1,12 @@
 /* globals _, interpolate_text, statusAjaxError, PendingInstructorTasks, createTaskListTable */
-define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers'],
-    function($, StudentAdmin, AjaxHelpers) {
+define(['jquery', 'sinon', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers'],
+    function($, sinon, StudentAdmin, AjaxHelpers) {
         // 'js/instructor_dashboard/student_admin'
 
         'use strict';
 
         describe('edx.instructor_dashboard.student_admin.StudentAdmin', function() {
-            var studentadmin, dashboardApiUrl, uniqStudentIdentifier, alertMsg;
+            var studentadmin, dashboardApiUrl, uniqStudentIdentifier, alertMsg, requests, xhrFactory;
 
             beforeEach(function() {
                 loadFixtures('js/fixtures/instructor_dashboard/student_admin.html');
@@ -23,6 +23,15 @@ define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/ut
                 spyOn(window, 'alert').and.callFake(function(message) {
                     alertMsg = message;
                 });
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
+            });
+
+            afterEach(function() {
+                requests.restore();
             });
 
             it('initiates resetting of entrance exam when button is clicked', function() {
@@ -32,9 +41,6 @@ define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/ut
                 });
                 var url = dashboardApiUrl + '/reset_student_attempts_for_entrance_exam';
 
-                // Spy on AJAX requests
-                var requests = AjaxHelpers.requests(this);
-
                 // Verify that the client contacts the server to start instructor task
                 var params = $.param({
                     unique_student_identifier: uniqStudentIdentifier,
@@ -61,8 +67,6 @@ define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/ut
 
             it('shows an error when resetting of entrance exam fails', function() {
                 var url = dashboardApiUrl + '/reset_student_attempts_for_entrance_exam';
-                // Spy on AJAX requests
-                var requests = AjaxHelpers.requests(this);
                 // Verify that the client contacts the server to start instructor task
                 var params = $.param({
                     unique_student_identifier: uniqStudentIdentifier,
@@ -92,8 +96,6 @@ define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/ut
                 });
                 var url = dashboardApiUrl + '/rescore_entrance_exam';
 
-                // Spy on AJAX requests
-                var requests = AjaxHelpers.requests(this);
                 // Verify that the client contacts the server to start instructor task
                 var params = $.param({
                     unique_student_identifier: uniqStudentIdentifier,
@@ -120,8 +122,6 @@ define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/ut
 
             it('shows an error when entrance exam rescoring fails', function() {
                 var url = dashboardApiUrl + '/rescore_entrance_exam';
-                // Spy on AJAX requests
-                var requests = AjaxHelpers.requests(this);
                 // Verify that the client contacts the server to start instructor task
                 var params = $.param({
                     unique_student_identifier: uniqStudentIdentifier,
@@ -153,9 +153,6 @@ define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/ut
                 });
                 var url = dashboardApiUrl + '/mark_student_can_skip_entrance_exam';
 
-                // Spy on AJAX requests
-                var requests = AjaxHelpers.requests(this);
-
                 studentadmin.$btn_skip_entrance_exam.click();
                 // expect error to be shown since student identifier is not set
                 expect(studentadmin.$request_err_ee.text()).toEqual(
@@ -177,8 +174,6 @@ define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/ut
             });
 
             it('shows an error when skip entrance exam fails', function() {
-                // Spy on AJAX requests
-                var requests = AjaxHelpers.requests(this);
                 var url = dashboardApiUrl + '/mark_student_can_skip_entrance_exam';
                 var errorMessage = "An error occurred. Make sure that the student's username or email address is correct and try again."; //  eslint-disable-line max-len
                 studentadmin.$field_exam_grade.val(uniqStudentIdentifier);
@@ -201,8 +196,6 @@ define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/ut
                 });
                 var url = dashboardApiUrl + '/reset_student_attempts_for_entrance_exam';
 
-                // Spy on AJAX requests
-                var requests = AjaxHelpers.requests(this);
                 // Verify that the client contacts the server to start instructor task
                 var params = $.param({
                     unique_student_identifier: uniqStudentIdentifier,
@@ -228,8 +221,6 @@ define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/ut
 
             it('shows an error when delete student state for entrance exam fails', function() {
                 var url = dashboardApiUrl + '/reset_student_attempts_for_entrance_exam';
-                // Spy on AJAX requests
-                var requests = AjaxHelpers.requests(this);
                 var params = $.param({
                     unique_student_identifier: uniqStudentIdentifier,
                     delete_module: true
@@ -253,8 +244,6 @@ define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/ut
             it('initiates listing of entrance exam task history when button is clicked', function() {
                 var url = dashboardApiUrl + '/list_entrance_exam_instructor_tasks';
 
-                // Spy on AJAX requests
-                var requests = AjaxHelpers.requests(this);
                 var params = $.param({
                     unique_student_identifier: uniqStudentIdentifier
                 });
@@ -290,8 +279,6 @@ define(['jquery', 'js/instructor_dashboard/student_admin', 'edx-ui-toolkit/js/ut
 
             it('shows an error when listing entrance exam task history fails', function() {
                 var url = dashboardApiUrl + '/list_entrance_exam_instructor_tasks';
-                // Spy on AJAX requests
-                var requests = AjaxHelpers.requests(this);
                 var params = $.param({
                     unique_student_identifier: uniqStudentIdentifier
                 });
diff --git a/lms/static/js/spec/shoppingcart/shoppingcart_spec.js b/lms/static/js/spec/shoppingcart/shoppingcart_spec.js
index e600bcc73e95..66a1e4618a6d 100644
--- a/lms/static/js/spec/shoppingcart/shoppingcart_spec.js
+++ b/lms/static/js/spec/shoppingcart/shoppingcart_spec.js
@@ -1,10 +1,11 @@
-define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/shoppingcart/shoppingcart'],
-    function(AjaxHelpers) {
+define(['sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/shoppingcart/shoppingcart'],
+    function(sinon, AjaxHelpers) {
         'use strict';
 
         describe('edx.shoppingcart.showcart.CartView', function() {
             var view = null;
             var requests = null;
+            var xhrFactory = null;
 
             beforeEach(function() {
                 setFixtures('<section class="wrapper confirm-enrollment shopping-cart cart-view"><form action="" method="post"><input type="hidden" name="" value="" /><span class="icon fa fa-caret-right"></span><input type="submit" value="Payment"/></form></section>'); // eslint-disable-line max-len
@@ -15,8 +16,11 @@ define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/shoppingcart/sh
 
                 spyOn(view, 'responseFromServer').and.callFake(function() {});
 
-                // Spy on AJAX requests
-                requests = AjaxHelpers.requests(this);
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
 
                 view.submit();
 
@@ -27,6 +31,10 @@ define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/shoppingcart/sh
                 );
             });
 
+            afterEach(function() {
+                requests.restore();
+            });
+
             it('cart has invalid items, course enrollment has been closed', function() {
                 // Simulate a response from the server containing the
                 // parameter 'is_course_enrollment_closed'. This decides that
diff --git a/lms/static/js/spec/staff_debug_actions_spec.js b/lms/static/js/spec/staff_debug_actions_spec.js
index dc605d75f974..6a0a4b1994f4 100644
--- a/lms/static/js/spec/staff_debug_actions_spec.js
+++ b/lms/static/js/spec/staff_debug_actions_spec.js
@@ -1,10 +1,11 @@
 define([
     'backbone',
     'jquery',
+    'sinon',
     'js/staff_debug_actions',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers'
 ],
-function(Backbone, $, tmp, AjaxHelpers) {
+function(Backbone, $, sinon, tmp, AjaxHelpers) {
     'use strict';
 
     var StaffDebug = window.StaffDebug;
@@ -23,6 +24,19 @@ function(Backbone, $, tmp, AjaxHelpers) {
         var esclocationName = 'P2:problem_1';
         var escapableId = 'result_' + esclocationName;
         var $escapableResultArea = $('<div>', {id: escapableId});
+        var requests, xhrFactory;
+
+        beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
+        });
+
+        afterEach(function() {
+            requests.restore();
+        });
 
         describe('getURL ', function() {
             it('defines url to courseware ajax entry point', function() {
@@ -83,7 +97,6 @@ function(Backbone, $, tmp, AjaxHelpers) {
         describe('doInstructorDashAction success', function() {
             it('adds a success message to the results element after using an action', function() {
                 $('body').append($escapableResultArea);
-                var requests = AjaxHelpers.requests(this);
                 var action = {
                     courseId: courseId,
                     locationName: esclocationName,
@@ -98,7 +111,6 @@ function(Backbone, $, tmp, AjaxHelpers) {
         describe('doInstructorDashAction error', function() {
             it('adds a failure message to the results element after using an action', function() {
                 $('body').append($escapableResultArea);
-                var requests = AjaxHelpers.requests(this);
                 var action = {
                     courseId: courseId,
                     locationName: esclocationName,
diff --git a/lms/static/js/spec/student_account/access_spec.js b/lms/static/js/spec/student_account/access_spec.js
index 142fa1fb4a1e..622f6346ff0a 100644
--- a/lms/static/js/spec/student_account/access_spec.js
+++ b/lms/static/js/spec/student_account/access_spec.js
@@ -5,6 +5,7 @@
         'jquery',
         'underscore',
         'backbone',
+        'sinon',
         'common/js/spec_helpers/template_helpers',
         'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
         'js/student_account/views/AccessView',
@@ -13,10 +14,11 @@
         'js/student_account/shoppingcart',
         'js/student_account/emailoptin'
     ],
-    function($, _, Backbone, TemplateHelpers, AjaxHelpers, AccessView, FormView, EnrollmentInterface,
+    function($, _, Backbone, sinon, TemplateHelpers, AjaxHelpers, AccessView, FormView, EnrollmentInterface,
         ShoppingCartInterface) {
         describe('edx.student.account.AccessView', function() {
             var requests = null,
+                xhrFactory = null,
                 view = null,
                 FORM_DESCRIPTION = {
                     method: 'post',
@@ -72,9 +74,6 @@
                     },
                     $logistrationElement = $('#login-and-registration-container');
 
-                // Spy on AJAX requests
-                requests = AjaxHelpers.requests(that);
-
                 // Initialize the access view
                 view = new AccessView(_.extend(options, {el: $logistrationElement}));
 
@@ -114,10 +113,16 @@
 
                 // Stub analytics tracking
                 window.analytics = jasmine.createSpyObj('analytics', ['track', 'page', 'pageview', 'trackLink']);
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
             });
 
             afterEach(function() {
                 Backbone.history.stop();
+                requests.restore();
             });
 
             it('can initially display the login form', function() {
diff --git a/lms/static/js/spec/student_account/emailoptin_spec.js b/lms/static/js/spec/student_account/emailoptin_spec.js
index c13e77931958..3932d276a1c9 100644
--- a/lms/static/js/spec/student_account/emailoptin_spec.js
+++ b/lms/static/js/spec/student_account/emailoptin_spec.js
@@ -1,15 +1,26 @@
-define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/student_account/emailoptin'],
-    function(AjaxHelpers, EmailOptInInterface) {
+define(['sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/student_account/emailoptin'],
+    function(sinon, AjaxHelpers, EmailOptInInterface) {
         'use strict';
 
         describe('EmailOptInInterface', function() {
             var COURSE_KEY = 'edX/DemoX/Fall',
                 EMAIL_OPT_IN = 'True',
-                EMAIL_OPT_IN_URL = '/api/user/v1/preferences/email_opt_in/';
+                EMAIL_OPT_IN_URL = '/api/user/v1/preferences/email_opt_in/',
+                requests, xhrFactory;
+
+            beforeEach(function() {
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
+            });
+
+            afterEach(function() {
+                requests.restore();
+            });
 
             it('Opts in for organization emails', function() {
-                // Spy on Ajax requests
-                var requests = AjaxHelpers.requests(this);
 
                 // Attempt to enroll the user
                 EmailOptInInterface.setPreference(COURSE_KEY, EMAIL_OPT_IN);
diff --git a/lms/static/js/spec/student_account/enrollment_spec.js b/lms/static/js/spec/student_account/enrollment_spec.js
index 1467b061d31d..bd83b47a5edd 100644
--- a/lms/static/js/spec/student_account/enrollment_spec.js
+++ b/lms/static/js/spec/student_account/enrollment_spec.js
@@ -1,22 +1,29 @@
-define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/student_account/enrollment'],
-    function(AjaxHelpers, EnrollmentInterface) {
+define(['sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/student_account/enrollment'],
+    function(sinon, AjaxHelpers, EnrollmentInterface) {
         'use strict';
 
         describe('EnrollmentInterface', function() {
             var COURSE_KEY = 'edX/DemoX/Fall',
                 ENROLL_URL = '/api/commerce/v0/baskets/',
                 FORWARD_URL = '/course_modes/choose/edX/DemoX/Fall/',
-                EMBARGO_MSG_URL = '/embargo/blocked-message/enrollment/default/';
+                EMBARGO_MSG_URL = '/embargo/blocked-message/enrollment/default/',
+                requests, xhrFactory;
 
             beforeEach(function() {
                 // Mock the redirect call
                 spyOn(EnrollmentInterface, 'redirect').and.callFake(function() {});
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
             });
 
-            it('enrolls a user in a course', function() {
-                // Spy on Ajax requests
-                var requests = AjaxHelpers.requests(this);
+            afterEach(function() {
+                requests.restore();
+            });
 
+            it('enrolls a user in a course', function() {
                 // Attempt to enroll the user
                 EnrollmentInterface.enroll(COURSE_KEY, FORWARD_URL);
 
@@ -36,9 +43,6 @@ define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/student_account
             });
 
             it('redirects the user if enrollment fails', function() {
-                // Spy on Ajax requests
-                var requests = AjaxHelpers.requests(this);
-
                 // Attempt to enroll the user
                 EnrollmentInterface.enroll(COURSE_KEY, FORWARD_URL);
 
@@ -50,9 +54,6 @@ define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/student_account
             });
 
             it('redirects the user if blocked by an embargo', function() {
-                // Spy on Ajax requests
-                var requests = AjaxHelpers.requests(this);
-
                 // Attempt to enroll the user
                 EnrollmentInterface.enroll(COURSE_KEY, FORWARD_URL);
 
diff --git a/lms/static/js/spec/student_account/finish_auth_spec.js b/lms/static/js/spec/student_account/finish_auth_spec.js
index b440ca4e458e..9af9d3dbe385 100644
--- a/lms/static/js/spec/student_account/finish_auth_spec.js
+++ b/lms/static/js/spec/student_account/finish_auth_spec.js
@@ -4,6 +4,7 @@
     define([
         'jquery',
         'jquery.url',
+        'sinon',
         'utility',
         'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
         'js/student_account/views/FinishAuthView',
@@ -11,17 +12,16 @@
         'js/student_account/shoppingcart',
         'js/student_account/emailoptin'
     ],
-    function($, url, utility, AjaxHelpers, FinishAuthView, EnrollmentInterface, ShoppingCartInterface,
+    function($, url, sinon, utility, AjaxHelpers, FinishAuthView, EnrollmentInterface, ShoppingCartInterface,
         EmailOptInInterface) {
         describe('FinishAuthView', function() {
             var requests = null,
                 view = null,
+                xhrFactory = null,
                 FORWARD_URL = '/courseware/next',
                 COURSE_KEY = 'course-v1:edX+test+15';
 
-            var ajaxSpyAndInitialize = function(that) {
-                // Spy on AJAX requests
-                requests = AjaxHelpers.requests(that);
+            var ajaxSpyAndInitialize = function() {
 
                 // Initialize the access view
                 view = new FinishAuthView({});
@@ -55,6 +55,15 @@
             beforeEach(function() {
                 // Stub analytics tracking
                 window.analytics = jasmine.createSpyObj('analytics', ['track', 'page', 'pageview', 'trackLink']);
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
+            });
+
+            afterEach(function() {
+                requests.restore();
             });
 
             it('saves the email opt-in preference before enrollment', function() {
diff --git a/lms/static/js/spec/student_account/login_spec.js b/lms/static/js/spec/student_account/login_spec.js
index 2d1c481fb23e..fe62de38976c 100644
--- a/lms/static/js/spec/student_account/login_spec.js
+++ b/lms/static/js/spec/student_account/login_spec.js
@@ -17,6 +17,7 @@
                 resetModel = null,
                 view = null,
                 requests = null,
+                xhrFactory = null,
                 authComplete = false,
                 PLATFORM_NAME = 'edX',
                 ENTERPRISE_SLUG_LOGIN_URL = 'enterprise/login',
@@ -96,9 +97,6 @@
                     isEnterpriseEnable: IS_ENTERPRISE_ENABLE
                 });
 
-                // Spy on AJAX requests
-                requests = AjaxHelpers.requests(test);
-
                 // Intercept events from the view
                 authComplete = false;
                 view.on('auth-complete', function() {
@@ -132,6 +130,15 @@
                 setFixtures('<div id="login-form"></div>');
                 TemplateHelpers.installTemplate('templates/student_account/login');
                 TemplateHelpers.installTemplate('templates/student_account/form_field');
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
+            });
+
+            afterEach(function() {
+                requests.restore();
             });
 
             it('logs the user in', function() {
diff --git a/lms/static/js/spec/student_account/multiple_enterprise_spec.js b/lms/static/js/spec/student_account/multiple_enterprise_spec.js
index 0c7bdeb2e356..958e97a6dd52 100644
--- a/lms/static/js/spec/student_account/multiple_enterprise_spec.js
+++ b/lms/static/js/spec/student_account/multiple_enterprise_spec.js
@@ -1,27 +1,35 @@
 define([
+    'sinon',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'js/student_account/multiple_enterprise',
     'js/student_account/utils'
 ],
-function(AjaxHelpers, MultipleEnterpriseInterface, Utils) {
+function(sinon, AjaxHelpers, MultipleEnterpriseInterface, Utils) {
     'use strict';
 
     describe('MultipleEnterpriseInterface', function() {
         var LEARNER_URL = '/enterprise/api/v1/enterprise-learner/?username=test-learner',
             NEXT_URL = '/dashboard',
             REDIRECT_URL = '/enterprise/select/active/?success_url=%2Fdashboard',
-            ENTERPRISE_ACTIVATION_URL = '/enterprise/select/active';
+            ENTERPRISE_ACTIVATION_URL = '/enterprise/select/active',
+            requests, xhrFactory;
 
         beforeEach(function() {
             // Mock the redirect call
             spyOn(MultipleEnterpriseInterface, 'redirect').and.callFake(function() {});
             spyOn(Utils, 'userFromEdxUserCookie').and.returnValue({username: 'test-learner'});
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
         });
 
-        it('gets learner information and checks redirect to enterprise selection page', function() {
-            // Spy on Ajax requests
-            var requests = AjaxHelpers.requests(this);
+        afterEach(function() {
+            requests.restore();
+        });
 
+        it('gets learner information and checks redirect to enterprise selection page', function() {
             // Attempt to fetch a learner
             MultipleEnterpriseInterface.check(NEXT_URL);
 
@@ -41,8 +49,6 @@ function(AjaxHelpers, MultipleEnterpriseInterface, Utils) {
         });
 
         it('checks bypass of enterprise selection page in case of enterprise in URL', function() {
-            // Spy on Ajax requests
-            var requests = AjaxHelpers.requests(this);
             spyOn(MultipleEnterpriseInterface, 'getEnterpriseFromUrl').and.returnValue('SomeEnterprise');
             spyOn(MultipleEnterpriseInterface, 'checkEnterpriseExists').and.returnValue(true);
 
@@ -75,8 +81,6 @@ function(AjaxHelpers, MultipleEnterpriseInterface, Utils) {
         });
 
         it('checks enterprise selection page redirect in case of enterprise activation failure', function() {
-            // Spy on Ajax requests
-            var requests = AjaxHelpers.requests(this);
             spyOn(MultipleEnterpriseInterface, 'getEnterpriseFromUrl').and.returnValue('SomeEnterprise');
             spyOn(MultipleEnterpriseInterface, 'checkEnterpriseExists').and.returnValue(true);
 
@@ -110,9 +114,6 @@ function(AjaxHelpers, MultipleEnterpriseInterface, Utils) {
         });
 
         it('gets learner information and checks that enterprise selection page is bypassed', function() {
-            // Spy on Ajax requests
-            var requests = AjaxHelpers.requests(this);
-
             // Attempt to fetch a learner
             MultipleEnterpriseInterface.check(NEXT_URL);
 
@@ -132,9 +133,6 @@ function(AjaxHelpers, MultipleEnterpriseInterface, Utils) {
         });
 
         it('correctly redirects the user if learner information call fails', function() {
-            // Spy on Ajax requests
-            var requests = AjaxHelpers.requests(this);
-
             // Attempt to fetch a learner
             MultipleEnterpriseInterface.check(NEXT_URL);
 
diff --git a/lms/static/js/spec/student_account/password_reset_spec.js b/lms/static/js/spec/student_account/password_reset_spec.js
index 68d6172f5ccb..78f7feea90fa 100644
--- a/lms/static/js/spec/student_account/password_reset_spec.js
+++ b/lms/static/js/spec/student_account/password_reset_spec.js
@@ -4,16 +4,18 @@
     define([
         'jquery',
         'underscore',
+        'sinon',
         'common/js/spec_helpers/template_helpers',
         'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
         'js/student_account/models/PasswordResetModel',
         'js/student_account/views/PasswordResetView'
     ],
-    function($, _, TemplateHelpers, AjaxHelpers, PasswordResetModel, PasswordResetView) {
+    function($, _, sinon, TemplateHelpers, AjaxHelpers, PasswordResetModel, PasswordResetView) {
         describe('edx.student.account.PasswordResetView', function() {
             var model = null,
                 view = null,
                 requests = null,
+                xhrFactory = null,
                 EMAIL = 'xsy@edx.org',
                 FORM_DESCRIPTION = {
                     method: 'post',
@@ -43,8 +45,6 @@
                     model: model
                 });
 
-                // Spy on AJAX requests
-                requests = AjaxHelpers.requests(that);
             };
 
             var submitEmail = function(validationSuccess) {
@@ -72,6 +72,15 @@
                 setFixtures('<div id="password-reset-form" class="form-wrapper hidden"></div>');
                 TemplateHelpers.installTemplate('templates/student_account/password_reset');
                 TemplateHelpers.installTemplate('templates/student_account/form_field');
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
+            });
+
+            afterEach(function() {
+                requests.restore();
             });
 
             it('allows the user to request a new password', function() {
diff --git a/lms/static/js/spec/student_account/register_spec.js b/lms/static/js/spec/student_account/register_spec.js
index 17d82e2b13d6..d886106b762c 100644
--- a/lms/static/js/spec/student_account/register_spec.js
+++ b/lms/static/js/spec/student_account/register_spec.js
@@ -4,17 +4,19 @@
     define([
         'jquery',
         'underscore',
+        'sinon',
         'common/js/spec_helpers/template_helpers',
         'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
         'js/student_account/models/RegisterModel',
         'js/student_account/views/RegisterView',
         'js/student_account/tos_modal'
     ],
-    function($, _, TemplateHelpers, AjaxHelpers, RegisterModel, RegisterView) {
+    function($, _, sinon, TemplateHelpers, AjaxHelpers, RegisterModel, RegisterView) {
         describe('edx.student.account.RegisterView', function() {
             var model = null,
                 view = null,
                 requests = null,
+                xhrFactory = null,
                 authComplete = false,
                 PLATFORM_NAME = 'edX',
                 COURSE_ID = 'edX/DemoX/Fall',
@@ -245,9 +247,6 @@
                     platformName: PLATFORM_NAME
                 });
 
-                // Spy on AJAX requests
-                requests = AjaxHelpers.requests(that);
-
                 // Intercept events from the view
                 authComplete = false;
                 view.on('auth-complete', function() {
@@ -323,6 +322,15 @@
                 setFixtures('<div id="register-form"></div>');
                 TemplateHelpers.installTemplate('templates/student_account/register');
                 TemplateHelpers.installTemplate('templates/student_account/form_field');
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
+            });
+
+            afterEach(function() {
+                requests.restore();
             });
 
             it('registers a new user', function() {
diff --git a/lms/static/js/spec/student_account/shoppingcart_spec.js b/lms/static/js/spec/student_account/shoppingcart_spec.js
index 69ed04ba7c44..73d43ed43307 100644
--- a/lms/static/js/spec/student_account/shoppingcart_spec.js
+++ b/lms/static/js/spec/student_account/shoppingcart_spec.js
@@ -1,21 +1,28 @@
-define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/student_account/shoppingcart'],
-    function(AjaxHelpers, ShoppingCartInterface) {
+define(['sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/student_account/shoppingcart'],
+    function(sinon, AjaxHelpers, ShoppingCartInterface) {
         'use strict';
 
         describe('ShoppingCartInterface', function() {
             var COURSE_KEY = 'edX/DemoX/Fall',
                 ADD_COURSE_URL = '/shoppingcart/add/course/edX/DemoX/Fall/',
-                FORWARD_URL = '/shoppingcart/';
+                FORWARD_URL = '/shoppingcart/',
+                requests, xhrFactory;
 
             beforeEach(function() {
                 // Mock the redirect call
                 spyOn(ShoppingCartInterface, 'redirect').and.callFake(function() {});
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
             });
 
-            it('adds a course to the cart', function() {
-                // Spy on Ajax requests
-                var requests = AjaxHelpers.requests(this);
+            afterEach(function() {
+                requests.restore();
+            });
 
+            it('adds a course to the cart', function() {
                 // Attempt to add a course to the cart
                 ShoppingCartInterface.addCourseToCart(COURSE_KEY);
 
@@ -30,9 +37,6 @@ define(['edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/student_account
             });
 
             it('redirects the user on a server error', function() {
-                // Spy on Ajax requests
-                var requests = AjaxHelpers.requests(this);
-
                 // Attempt to add a course to the cart
                 ShoppingCartInterface.addCourseToCart(COURSE_KEY);
 
diff --git a/lms/static/js/spec/verify_student/make_payment_step_view_ab_testing_spec.js b/lms/static/js/spec/verify_student/make_payment_step_view_ab_testing_spec.js
index 31aa924130cb..986154936e1d 100644
--- a/lms/static/js/spec/verify_student/make_payment_step_view_ab_testing_spec.js
+++ b/lms/static/js/spec/verify_student/make_payment_step_view_ab_testing_spec.js
@@ -2,11 +2,12 @@ define([
     'jquery',
     'underscore',
     'backbone',
+    'sinon',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'common/js/spec_helpers/template_helpers',
     'js/verify_student/views/make_payment_step_view'
 ],
-function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
+function($, _, Backbone, sinon, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
     'use strict';
 
     var checkPaymentButtons,
@@ -19,6 +20,7 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
         SERVER_ERROR_MSG = 'An error occurred!';
 
     describe('edx.verify_student.MakePaymentStepView', function() {
+        var requests, xhrFactory;
         var STEP_DATA = {
             minPrice: '12',
             currency: 'usd',
@@ -129,6 +131,15 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
 
             setFixtures('<div id="current-step-container"></div>');
             TemplateHelpers.installTemplate('templates/verify_student/make_payment_step_ab_testing');
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
+        });
+
+        afterEach(function() {
+            requests.restore();
         });
 
         it('A/B Testing: check Initialize method with AB testing enable ', function() {
@@ -138,8 +149,7 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
         });
 
         it('shows users only minimum price', function() {
-            var view = createView(),
-                requests = AjaxHelpers.requests(this);
+            var view = createView();
 
             expectPriceSelected(STEP_DATA.minPrice);
             expectPaymentButtonEnabled(true);
@@ -154,12 +164,12 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
 
         it('A/B Testing: provides working payment buttons for a single processor', function() {
             createView({processors: ['cybersource']});
-            checkPaymentButtons(AjaxHelpers.requests(this), {cybersource: 'Checkout'});
+            checkPaymentButtons(requests, {cybersource: 'Checkout'});
         });
 
         it('A/B Testing: provides working payment buttons for multiple processors', function() {
             createView({processors: ['cybersource', 'paypal', 'other']});
-            checkPaymentButtons(AjaxHelpers.requests(this), {
+            checkPaymentButtons(requests, {
                 cybersource: 'Checkout',
                 paypal: 'Checkout with PayPal',
                 other: 'Checkout with other'
@@ -167,8 +177,7 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
         });
 
         it('A/B Testing: by default minimum price is selected if no suggested prices are given', function() {
-            var view = createView(),
-                requests = AjaxHelpers.requests(this);
+            var view = createView();
 
             expectPriceSelected(STEP_DATA.minPrice);
             expectPaymentButtonEnabled(true);
@@ -198,8 +207,7 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
         });
 
         it('A/B Testing: displays an error if the order could not be created', function() {
-            var requests = AjaxHelpers.requests(this),
-                view = createView();
+            var view = createView();
 
             goToPayment(requests, {
                 amount: STEP_DATA.minPrice,
diff --git a/lms/static/js/spec/verify_student/make_payment_step_view_spec.js b/lms/static/js/spec/verify_student/make_payment_step_view_spec.js
index fa24a757d58f..59e3cc8f4cf3 100644
--- a/lms/static/js/spec/verify_student/make_payment_step_view_spec.js
+++ b/lms/static/js/spec/verify_student/make_payment_step_view_spec.js
@@ -2,14 +2,16 @@ define([
     'jquery',
     'underscore',
     'backbone',
+    'sinon',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'common/js/spec_helpers/template_helpers',
     'js/verify_student/views/make_payment_step_view'
 ],
-function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
+function($, _, Backbone, sinon, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
     'use strict';
 
     describe('edx.verify_student.MakePaymentStepView', function() {
+        var requests, xhrFactory;
         var PAYMENT_PARAMS = {
             orderId: 'test-order',
             signature: 'abcd1234'
@@ -124,11 +126,19 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
 
             setFixtures('<div id="current-step-container"></div>');
             TemplateHelpers.installTemplate('templates/verify_student/make_payment_step');
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
+        });
+
+        afterEach(function() {
+            requests.restore();
         });
 
         it('shows users only minimum price', function() {
-            var view = createView({}),
-                requests = AjaxHelpers.requests(this);
+            var view = createView({});
 
             expectPriceSelected(STEP_DATA.minPrice);
             expectPaymentButtonEnabled(true);
@@ -184,12 +194,12 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
 
         it('provides working payment buttons for a single processor', function() {
             createView({processors: ['cybersource']});
-            checkPaymentButtons(AjaxHelpers.requests(this), {cybersource: 'Checkout'});
+            checkPaymentButtons(requests, {cybersource: 'Checkout'});
         });
 
         it('provides working payment buttons for multiple processors', function() {
             createView({processors: ['cybersource', 'paypal', 'other']});
-            checkPaymentButtons(AjaxHelpers.requests(this), {
+            checkPaymentButtons(requests, {
                 cybersource: 'Checkout',
                 paypal: 'Checkout with PayPal',
                 other: 'Checkout with other'
@@ -197,8 +207,7 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
         });
 
         it('by default minimum price is selected if no suggested prices are given', function() {
-            var view = createView(),
-                requests = AjaxHelpers.requests(this);
+            var view = createView();
 
             expectPriceSelected(STEP_DATA.minPrice);
             expectPaymentButtonEnabled(true);
@@ -228,8 +237,7 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, MakePaymentStepView) {
         });
 
         it('displays an error if the order could not be created', function() {
-            var requests = AjaxHelpers.requests(this),
-                view = createView({});
+            var view = createView({});
 
             goToPayment(requests, {
                 amount: STEP_DATA.minPrice,
diff --git a/lms/static/js/spec/verify_student/review_photos_step_view_spec.js b/lms/static/js/spec/verify_student/review_photos_step_view_spec.js
index 68f84306b3ce..e3d046db9c10 100644
--- a/lms/static/js/spec/verify_student/review_photos_step_view_spec.js
+++ b/lms/static/js/spec/verify_student/review_photos_step_view_spec.js
@@ -2,12 +2,13 @@ define([
     'jquery',
     'underscore',
     'backbone',
+    'sinon',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'common/js/spec_helpers/template_helpers',
     'js/verify_student/views/review_photos_step_view',
     'js/verify_student/models/verification_model'
 ],
-function($, _, Backbone, AjaxHelpers, TemplateHelpers, ReviewPhotosStepView, VerificationModel) {
+function($, _, Backbone, sinon, AjaxHelpers, TemplateHelpers, ReviewPhotosStepView, VerificationModel) {
     'use strict';
 
     describe('edx.verify_student.ReviewPhotosStepView', function() {
@@ -15,7 +16,8 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, ReviewPhotosStepView, Ver
             FULL_NAME = 'Test User',
             FACE_IMAGE = 'abcd1234',
             PHOTO_ID_IMAGE = 'efgh56789',
-            SERVER_ERROR_MSG = 'An error occurred!';
+            SERVER_ERROR_MSG = 'An error occurred!',
+            requests, xhrFactory;
 
         var createView = function() {
             return new ReviewPhotosStepView({
@@ -64,11 +66,18 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, ReviewPhotosStepView, Ver
 
             setFixtures('<div id="current-step-container"></div>');
             TemplateHelpers.installTemplate('templates/verify_student/review_photos_step');
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
         });
 
-        it('allows the user to change her full name', function() {
-            var requests = AjaxHelpers.requests(this);
+        afterEach(function() {
+            requests.restore();
+        });
 
+        it('allows the user to change her full name', function() {
             createView();
             setFullName(FULL_NAME);
             submitPhotos(
@@ -83,8 +92,6 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, ReviewPhotosStepView, Ver
         });
 
         it('submits photos for verification', function() {
-            var requests = AjaxHelpers.requests(this);
-
             createView();
             submitPhotos(
                 requests,
@@ -101,8 +108,7 @@ function($, _, Backbone, AjaxHelpers, TemplateHelpers, ReviewPhotosStepView, Ver
         });
 
         it('displays an error if photo submission fails', function() {
-            var view = createView(),
-                requests = AjaxHelpers.requests(this);
+            var view = createView();
 
             submitPhotos(
                 requests,
diff --git a/lms/static/js/spec/views/fields_spec.js b/lms/static/js/spec/views/fields_spec.js
index 4137dd01232b..6f65f90a7aa8 100644
--- a/lms/static/js/spec/views/fields_spec.js
+++ b/lms/static/js/spec/views/fields_spec.js
@@ -1,7 +1,7 @@
-define(['backbone', 'jquery', 'underscore', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
+define(['backbone', 'jquery', 'underscore', 'sinon', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
     'common/js/spec_helpers/template_helpers', 'js/views/fields', 'js/spec/views/fields_helpers',
     'string_utils'],
-function(Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpecHelpers) {
+function(Backbone, $, _, sinon, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpecHelpers) {
     'use strict';
 
     var USERNAME = 'Legolas',
@@ -9,6 +9,7 @@ function(Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpe
 
     describe('edx.FieldViews', function() {
         var requests,
+            xhrFactory,
             timerCallback,
             dropdownSelectClass = '.u-field-value > select',
             dropdownButtonClass = '.u-field-value > button',
@@ -25,10 +26,16 @@ function(Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpe
         beforeEach(function() {
             timerCallback = jasmine.createSpy('timerCallback');
             jasmine.clock().install();
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
         });
 
         afterEach(function() {
             jasmine.clock().uninstall();
+            requests.restore();
         });
 
         it('updates messages correctly for all fields', function() {
@@ -60,7 +67,6 @@ function(Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpe
         });
 
         it('sends a PATCH request when saveAttributes is called', function() {
-            requests = AjaxHelpers.requests(this);
 
             var fieldViewClass = FieldViews.EditableFieldView;
             var fieldData = FieldViewsSpecHelpers.createFieldData(fieldViewClass, {
@@ -99,7 +105,6 @@ function(Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpe
         });
 
         it('correctly renders, updates and persists changes to TextFieldView when editable == always', function() {
-            requests = AjaxHelpers.requests(this);
 
             var fieldData = FieldViewsSpecHelpers.createFieldData(FieldViews.TextFieldView, {
                 title: 'Full Name',
@@ -122,7 +127,6 @@ function(Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpe
         });
 
         it('correctly renders and updates DropdownFieldView when editable == never', function() {
-            requests = AjaxHelpers.requests(this);
 
             var fieldData = FieldViewsSpecHelpers.createFieldData(FieldViews.DropdownFieldView, {
                 title: 'Full Name',
@@ -160,7 +164,6 @@ function(Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpe
         });
 
         it('correctly renders, updates and persists changes to DropdownFieldView when editable == always', function() {
-            requests = AjaxHelpers.requests(this);
 
             var fieldData = FieldViewsSpecHelpers.createFieldData(FieldViews.DropdownFieldView, {
                 title: 'Full Name',
@@ -183,7 +186,6 @@ function(Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpe
         });
 
         it('correctly renders, updates and persists changes to DropdownFieldView when editable == toggle', function() {
-            requests = AjaxHelpers.requests(this);
 
             var fieldData = FieldViewsSpecHelpers.createFieldData(FieldViews.DropdownFieldView, {
                 title: 'Full Name',
@@ -208,7 +210,6 @@ function(Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpe
         });
 
         it('only shows empty option in DropdownFieldView if required is false or model value is not set', function() {
-            requests = AjaxHelpers.requests(this);
 
             var editableOptions = ['toggle', 'always'];
             _.each(editableOptions, function(editable) {
@@ -271,7 +272,6 @@ function(Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpe
         });
 
         it('correctly renders, updates and persists changes to TextAreaFieldView when editable == toggle', function() {
-            requests = AjaxHelpers.requests(this);
 
             var valueInputSelector = '.u-field-value > textarea';
             var fieldData = FieldViewsSpecHelpers.createFieldData(FieldViews.TextareaFieldView, {
@@ -327,7 +327,6 @@ function(Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpe
         });
 
         it("can't persist changes if persistChanges is off", function() {
-            requests = AjaxHelpers.requests(this);
             var fieldClasses = [
                 FieldViews.TextFieldView,
                 FieldViews.DropdownFieldView,
diff --git a/lms/static/js/spec/views/file_uploader_spec.js b/lms/static/js/spec/views/file_uploader_spec.js
index f74cb1f3be3d..b55cbb76902e 100644
--- a/lms/static/js/spec/views/file_uploader_spec.js
+++ b/lms/static/js/spec/views/file_uploader_spec.js
@@ -1,10 +1,10 @@
-define(['backbone', 'jquery', 'js/views/file_uploader', 'common/js/spec_helpers/template_helpers',
+define(['backbone', 'jquery', 'sinon', 'js/views/file_uploader', 'common/js/spec_helpers/template_helpers',
     'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers', 'js/models/notification', 'string_utils'],
-function(Backbone, $, FileUploaderView, TemplateHelpers, AjaxHelpers, NotificationModel) {
+function(Backbone, $, sinon, FileUploaderView, TemplateHelpers, AjaxHelpers, NotificationModel) {
     describe('FileUploaderView', function() {
         var verifyTitle, verifyInputLabel, verifyInputTip, verifySubmitButton, verifyExtensions, verifyText,
             verifyFileUploadOption, verifyNotificationMessage, verifySubmitButtonEnabled, mimicUpload,
-            respondWithSuccess, respondWithError, fileUploaderView,
+            respondWithSuccess, respondWithError, fileUploaderView, requests, xhrFactory,
             url = 'http://test_url/';
 
         verifyText = function(css, expectedText) {
@@ -45,9 +45,7 @@ function(Backbone, $, FileUploaderView, TemplateHelpers, AjaxHelpers, Notificati
             verifyText('.file-upload-form-result .message-' + type + ' .message-title', expectedMessage);
         };
 
-        mimicUpload = function(test) {
-            var requests = AjaxHelpers.requests(test);
-
+        mimicUpload = function() {
             var param = {files: [{name: 'upload_file.txt'}]};
             fileUploaderView.$('#file-upload-form').fileupload('add', param);
             verifySubmitButtonEnabled(true);
@@ -55,7 +53,6 @@ function(Backbone, $, FileUploaderView, TemplateHelpers, AjaxHelpers, Notificati
 
             // No file will actually be uploaded because "uploaded_file.txt" doesn't actually exist.
             AjaxHelpers.expectRequest(requests, 'POST', url, new FormData());
-            return requests;
         };
 
         respondWithSuccess = function(requests) {
@@ -75,6 +72,15 @@ function(Backbone, $, FileUploaderView, TemplateHelpers, AjaxHelpers, Notificati
             TemplateHelpers.installTemplate('templates/file-upload');
             TemplateHelpers.installTemplate('templates/instructor/instructor_dashboard_2/notification');
             fileUploaderView = new FileUploaderView({url: url}).render();
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
+        });
+
+        afterEach(function() {
+            requests.restore();
         });
 
         it('has default values', function() {
@@ -115,7 +121,7 @@ function(Backbone, $, FileUploaderView, TemplateHelpers, AjaxHelpers, Notificati
         });
 
         it('handles errors with default message', function() {
-            var requests = mimicUpload(this);
+            mimicUpload();
             respondWithError(requests);
             verifyNotificationMessage("Your upload of 'upload_file.txt' failed.", 'error');
         });
@@ -131,19 +137,19 @@ function(Backbone, $, FileUploaderView, TemplateHelpers, AjaxHelpers, Notificati
                     });
                 }
             }).render();
-            var requests = mimicUpload(this);
+            mimicUpload();
             respondWithError(requests, 'server error');
             verifyNotificationMessage("Custom error for 'upload_file.txt'", 'customized');
         });
 
         it('handles server error message', function() {
-            var requests = mimicUpload(this);
+            mimicUpload();
             respondWithError(requests, 'server error');
             verifyNotificationMessage('server error', 'error');
         });
 
         it('handles success with default message', function() {
-            var requests = mimicUpload(this);
+            mimicUpload();
             respondWithSuccess(requests);
             verifyNotificationMessage("Your upload of 'upload_file.txt' succeeded.", 'confirmation');
         });
@@ -159,7 +165,7 @@ function(Backbone, $, FileUploaderView, TemplateHelpers, AjaxHelpers, Notificati
                     });
                 }
             }).render();
-            var requests = mimicUpload(this);
+            mimicUpload();
             respondWithSuccess(requests);
             verifyNotificationMessage("Custom success message for 'upload_file.txt'", 'customized');
         });
diff --git a/lms/static/lms/js/spec/preview/preview_factory_spec.js b/lms/static/lms/js/spec/preview/preview_factory_spec.js
index e87d018fb67d..dcd006fd5475 100644
--- a/lms/static/lms/js/spec/preview/preview_factory_spec.js
+++ b/lms/static/lms/js/spec/preview/preview_factory_spec.js
@@ -1,16 +1,18 @@
 define(
     [
+        'sinon',
         'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
         'common/js/components/utils/view_utils',
         'lms/js/preview/preview_factory'
     ],
-    function(AjaxHelpers, ViewUtils, PreviewFactory) {
+    function(sinon, AjaxHelpers, ViewUtils, PreviewFactory) {
         'use strict';
 
         describe('Preview Factory', function() {
             var showPreview,
                 previewActionSelect,
-                usernameInput;
+                usernameInput,
+                requests, xhrFactory;
 
             showPreview = function(options) {
                 PreviewFactory(options);
@@ -26,6 +28,15 @@ define(
 
             beforeEach(function() {
                 loadFixtures('lms/fixtures/preview/course_preview.html');
+                xhrFactory = sinon.useFakeXMLHttpRequest();
+                requests = [];
+                requests.currentIndex = 0;
+                requests.restore = function() { xhrFactory.restore(); };
+                xhrFactory.onCreate = function(req) { requests.push(req); };
+            });
+
+            afterEach(function() {
+                requests.restore();
             });
 
             it('can render preview for a staff user', function() {
@@ -47,8 +58,7 @@ define(
             });
 
             it('can switch to view as a student', function() {
-                var requests = AjaxHelpers.requests(this),
-                    reloadSpy = spyOn(ViewUtils, 'reload');
+                var reloadSpy = spyOn(ViewUtils, 'reload');
                 showPreview({
                     courseId: 'test_course'
                 });
@@ -67,8 +77,7 @@ define(
             });
 
             it('can switch to view as a content group', function() {
-                var requests = AjaxHelpers.requests(this),
-                    reloadSpy = spyOn(ViewUtils, 'reload');
+                var reloadSpy = spyOn(ViewUtils, 'reload');
                 showPreview({
                     courseId: 'test_course'
                 });
@@ -89,8 +98,7 @@ define(
             });
 
             it('can switch to masquerade as a specific student', function() {
-                var requests = AjaxHelpers.requests(this),
-                    reloadSpy = spyOn(ViewUtils, 'reload');
+                var reloadSpy = spyOn(ViewUtils, 'reload');
                 showPreview({
                     courseId: 'test_course'
                 });

From dd6470f660c5fca5dfa31e426e691d35747ad403 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Thu, 5 Mar 2026 11:47:25 -0500
Subject: [PATCH 12/13] fix(tests): reorder beforeEach in assets_squire_spec to
 avoid sinon/Squire conflict

The sync sinon fake XHR beforeEach was running before the async Squire
beforeEach that calls injector.require(). This caused sinon to intercept
RequireJS's internal XHR module-loading requests, so done() was never
called and sinon was left in a broken state. This cascaded to fail
subsequent test files (e.g. group_configuration_spec.js) with
"xhrFactory.restore is not a function".

Fix: run the async Squire beforeEach first (modules load via real XHR),
then activate sinon fake XHR in a second sync beforeEach. Also consolidate
the two afterEach blocks in "Asset view" into one.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../js/spec/views/assets_squire_spec.js       | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/cms/static/js/spec/views/assets_squire_spec.js b/cms/static/js/spec/views/assets_squire_spec.js
index 1b92fd1ef6e5..33f3329c51e1 100644
--- a/cms/static/js/spec/views/assets_squire_spec.js
+++ b/cms/static/js/spec/views/assets_squire_spec.js
@@ -7,18 +7,6 @@ function($, sinon, AjaxHelpers, Squire) {
     describe("Asset view", function() {
         var requests, xhrFactory;
 
-        beforeEach(function() {
-            xhrFactory = sinon.useFakeXMLHttpRequest();
-            requests = [];
-            requests.currentIndex = 0;
-            requests.restore = function() { xhrFactory.restore(); };
-            xhrFactory.onCreate = function(req) { requests.push(req); };
-        });
-
-        afterEach(function() {
-            requests.restore();
-        });
-
         beforeEach(function(done) {
             setFixtures($("<script>", {id: "asset-tpl", type: "text/template"}).text(assetTpl));
             appendSetFixtures(sandbox({id: "page-prompt"}));
@@ -68,7 +56,16 @@ function($, sinon, AjaxHelpers, Squire) {
             });
         });
 
+        beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
+        });
+
         afterEach(function() {
+            requests.restore();
             this.injector.clean();
             this.injector.remove();
         });
@@ -163,14 +160,6 @@ function($, sinon, AjaxHelpers, Squire) {
     describe("Assets view", function() {
         var requests, xhrFactory;
 
-        beforeEach(function() {
-            xhrFactory = sinon.useFakeXMLHttpRequest();
-            requests = [];
-            requests.currentIndex = 0;
-            requests.restore = function() { xhrFactory.restore(); };
-            xhrFactory.onCreate = function(req) { requests.push(req); };
-        });
-
         beforeEach(function(done) {
             setFixtures($("<script>", {id: "asset-library-tpl", type: "text/template"}).text(assetLibraryTpl));
             appendSetFixtures($("<script>", {id: "asset-tpl", type: "text/template"}).text(assetTpl));
@@ -233,6 +222,14 @@ function($, sinon, AjaxHelpers, Squire) {
             return $.ajax();
         });
 
+        beforeEach(function() {
+            xhrFactory = sinon.useFakeXMLHttpRequest();
+            requests = [];
+            requests.currentIndex = 0;
+            requests.restore = function() { xhrFactory.restore(); };
+            xhrFactory.onCreate = function(req) { requests.push(req); };
+        });
+
         afterEach(function() {
             requests.restore();
             delete window.analytics;

From ab95d562250643709eada3b628698712be161f47 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Fri, 1 May 2026 16:56:43 -0400
Subject: [PATCH 13/13] fix: reset MathJax.Hub.Queue spy in refreshMath
 beforeEach to avoid jasmine-jquery Sizzle error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In Jasmine 2.99, toHaveBeenCalledWith iterates ALL recorded spy call
arguments element-by-element (even for calls that obviously don't match)
to build a useful diff. In Jasmine 2.6, array comparison short-circuited
on the first failing element.

Problem.bind() calls MathJax.Hub.Queue([refreshMath, null, domEl]) for
each input.math element. When toHaveBeenCalledWith then checks that call
against the expected args ["Text", stubbedJax, "E=mc^2"], it compares
each element pairwise — including domEl (index 2 of the actual array)
against "E=mc^2" (index 2 of the expected array).

jasmine-jquery's custom equality tester calls $(domEl).is("E=mc^2") when
it sees a DOM node on the left. jQuery's Sizzle interprets "E=mc^2" as a
CSS selector and throws a syntax error.

Fix: reset Queue.calls after new Problem() so bind()'s call is not in the
recorded set. This isolates the describe to testing only what refreshMath
itself queues, which is the intent of the test.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 xmodule/js/spec/capa/display_spec.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/xmodule/js/spec/capa/display_spec.js b/xmodule/js/spec/capa/display_spec.js
index f55106f31758..f44d3c185168 100644
--- a/xmodule/js/spec/capa/display_spec.js
+++ b/xmodule/js/spec/capa/display_spec.js
@@ -994,6 +994,15 @@ data-url='/problem/quiz/'> \
   describe("refreshMath", function () {
     beforeEach(function () {
       this.problem = new Problem($(".xblock-student_view"));
+      // Reset Queue spy so that bind()'s Queue call ([fn, null, domEl]) is not
+      // included when toHaveBeenCalledWith scans recorded calls. In Jasmine 2.99,
+      // toHaveBeenCalledWith iterates ALL recorded calls' args element-by-element
+      // (even mismatched ones, for diff output). jasmine-jquery's custom equality
+      // tester calls $(domEl).is(anyString) when comparing a DOM node against a
+      // string — which throws a Sizzle syntax error if the string isn't a valid
+      // CSS selector (e.g. "E=mc^2"). Resetting here isolates this describe to
+      // testing only what refreshMath itself queues.
+      MathJax.Hub.Queue.calls.reset();
       $("#input_example_1").val("E=mc^2");
       this.problem.refreshMath({ target: $("#input_example_1").get(0) });
     });