Merge version 14.0.0

* main: 14.0.0 Drop node 12 13.0.2 Update fake-timers master => main Bump nokogiri from 1.13.3 to 1.13.4 (#2451) Bump minimist from 1.2.5 to 1.2.6 (#2450) Bump nokogiri from 1.13.1 to 1.13.3 Add some jsdoc
sinonjs · May 7, 2022 · 6a83d99 · 6a83d99
2 parents cb9ca6c + 242b429
commit 6a83d99
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 25 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: Node CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
       - "**"
@@ -112,7 +112,7 @@ jobs:
         run: bash <(curl -s https://codecov.io/bash) -F unit -s coverage/lcov.info
 
   saucelabs-test:
-    if: ${{ github.ref == 'refs/heads/master' }}
+    if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -143,7 +143,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12, 14, 16]
+        node-version: [14, 16, 18]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,24 @@
 # Changes
 
+## 14.0.0
+
+- [`c2bbd826`](https://github.com/sinonjs/sinon/commit/c2bbd82641444eb5b32822489ae40f185afbbf00)
+  Drop node 12 (Morgan Roderick)
+  > And embrace Node 18
+  >
+  > See https://nodejs.org/en/about/releases/
+
+_Released by Morgan Roderick on 2022-05-07._
+
+## 13.0.2
+
+- [`bddb631a`](https://github.com/sinonjs/sinon/commit/bddb631aab6afc3e663a5db847c675ea96c90970)
+  Update fake-timers (Carl-Erik Kopseng)
+- [`eaed0eb2`](https://github.com/sinonjs/sinon/commit/eaed0eb24bd8f42b0484b8861a5ff066001da5d5)
+  Bump nokogiri from 1.13.3 to 1.13.4 (#2451) (dependabot[bot])
+
+_Released by [Carl-Erik Kopseng](https://github.com/fatso83) on 2022-04-14._
+
 ## 13.0.1
 
 - [`ec4223f9`](https://github.com/sinonjs/sinon/commit/ec4223f94076d809483e3c6a7536cfc1278dd3c9)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -205,15 +205,15 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.7.1)
+    mini_portile2 (2.8.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.14.3)
     multipart-post (2.1.1)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.13.4)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.20.0)
       faraday (>= 0.9)

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -5,8 +5,8 @@ description: >-
 url: 'https://sinonjs.org'
 github_username: sinonjs
 sinon:
-  current_release: v13.0.1
-  current_major_version: 13
+  current_release: v14.0.0
+  current_major_version: 14
 markdown: kramdown
 kramdown:
   input: GFM

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -6,6 +6,25 @@ permalink: /releases/changelog
 
 # Changelog
 
+## 14.0.0
+
+- [`c2bbd826`](https://github.com/sinonjs/sinon/commit/c2bbd82641444eb5b32822489ae40f185afbbf00)
+  Drop node 12 (Morgan Roderick)
+  > And embrace Node 18
+  >
+  > See https://nodejs.org/en/about/releases/
+
+_Released by Morgan Roderick on 2022-05-07._
+
+## 13.0.2
+
+- [`bddb631a`](https://github.com/sinonjs/sinon/commit/bddb631aab6afc3e663a5db847c675ea96c90970)
+  Update fake-timers (Carl-Erik Kopseng)
+- [`eaed0eb2`](https://github.com/sinonjs/sinon/commit/eaed0eb24bd8f42b0484b8861a5ff066001da5d5)
+  Bump nokogiri from 1.13.3 to 1.13.4 (#2451) (dependabot[bot])
+
+_Released by [Carl-Erik Kopseng](https://github.com/fatso83) on 2022-04-14._
+
 ## 13.0.1
 
 - [`ec4223f9`](https://github.com/sinonjs/sinon/commit/ec4223f94076d809483e3c6a7536cfc1278dd3c9)

diff --git a/lib/sinon/default-behaviors.js b/lib/sinon/default-behaviors.js
@@ -269,6 +269,7 @@ var defaultBehaviors = {
         Object.defineProperty(rootStub.rootObj, rootStub.propName, {
             value: newVal,
             enumerable: true,
+            writable: true,
             configurable:
                 rootStub.shadowsPropOnPrototype ||
                 isPropertyConfigurable(rootStub.rootObj, rootStub.propName),

diff --git a/lib/sinon/proxy-call.js b/lib/sinon/proxy-call.js
@@ -14,6 +14,11 @@ var map = arrayProto.map;
 var reduce = arrayProto.reduce;
 var slice = arrayProto.slice;
 
+/**
+ * @param proxy
+ * @param text
+ * @param args
+ */
 function throwYieldError(proxy, text, args) {
     var msg = functionName(proxy) + text;
     if (args.length) {
@@ -250,6 +255,15 @@ Object.defineProperty(callProto, "stack", {
 
 callProto.invokeCallback = callProto.yield;
 
+/**
+ * @param proxy
+ * @param thisValue
+ * @param args
+ * @param returnValue
+ * @param exception
+ * @param id
+ * @param errorWithCallStack
+ */
 function createProxyCall(
     proxy,
     thisValue,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "xhr",
     "assert"
   ],
-  "version": "13.0.1",
+  "version": "14.0.0",
   "homepage": "https://sinonjs.org/",
   "author": "Christian Johansen",
   "repository": {
@@ -74,7 +74,7 @@
   },
   "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",