Update Mocha, Sinon, Chai and relevant tests

Author: kamilogorek

package.json

@@ -25,7 +25,7 @@
     "bluebird": "^3.4.1",
     "browserify-versionify": "^1.0.6",
     "bundle-collapser": "^1.2.1",
-    "chai": "2.3.0",
+    "chai": "^4.1.1",
     "derequire": "2.0.3",
     "es6-promise": "^4.0.5",
     "eslint-config-prettier": "^2.3.0",
@@ -48,10 +48,10 @@
     "jquery": "^2.1.4",
     "lint-staged": "^4.0.4",
     "lodash": "^3.10.1",
-    "mocha": "2.5.3",
+    "mocha": "^3.5.0",
     "prettier": "^1.6.1",
     "proxyquireify": "^3.0.2",
-    "sinon": "1.7.3",
+    "sinon": "^3.2.1",
     "through2": "^2.0.0",
     "typescript": "^1.8.10",
     "whatwg-fetch": "^1.0.0"

test/integration/test.js

@@ -36,6 +36,8 @@ function parseUrl(url) {
 }
 
 describe('integration', function() {
+  this.timeout(10000);
+
   beforeEach(function(done) {
     this.iframe = createIframe(done);
   });

test/plugins/react-native.test.js

@@ -172,7 +172,10 @@ describe('React Native plugin', function() {
       );
       assert.equal(lastXhr.method, 'POST');
       assert.equal(lastXhr.requestBody, '{"foo":"bar"}');
-      assert.equal(lastXhr.requestHeaders['Content-type'], 'application/json');
+      assert.equal(
+        lastXhr.requestHeaders['Content-type'],
+        'application/json;charset=utf-8'
+      );
       assert.equal(lastXhr.requestHeaders['Origin'], 'react-native://');
     });
 
@@ -257,7 +260,7 @@ describe('React Native plugin', function() {
     it('clears persisted errors after they are reported', function() {
       var payload = {abc: 123};
       var callback;
-      self.sinon.stub(Raven, '_sendProcessedPayload', function(p, cb) {
+      self.sinon.stub(Raven, '_sendProcessedPayload').callsFake(function(p, cb) {
         callback = cb;
       });
       reactNativePlugin._restorePayload = self.sinon
@@ -276,7 +279,7 @@ describe('React Native plugin', function() {
     it('does not clear persisted errors if there is an error reporting', function() {
       var payload = {abc: 123};
       var callback;
-      self.sinon.stub(Raven, '_sendProcessedPayload', function(p, cb) {
+      self.sinon.stub(Raven, '_sendProcessedPayload').callsFake(function(p, cb) {
         callback = cb;
       });
       reactNativePlugin._restorePayload = self.sinon

test/raven.test.js

@@ -1609,6 +1609,8 @@ describe('globals', function() {
 
     it('should no-op if CORS is not supported', function() {
       delete XMLHttpRequest.prototype.withCredentials;
+      var oldSupportsCORS = sinon.xhr.supportsCORS;
+      sinon.xhr.supportsCORS = false;
 
       var oldXDR = window.XDomainRequest;
       window.XDomainRequest = undefined;
@@ -1623,6 +1625,7 @@ describe('globals', function() {
       assert.equal(this.requests.length, 1); // the "test" xhr
       assert.equal(this.requests[0].readyState, 0);
 
+      sinon.xhr.supportsCORS = oldSupportsCORS;
       window.XDomainRequest = oldXDR;
     });