Bump sinon from 2.3.2 to 19.0.2

corehq/apps/app_manager/static/app_manager/spec/download_async_modal_spec.js

@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
 import $ from "jquery";
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 
 import asyncDownloader from "app_manager/js/download_async_modal";
 

corehq/apps/app_manager/static/app_manager/spec/form_workflow_spec.js

@@ -1,5 +1,5 @@
 import _ from "underscore";
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 
 import Toggles from "hqwebapp/js/toggles";
 import FormWorkflow from "app_manager/js/forms/form_workflow";
@@ -8,9 +8,8 @@ describe('Form Workflow', function () {
     var workflow;
 
     describe('#workflowOptions', function () {
-        const sandbox = sinon.sandbox.create();
 
-        sandbox.stub(Toggles, 'toggleEnabled').withArgs('FORM_LINK_ADVANCED_MODE').returns(true);
+        sinon.stub(Toggles, 'toggleEnabled').withArgs('FORM_LINK_ADVANCED_MODE').returns(true);
 
         beforeEach(function () {
             var labels = {},

corehq/apps/app_manager/static/app_manager/spec/releases_spec.js

@@ -1,6 +1,6 @@
 import $ from "jquery";
 import _ from "underscore";
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 
 import initialPageData from "hqwebapp/js/initial_page_data";
 import releasesModels from "app_manager/js/releases/releases";
@@ -58,7 +58,7 @@
             releases.savedApps(getSavedApps(5, {}, releases));
         });
 
         afterEach(function () {
             ajaxStub.restore();
         });
 
@@ -110,12 +110,12 @@
             this.server.respondWith(
                 "GET",
                 new RegExp(savedAppModel.URL_TYPES.SHORT_ODK_MEDIA_URL),
                 [200, { "Content-type": "text/html" }, 'http://bit.ly/media/']
             );
             this.server.respondWith(
                 "GET",
                 new RegExp(savedAppModel.URL_TYPES.SHORT_ODK_URL),
                 [200, { "Content-type": "text/html" }, 'http://bit.ly/nomedia/']
             );
         });
 

corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/entries_spec.js

@@ -1,5 +1,5 @@
 import _ from "underscore";
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import moment from "moment";
 import initialPageData from "hqwebapp/js/initial_page_data";
 import constants from "cloudcare/js/form_entry/const";
@@ -11,7 +11,7 @@
     var questionJSON,
         spy;
 
     before(function () {
         initialPageData.register(
             "has_geocoder_privs",
             true,
@@ -25,7 +25,7 @@
         );
     });
 
     after(function () {
         initialPageData.unregister("toggles_dict");
     });
 
@@ -55,7 +55,7 @@
         this.clock = sinon.useFakeTimers(new Date("2020-03-15 15:41").getTime());
     });
 
     afterEach(function () {
         $.unsubscribe();
         this.clock.restore();
     });

corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js

@@ -1,5 +1,5 @@
 import _ from "underscore";
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import initialPageData from "hqwebapp/js/initial_page_data";
 import constants from "cloudcare/js/form_entry/const";
 import formUI from "cloudcare/js/form_entry/form_ui";
@@ -13,7 +13,7 @@
         nestedGroupJSON,
         spy;
 
     before(function () {
         initialPageData.register(
             "toggles_dict",
             {
@@ -23,7 +23,7 @@
         );
     });
 
     after(function () {
         initialPageData.unregister("toggles_dict");
     });
 
@@ -57,7 +57,7 @@
 
     });
 
     afterEach(function () {
         $.unsubscribe();
         this.clock.restore();
     });

corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/integration_spec.js

@@ -1,6 +1,6 @@
 import _ from "underscore";
 import initialPageData from "hqwebapp/js/initial_page_data";
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import constants from "cloudcare/js/form_entry/const";
 import formUI from "cloudcare/js/form_entry/form_ui";
 
@@ -9,11 +9,11 @@
         questionJSONMulti,
         questionJSONString;
 
     before(function () {
         initialPageData.register("toggles_dict", { WEB_APPS_ANCHORED_SUBMIT: false });
     });
 
     after(function () {
         initialPageData.unregister("toggles_dict");
     });
 
@@ -70,7 +70,7 @@
         this.clock = sinon.useFakeTimers();
     });
 
     afterEach(function () {
         $.unsubscribe();
         this.clock.restore();
     });

corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/web_form_session_spec.js

@@ -1,4 +1,4 @@
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import initialPageData from "hqwebapp/js/initial_page_data";
 import constants from "cloudcare/js/form_entry/const";
 import errors from "cloudcare/js/form_entry/errors";

corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/debugger_spec.js

@@ -1,4 +1,4 @@
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import Debugger from "cloudcare/js/debugger/debugger";
 
 describe('Debugger', function () {

corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/hq_events_spec.js

@@ -1,4 +1,4 @@
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import FormplayerFrontend from "cloudcare/js/formplayer/app";
 import hqEvents from "cloudcare/js/formplayer/hq_events";
 

corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_list_spec.js

@@ -1,4 +1,4 @@
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import Backbone from "backbone";
 import initialPageData from "hqwebapp/js/initial_page_data";
 import FormplayerFrontend from "cloudcare/js/formplayer/app";

corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/query_spec.js

@@ -1,5 +1,5 @@
 import Backbone from "backbone";
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import initialPageData from "hqwebapp/js/initial_page_data";
 import Utils from "cloudcare/js/formplayer/utils/utils";
 import QueryListView from "cloudcare/js/formplayer/menus/views/query";

corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/session_middleware_spec.js

@@ -1,4 +1,4 @@
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import Middleware from "cloudcare/js/formplayer/middleware";
 
 describe('SessionMiddle', function () {

corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/split_screen_case_search_spec.js

@@ -1,7 +1,7 @@
 import _ from "underscore";
 import Backbone from "backbone";
 import Marionette from "backbone.marionette";
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import Toggles from "hqwebapp/js/toggles";
 import FormplayerFrontend from "cloudcare/js/formplayer/app";
 import API from "cloudcare/js/formplayer/menus/api";
@@ -13,36 +13,35 @@ import UsersModels from "cloudcare/js/formplayer/users/models";
 
 describe('Split Screen Case Search', function () {
     const currentUrl = new Utils.CloudcareUrl({ appId: 'abc123' }),
-        sandbox = sinon.sandbox.create(),
         stubs = {};
 
     before(function () {
-        sandbox.stub(Marionette.CollectionView.prototype, 'render').returns();
-        sandbox.stub(Utils, 'currentUrlToObject').callsFake(function () {
+        sinon.stub(Marionette.CollectionView.prototype, 'render').returns();
+        sinon.stub(Utils, 'currentUrlToObject').callsFake(function () {
             return currentUrl;
         });
 
-        sandbox.stub(Backbone.history, 'start').callsFake(sandbox.spy());
-        sandbox.stub(Backbone.history, 'getFragment').callsFake(function () {
+        sinon.stub(Backbone.history, 'start').callsFake(sinon.spy());
+        sinon.stub(Backbone.history, 'getFragment').callsFake(function () {
             return JSON.stringify(currentUrl);
         });
-        sandbox.stub(API, 'queryFormplayer').callsFake(FakeFormplayer.queryFormplayer);
+        sinon.stub(API, 'queryFormplayer').callsFake(FakeFormplayer.queryFormplayer);
 
         stubs.regions = {};
         FormplayerFrontend.regions = {
             getRegion: function (region) {
                 if (!_.has(stubs.regions, region)) {
                     stubs.regions[region] = {
                         region: region,
-                        show: sandbox.stub().callsFake(function () { return; }),
-                        empty: sandbox.stub().callsFake(function () { return; }),
+                        show: sinon.stub().callsFake(function () { return; }),
+                        empty: sinon.stub().callsFake(function () { return; }),
                     };
                 }
                 return stubs.regions[region];
             },
             addRegions: function () { return; },
         };
-        stubs.splitScreenToggleEnabled = sandbox.stub(Toggles, 'toggleEnabled').withArgs('SPLIT_SCREEN_CASE_SEARCH');
+        stubs.splitScreenToggleEnabled = sinon.stub(Toggles, 'toggleEnabled').withArgs('SPLIT_SCREEN_CASE_SEARCH');
     });
 
     beforeEach(function () {
@@ -54,11 +53,11 @@ describe('Split Screen Case Search', function () {
     });
 
     afterEach(function () {
-        sandbox.resetHistory();
+        sinon.resetHistory();
     });
 
     after(function () {
-        sandbox.restore();
+        sinon.restore();
     });
 
     describe('Controller actions', function () {

corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/user_spec.js

@@ -1,5 +1,5 @@
 import _ from "underscore";
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import FormplayerFrontend from "cloudcare/js/formplayer/app";
 import UsersCollections from "cloudcare/js/formplayer/users/collections";
 import UsersModels from "cloudcare/js/formplayer/users/models";

corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/utils_spec.js

@@ -1,6 +1,6 @@
 import _ from "underscore";
 import Backbone from "backbone";
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import initialPageData from "hqwebapp/js/initial_page_data";
 import FormplayerFrontend from "cloudcare/js/formplayer/app";
 import API from "cloudcare/js/formplayer/menus/api";

corehq/apps/cloudcare/static/cloudcare/js/spec/markdown_spec.js

@@ -1,21 +1,19 @@
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import initialPageData from "hqwebapp/js/initial_page_data";
 import hmacCallout from "integration/js/hmac_callout";
 import markdown from "cloudcare/js/markdown";
 
 describe('Markdown', function () {
     let render = markdown.render;
 
-    let sandbox;
     beforeEach(function () {
         initialPageData.clear();
         initialPageData.register("toggles_dict", { CASE_LIST_TILE_CUSTOM: false });
-        sandbox = sinon.sandbox.create();
     });
 
     afterEach(function () {
         initialPageData.unregister("toggles_dict");
-        sandbox.restore();
+        sinon.restore();
     });
 
     describe('Markdown basics', function () {

corehq/apps/cloudcare/static/cloudcare/js/spec/utils_spec.js

@@ -1,4 +1,4 @@
-import sinon from "sinon/pkg/sinon";
+import sinon from "sinon";
 import constants from "cloudcare/js/formplayer/constants";
 import utils from "cloudcare/js/utils";
 

corehq/apps/export/static/export/spec/ExportInstance.spec.js

@@ -2,7 +2,7 @@
 hqDefine("export/spec/ExportInstance.spec", [
     'jquery',
     'underscore',
-    'sinon/pkg/sinon',
+    'sinon',
     'hqwebapp/js/initial_page_data',
     'export/js/const',
     'export/js/models',
@@ -182,10 +182,8 @@ hqDefine("export/spec/ExportInstance.spec", [
 
             beforeEach(function () {
                 instance = new viewModels.ExportInstance(basicFormExport);
-                recordSaveAnalyticsSpy = sinon.spy();
+                recordSaveAnalyticsSpy = sinon.stub(instance, 'recordSaveAnalytics'),
                 server = sinon.fakeServer.create();
-
-                sinon.stub(instance, 'recordSaveAnalytics', recordSaveAnalyticsSpy);
             });
 
             afterEach(function () {

corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/hq.helpers.js

@@ -150,11 +150,15 @@ hqDefine("hqwebapp/js/bootstrap3/hq.helpers", [
             // Ignore HTTP methods that do not require CSRF protection
             if (!/^(GET|HEAD|OPTIONS|TRACE)$/.test(settings.type)) {
                 if (!this.crossDomain) {
-                    var $csrfToken = $("#csrfTokenContainer").val();
-                    xhr.setRequestHeader("X-CSRFToken", $csrfToken);
+                    var csrfToken = $("#csrfTokenContainer").val();
+                    if (csrfToken) {
+                        xhr.setRequestHeader("X-CSRFToken", csrfToken);
+                    }
                 }
                 var xsrfToken = $.cookie('XSRF-TOKEN');
-                xhr.setRequestHeader('X-XSRF-TOKEN', xsrfToken);
+                if (xsrfToken) {
+                    xhr.setRequestHeader('X-XSRF-TOKEN', xsrfToken);
+                }
             }
             xhr.withCredentials = true;
         },

corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/hq.helpers.js

@@ -138,11 +138,15 @@ hqDefine("hqwebapp/js/bootstrap5/hq.helpers", [
             // Ignore HTTP methods that do not require CSRF protection
             if (!/^(GET|HEAD|OPTIONS|TRACE)$/.test(settings.type)) {
                 if (!this.crossDomain) {
-                    var $csrfToken = $("#csrfTokenContainer").val();
-                    xhr.setRequestHeader("X-CSRFToken", $csrfToken);
+                    var csrfToken = $("#csrfTokenContainer").val();
+                    if (csrfToken) {
+                        xhr.setRequestHeader("X-CSRFToken", csrfToken);
+                    }
                 }
                 var xsrfToken = $.cookie('XSRF-TOKEN');
-                xhr.setRequestHeader('X-XSRF-TOKEN', xsrfToken);
+                if (xsrfToken) {
+                    xhr.setRequestHeader('X-XSRF-TOKEN', xsrfToken);
+                }
             }
             xhr.withCredentials = true;
         },

corehq/apps/hqwebapp/static/hqwebapp/js/hqModules.js

@@ -75,7 +75,6 @@ function hqDefine(path, dependencies, moduleAccessor) {
                 'moment/moment': 'moment',
                 'crypto-js/crypto-js': 'CryptoJS',
                 'hqwebapp/js/lib/modernizr': 'Modernizr',
-                'sinon/pkg/sinon': 'sinon',
             };
             if (window.USE_BOOTSTRAP5) {
                 thirdPartyGlobals['es6!hqwebapp/js/bootstrap5_loader'] = 'bootstrap';

corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/notifications/spec/NotificationsService.spec.mo.js.diff.txt

@@ -4,7 +4,7 @@
 -hqDefine("notifications/spec/bootstrap3/NotificationsService.spec.mo", [
 +hqDefine("notifications/spec/bootstrap5/NotificationsService.spec.mo", [
      'jquery',
-     'sinon/pkg/sinon',
+     'sinon',
 -    'notifications/js/bootstrap3/notifications_service',
 +    'notifications/js/bootstrap5/notifications_service',
  ], function (

corehq/apps/mocha/static/mocha/js/main.js

@@ -1,7 +1,7 @@
 hqDefine("mocha/js/main", [
     "mocha/mocha",
     "chai/chai",
-    "sinon/pkg/sinon",
+    "sinon",
     "analytix/js/google",
     "analytix/js/kissmetrix",
 ], function (
@@ -9,7 +9,7 @@
     chai,
     sinon,
     googleAnalytics,
     kissAnalytics
 ) {
     mocha.setup('bdd');
     window.assert = chai.assert;

corehq/apps/notifications/static/notifications/spec/bootstrap3/NotificationsService.spec.mo.js

@@ -1,6 +1,6 @@
 hqDefine("notifications/spec/bootstrap3/NotificationsService.spec.mo", [
     'jquery',
-    'sinon/pkg/sinon',
+    'sinon',
     'notifications/js/bootstrap3/notifications_service',
 ], function (
     $,
@@ -29,7 +29,7 @@ hqDefine("notifications/spec/bootstrap3/NotificationsService.spec.mo", [
             };
 
         var fakePromise = new FakePromise({});
-        sinon.stub($, 'ajax', fakePromise.mock);
+        sinon.stub($, 'ajax').callsFake(fakePromise.mock);
 
         it('Initialization', function () {
             var csrfToken = $("#csrfTokenContainer").val();

corehq/apps/notifications/static/notifications/spec/bootstrap5/NotificationsService.spec.mo.js

@@ -1,6 +1,6 @@
 hqDefine("notifications/spec/bootstrap5/NotificationsService.spec.mo", [
     'jquery',
-    'sinon/pkg/sinon',
+    'sinon',
     'notifications/js/bootstrap5/notifications_service',
 ], function (
     $,
@@ -29,7 +29,7 @@ hqDefine("notifications/spec/bootstrap5/NotificationsService.spec.mo", [
             };
 
         var fakePromise = new FakePromise({});
-        sinon.stub($, 'ajax', fakePromise.mock);
+        sinon.stub($, 'ajax').callsFake(fakePromise.mock);
 
         it('Initialization', function () {
             var csrfToken = $("#csrfTokenContainer").val();

package.json

@@ -100,7 +100,7 @@
         "mocha-headless-chrome": "4.0.0",
         "prettier": "^3.3.3",
         "prettier-plugin-jinja-template": "^2.0.0",
-        "sinon": "2.3.2"
+        "sinon": "19.0.2"
     },
     "engines": {
         "yarn": ">= 1.0.0"