From bfeee1b803334b92143fa6a288b829dcab2ae033 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 28 Jun 2022 21:21:51 +0200 Subject: [PATCH] DEV: Update `sinon` (#17266) --- app/assets/javascripts/discourse/package.json | 2 +- .../tests/unit/lib/time-shortcut-test.js | 6 ++++++ app/assets/javascripts/yarn.lock | 18 +++++++++--------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index a8fa97449f0..f419a7a8dea 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -69,7 +69,7 @@ "qunit-dom": "^1.6.0", "sass": "^1.32.8", "select-kit": "^1.0.0", - "sinon": "^13.0.1", + "sinon": "^14.0.0", "tippy.js": "^6.3.7", "virtual-dom": "^2.1.1", "webpack": "^5.73.0", diff --git a/app/assets/javascripts/discourse/tests/unit/lib/time-shortcut-test.js b/app/assets/javascripts/discourse/tests/unit/lib/time-shortcut-test.js index 8edc420a26b..a00b202b859 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/time-shortcut-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/time-shortcut-test.js @@ -25,6 +25,7 @@ module( "shows later_today in the morning" ); + this.clock.restore(); this.clock = fakeTime("2100-04-19 18:00:00", timezone, true); // evening result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); assert.notOk(result.includes("doesn't show later_today in the evening")); @@ -41,6 +42,7 @@ module( "shows later_this_week on Wednesdays" ); + this.clock.restore(); this.clock = fakeTime("2100-04-22 18:00:00", timezone, true); // Thursday result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); assert.notOk( @@ -48,6 +50,7 @@ module( "doesn't show later_this_week on Thursdays" ); + this.clock.restore(); this.clock = fakeTime("2100-04-23 18:00:00", timezone, true); // Friday result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); assert.notOk( @@ -72,6 +75,7 @@ module( "shows this_weekend on Thursdays" ); + this.clock.restore(); this.clock = fakeTime("2100-04-23 18:00:00", timezone, true); // Friday result = hideDynamicTimeShortcuts( shortcuts, @@ -83,6 +87,7 @@ module( "doesn't show this_weekend on Fridays" ); + this.clock.restore(); this.clock = fakeTime("2100-04-24 18:00:00", timezone, true); // Saturday result = hideDynamicTimeShortcuts( shortcuts, @@ -94,6 +99,7 @@ module( "doesn't show this_weekend on Saturdays" ); + this.clock.restore(); this.clock = fakeTime("2100-04-25 18:00:00", timezone, true); // Sunday result = hideDynamicTimeShortcuts( shortcuts, diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock index 03ef7d5474e..0779ca63fa5 100644 --- a/app/assets/javascripts/yarn.lock +++ b/app/assets/javascripts/yarn.lock @@ -1390,10 +1390,10 @@ dependencies: type-detect "4.0.8" -"@sinonjs/fake-timers@>=5", "@sinonjs/fake-timers@^9.0.0": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.0.tgz#8c92c56f195e0bed4c893ba59c8e3d55831ca0df" - integrity sha512-M8vapsv9qQupMdzrVzkn5rb9jG7aUTEPAZdMtME2PuBaefksFZVE2C1g4LBRTkF/k3nRDNbDc5tp5NFC1PEYxA== +"@sinonjs/fake-timers@>=5", "@sinonjs/fake-timers@^9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c" + integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw== dependencies: "@sinonjs/commons" "^1.7.0" @@ -9756,13 +9756,13 @@ simple-html-tokenizer@^0.5.8: resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz#4c5186083c164ba22a7b477b7687ac056ad6b1d9" integrity sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og== -sinon@^13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-13.0.1.tgz#2a568beca2084c48985dd98e276e065c81738e3c" - integrity sha512-8yx2wIvkBjIq/MGY1D9h1LMraYW+z1X0mb648KZnKSdvLasvDu7maa0dFaNYdTDczFgbjNw2tOmWdTk9saVfwQ== +sinon@^14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-14.0.0.tgz#203731c116d3a2d58dc4e3cbe1f443ba9382a031" + integrity sha512-ugA6BFmE+WrJdh0owRZHToLd32Uw3Lxq6E6LtNRU+xTVBefx632h03Q7apXWRsRdZAJ41LB8aUfn2+O4jsDNMw== dependencies: "@sinonjs/commons" "^1.8.3" - "@sinonjs/fake-timers" "^9.0.0" + "@sinonjs/fake-timers" "^9.1.2" "@sinonjs/samsam" "^6.1.1" diff "^5.0.0" nise "^5.1.1"