chore(deps): update dependency sinon to v19 (#10342)

* chore(deps): update dependency sinon to v19 * Fix breaking change in sinon fake timers * Add missing method calls * stub only Date.now --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Henrique <[email protected]>
opencollective · Dec 12, 2024 · a478ff9 · a478ff9
1 parent e7fc5fe
commit a478ff9
Show file tree

Hide file tree

Showing 18 changed files with 91 additions and 75 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -186,7 +186,7 @@
     "nyc": "^17.0.0",
     "opentelemetry-instrumentation-sequelize": "^0.41.0",
     "prettier": "3.4.2",
-    "sinon": "^18.0.0",
+    "sinon": "^19.0.0",
     "sinon-chai": "^3.7.0",
     "supertest": "^7.0.0",
     "ts-unused-exports": "^10.1.0",

diff --git a/test/cron/hourly/71-send-resume-subscription-emails.test.ts b/test/cron/hourly/71-send-resume-subscription-emails.test.ts
@@ -102,7 +102,7 @@ describe('cron/hourly/71-send-resume-subscription-emails', () => {
       );
 
       // 1st reminder
-      clock = sandbox.useFakeTimers({ now: moment(nextReminderDate).add(1, 'day').toDate(), shouldAdvanceTime: true });
+      clock = sandbox.useFakeTimers({ now: moment(nextReminderDate).add(1, 'day').toDate(), toFake: ['Date'] });
       updatedOrders = await runCronJob();
       expect(updatedOrders).to.have.length(1);
       expect(updatedOrders[0].status).to.equal(OrderStatuses.PAUSED);
@@ -125,7 +125,7 @@ describe('cron/hourly/71-send-resume-subscription-emails', () => {
 
       // 2nd reminder
       clock.restore();
-      clock = sandbox.useFakeTimers({ now: moment(nextReminderDate).add(1, 'day').toDate(), shouldAdvanceTime: true });
+      clock = sandbox.useFakeTimers({ now: moment(nextReminderDate).add(1, 'day').toDate(), toFake: ['Date'] });
       updatedOrders = await runCronJob();
       expect(updatedOrders).to.have.length(1);
       expect(updatedOrders[0].status).to.equal(OrderStatuses.PAUSED);
@@ -148,7 +148,7 @@ describe('cron/hourly/71-send-resume-subscription-emails', () => {
 
       // 3rd and final reminder
       clock.restore();
-      clock = sandbox.useFakeTimers({ now: moment(nextReminderDate).add(1, 'day').toDate(), shouldAdvanceTime: true });
+      clock = sandbox.useFakeTimers({ now: moment(nextReminderDate).add(1, 'day').toDate(), toFake: ['Date'] });
       updatedOrders = await runCronJob();
       expect(updatedOrders).to.have.length(1);
       expect(updatedOrders[0].data.resumeContribution.reminder).to.equal(4);
@@ -165,7 +165,7 @@ describe('cron/hourly/71-send-resume-subscription-emails', () => {
 
       // No more reminders
       clock.restore();
-      clock = sandbox.useFakeTimers({ now: moment(nextReminderDate).add(60, 'day').toDate(), shouldAdvanceTime: true });
+      clock = sandbox.useFakeTimers({ now: moment(nextReminderDate).add(60, 'day').toDate(), toFake: ['Date'] });
       updatedOrders = await runCronJob();
       expect(updatedOrders).to.have.length(0);
     });

diff --git a/test/cron/monthly/host-settlement.test.js b/test/cron/monthly/host-settlement.test.js
@@ -198,7 +198,7 @@ describe('cron/monthly/host-settlement', () => {
     );
 
     // Refund contributions that must be
-    let clock = sinon.useFakeTimers(moment(lastMonth).add(1, 'day').toDate());
+    let clock = sinon.useFakeTimers({ toFake: ['Date'], now: moment(lastMonth).add(1, 'day').toDate() });
     await createRefundTransaction(unsettledRefundedContribution, 0, null, user, fakeUUID('00000008'));
     await createRefundTransaction(settledRefundedContribution, 0, null, user, fakeUUID('00000009'));
     clock.restore();
@@ -225,7 +225,7 @@ describe('cron/monthly/host-settlement', () => {
     });
 
     // Create Contributions
-    clock = useFakeTimers(lastMonth.toDate()); // Manually setting today's date
+    clock = useFakeTimers({ now: lastMonth.toDate(), toFake: ['Date'] }); // Manually setting today's date
     const order = await fakeOrder({
       description: 'EUR Contribution with tip + host fee',
       CollectiveId: eurCollective.id,

diff --git a/test/server/graphql/common/transactions.test.js b/test/server/graphql/common/transactions.test.js
@@ -85,7 +85,7 @@ describe('server/graphql/common/transactions', () => {
       kind: TransactionKind.CONTRIBUTION,
       OrderId: order.id,
     });
-    timer = useFakeTimers(new Date('2020-07-23 0:0').getTime());
+    timer = useFakeTimers({ now: new Date('2020-07-23 0:0').getTime(), toFake: ['Date'] });
     oldTransaction = await fakeTransaction({
       CollectiveId: collective.id,
       FromCollectiveId: contributor.CollectiveId,

diff --git a/test/server/graphql/v1/invoices.test.js b/test/server/graphql/v1/invoices.test.js
@@ -18,7 +18,7 @@ import * as utils from '../../../utils';
  * The payment method is always stripe for now.
  */
 async function donate(user, currency, amount, createdAt, collective) {
-  const timer = useFakeTimers(new Date(createdAt).getTime());
+  const timer = useFakeTimers({ toFake: ['Date'], now: new Date(createdAt).getTime() });
   try {
     await store.stripeConnectedAccount(collective.HostCollectiveId);
     await store.stripeOneTimeDonation({

diff --git a/test/server/graphql/v2/mutation/OrderMutations.test.ts b/test/server/graphql/v2/mutation/OrderMutations.test.ts
@@ -2840,7 +2840,7 @@ describe('server/graphql/v2/mutation/OrderMutations', () => {
         describe('when charge is due today', () => {
           it('from monthly to yearly', async () => {
             const today = moment(new Date(2022, 0, 1)); // 1st of January 2022
-            clock = useFakeTimers(today.toDate()); // Manually setting today's date
+            clock = useFakeTimers({ now: today.toDate(), toFake: ['Date'] }); // Manually setting today's date
             const { result, order } = await updateFakeOrder(today, 'month', 'year');
             expect(result.errors).to.not.exist;
             expect(result.data.updateOrder.tier.name).to.eq(fixedYearlyTier.name);
@@ -2852,7 +2852,7 @@ describe('server/graphql/v2/mutation/OrderMutations', () => {
 
           it('from yearly to monthly', async () => {
             const today = moment(new Date(2022, 0, 1)); // 1st of January 2022
-            clock = useFakeTimers(today.toDate()); // Manually setting today's date
+            clock = useFakeTimers({ now: today.toDate(), toFake: ['Date'] }); // Manually setting today's date
             const { result, order } = await updateFakeOrder(today, 'year', 'month');
             expect(result.errors).to.not.exist;
             expect(result.data.updateOrder.tier.name).to.eq(fixedMonthlyTier.name);
@@ -2866,7 +2866,7 @@ describe('server/graphql/v2/mutation/OrderMutations', () => {
         describe('with a recent past charge (keep the existing date)', () => {
           it('from monthly to yearly', async () => {
             const today = moment(new Date(2022, 0, 12)); // 12th of January 2022
-            clock = useFakeTimers(today.toDate()); // Manually setting today's date
+            clock = useFakeTimers({ now: today.toDate(), toFake: ['Date'] }); // Manually setting today's date
             const firstOfJanuary = moment(new Date(2022, 0, 1)); // 1st of January 2022
             const { result, order } = await updateFakeOrder(firstOfJanuary, 'month', 'year');
             expect(result.errors).to.not.exist;
@@ -2879,7 +2879,7 @@ describe('server/graphql/v2/mutation/OrderMutations', () => {
 
           it('from yearly to monthly', async () => {
             const today = moment(new Date(2022, 0, 12)); // 12th of January 2022
-            clock = useFakeTimers(today.toDate()); // Manually setting today's date
+            clock = useFakeTimers({ now: today.toDate(), toFake: ['Date'] }); // Manually setting today's date
             const firstOfJanuary = moment(new Date(2022, 0, 1)); // 1st of January 2022
             const { result, order } = await updateFakeOrder(firstOfJanuary, 'year', 'month');
             expect(result.errors).to.not.exist;
@@ -2894,7 +2894,7 @@ describe('server/graphql/v2/mutation/OrderMutations', () => {
         describe('with an old dur charge', () => {
           it('from monthly to yearly', async () => {
             const today = moment(new Date(2022, 6, 1)); // 1st of July 2022
-            clock = useFakeTimers(today.toDate()); // Manually setting today's date
+            clock = useFakeTimers({ now: today.toDate(), toFake: ['Date'] }); // Manually setting today's date
             const firstOfJanuary = moment(new Date(2022, 0, 1)); // 1st of January 2022
             const { result, order } = await updateFakeOrder(firstOfJanuary, 'month', 'year');
             expect(result.errors).to.not.exist;
@@ -2907,7 +2907,7 @@ describe('server/graphql/v2/mutation/OrderMutations', () => {
 
           it('from yearly to monthly', async () => {
             const today = moment(new Date(2022, 6, 12)); // 12th of July 2022
-            clock = useFakeTimers(today.toDate()); // Manually setting today's date
+            clock = useFakeTimers({ now: today.toDate(), toFake: ['Date'] }); // Manually setting today's date
             const firstOfJanuary = moment(new Date(2022, 0, 1)); // 1st of January 2022
             const { result, order } = await updateFakeOrder(firstOfJanuary, 'year', 'month');
             expect(result.errors).to.not.exist;
@@ -2920,7 +2920,7 @@ describe('server/graphql/v2/mutation/OrderMutations', () => {
 
           it('from yearly to monthly (on the 1st of the month)', async () => {
             const today = moment(new Date(2022, 6, 1)); // 1st of July 2022
-            clock = useFakeTimers(today.toDate()); // Manually setting today's date
+            clock = useFakeTimers({ now: today.toDate(), toFake: ['Date'] }); // Manually setting today's date
             const firstOfJanuary = moment(new Date(2022, 0, 1)); // 1st of January 2022
             const { result, order } = await updateFakeOrder(firstOfJanuary, 'year', 'month');
             expect(result.errors).to.not.exist;

diff --git a/test/server/graphql/v2/mutation/UploadedFileMutations.test.ts b/test/server/graphql/v2/mutation/UploadedFileMutations.test.ts
@@ -297,7 +297,7 @@ describe('server/graphql/v2/mutation/UploadedFileMutations', () => {
           const hourlyLimit = config.limits.klippa.perUser.hour;
 
           // Mock the clock to make sure we don't trigger the hourly limit
-          clock = sinon.useFakeTimers(moment().subtract(20, 'hours').toDate());
+          clock = sinon.useFakeTimers({ now: moment().subtract(20, 'hours').toDate(), toFake: ['Date'] });
           const validRequests = [];
           for (let i = 0; i < dailyLimit; i++) {
             const result = await graphqlQueryV2(uploadFileMutation, args, user);

diff --git a/test/server/graphql/v2/query/HostMetricsQuery.test.js b/test/server/graphql/v2/query/HostMetricsQuery.test.js
@@ -60,7 +60,7 @@ describe('server/graphql/v2/query/HostMetricsQuery', () => {
     collective1 = await fakeCollective({ admin: collectiveAdminUser, HostCollectiveId: host.id, hostFeePercent: 30 });
     collective2 = await fakeCollective({ admin: collectiveAdminUser, HostCollectiveId: host.id, hostFeePercent: 30 });
 
-    let clock = useFakeTimers(new Date('2021-02-01 0:0').getTime());
+    let clock = useFakeTimers({ now: new Date('2021-02-01 0:0').getTime(), toFake: ['Date'] });
     try {
       const order1 = await fakeOrder({
         CollectiveId: collective1.id,
@@ -72,7 +72,7 @@ describe('server/graphql/v2/query/HostMetricsQuery', () => {
       clock.restore();
     }
 
-    clock = useFakeTimers(new Date('2021-06-01 0:0').getTime());
+    clock = useFakeTimers({ now: new Date('2021-06-01 0:0').getTime(), toFake: ['Date'] });
     try {
       const order2 = await fakeOrder({
         CollectiveId: collective2.id,

diff --git a/test/server/lib/auth.test.js b/test/server/lib/auth.test.js
@@ -8,7 +8,10 @@ import * as auth from '../../../server/lib/auth';
 describe('server/lib/auth', () => {
   it('should generate valid tokens', () => {
     // Given that time `Date.now` returns zero (0)
-    const clock = useFakeTimers();
+    const clock = useFakeTimers({
+      now: 0,
+      toFake: ['Date'],
+    });
 
     // When the token is generated
     const token = auth.createJwt('subject', { foo: 'bar' }, 5);

diff --git a/test/server/lib/recurring-contributions.test.js b/test/server/lib/recurring-contributions.test.js
@@ -121,7 +121,7 @@ describe('server/lib/recurring-contributions', () => {
       };
 
       // And given that we freeze time
-      const clock = useFakeTimers(new Date('2018-01-28 0:0').getTime());
+      const clock = useFakeTimers({ now: new Date('2018-01-28 0:0').getTime(), toFake: ['Date'] });
 
       // When dates are updated with failure
       const updatedDates = getNextChargeAndPeriodStartDates('failure', order);
@@ -185,7 +185,7 @@ describe('server/lib/recurring-contributions', () => {
       };
 
       // And given that we freeze time
-      const clock = useFakeTimers(new Date('2018-01-28 0:0').getTime());
+      const clock = useFakeTimers({ now: new Date('2018-01-28 0:0').getTime(), toFake: ['Date'] });
 
       // when dates are updated with 'updated' status
       const updatedDates = getNextChargeAndPeriodStartDates('updated', order);

diff --git a/test/server/lib/spam.test.js b/test/server/lib/spam.test.js
@@ -19,7 +19,7 @@ describe('server/lib/spam', () => {
   let clock;
 
   before(() => {
-    clock = useFakeTimers(new Date('2020-01-01T00:00:00.000Z'));
+    clock = useFakeTimers({ now: new Date('2020-01-01T00:00:00.000Z'), toFake: ['Date'] });
   });
 
   after(() => {