Feature/migrating sinon to 6.0.1

package.json

@@ -35,14 +35,12 @@
     },
     "devDependencies": {
         "chai": "^4.1.2",
-        "chai-as-promised": "^7.1.1",
         "coveralls": "^3.0.1",
-        "eslint": "^4.19.1",
+        "eslint": "^5.0.1",
         "istanbul": "^0.4.5",
         "mocha": "^5.2.0",
         "mocha-lcov-reporter": "^1.3.0",
         "proxyquire": "^2.0.1",
-        "sinon": "^4.2.2",
-        "sinon-stub-promise": "^4.0.0"
+        "sinon": "^6.0.1"
     }
 }

test/Bitbucket.js

@@ -1,6 +1,7 @@
-let expect = require('chai').expect,
+let chai = require('chai'),
     sinon = require('sinon'),
-    proxyquire = require('proxyquire');
+    proxyquire = require('proxyquire'),
+    expect = chai.expect;
 
 describe('Bitbucket', function() {
     let Bitbucket,
@@ -94,7 +95,7 @@ describe('Bitbucket', function() {
         let promise;
 
         beforeEach(function() {
-            promise = sinon.stub().returnsPromise();
+            promise = sinon.stub();
 
             Bitbucket = proxyquire('../lib/Bitbucket', {
                 'request-promise': promise
@@ -110,7 +111,9 @@ describe('Bitbucket', function() {
             let result = client.obtainTokens();
 
             // assert
-            expect(result.rejectValue.toString()).to.equal('Error: Can not fetch client tokens. Stack trace: foobar');
+            return result.catch((err) => {
+                expect(err.toString()).to.equal('Error: Can not fetch client tokens. Stack trace: foobar');
+            });
         });
 
         it('should throw an error if response is not valid JSON', function() {
@@ -122,7 +125,9 @@ describe('Bitbucket', function() {
             let result = client.obtainTokens();
 
             // assert
-            expect(result.rejectValue.toString()).to.equal('Error: Can not fetch client tokens. Stack trace: Error: Cannot parse tokens. Stack trace: SyntaxError: Unexpected token o in JSON at position 1');
+            return result.catch((err) => {
+                expect(err.toString()).to.equal('Error: Can not fetch client tokens. Stack trace: Error: Cannot parse tokens. Stack trace: SyntaxError: Unexpected token o in JSON at position 1');
+            });
         });
 
         it('should set access and refresh tokens if request is successful', function() {
@@ -135,19 +140,21 @@ describe('Bitbucket', function() {
 
             // act
             let client = new Bitbucket(clientId, clientSecret, accessToken, refreshToken);
-            client.obtainTokens();
+            let result = client.obtainTokens();
 
             // assert
-            expect(client.accessToken).to.equal(response.access_token);
-            expect(client.refreshToken).to.equal(response.refresh_token);
+            return result.then(() => {
+                expect(client.accessToken).to.equal(response.access_token);
+                expect(client.refreshToken).to.equal(response.refresh_token);
+            });
         });
     });
 
     describe('refreshTokens', function() {
         let promise;
 
         beforeEach(function() {
-            promise = sinon.stub().returnsPromise();
+            promise = sinon.stub();
 
             Bitbucket = proxyquire('../lib/Bitbucket', {
                 'request-promise': promise
@@ -163,7 +170,9 @@ describe('Bitbucket', function() {
             let result = client.refreshTokens();
 
             // assert
-            expect(result.rejectValue.toString()).to.equal('Error: Can not refresh access token by given refresh: refreshToken. Stack trace: foobar');
+            return result.catch((err) => {
+                expect(err.toString()).to.equal('Error: Can not refresh access token by given refresh: refreshToken. Stack trace: foobar');
+            });
         });
 
         it('should throw an error if response is not valid JSON', function() {
@@ -175,8 +184,9 @@ describe('Bitbucket', function() {
             let result = client.refreshTokens();
 
             // assert
-            expect(result.rejectValue.toString()).to.equal('Error: Can not refresh access token by given refresh: refreshToken. Stack trace: Error: Cannot parse tokens. Stack trace: SyntaxError: Unexpected token o in JSON at position 1');
-
+            return result.catch((err) => {
+                expect(err.toString()).to.equal('Error: Can not refresh access token by given refresh: refreshToken. Stack trace: Error: Cannot parse tokens. Stack trace: SyntaxError: Unexpected token o in JSON at position 1');
+            });
         });
 
         it('should refresh access token by given refresh token', function() {
@@ -188,10 +198,12 @@ describe('Bitbucket', function() {
 
             // act
             let client = new Bitbucket(clientId, clientSecret, accessToken, refreshToken);
-            client.refreshTokens();
+            let result = client.refreshTokens();
 
             // assert
-            expect(client.accessToken).to.equal(response.access_token);
+            return result.then(() => {
+                expect(client.accessToken).to.equal(response.access_token);
+            });
         });
     });
 

test/Jira.js

@@ -1,13 +1,8 @@
 let chai = require('chai'),
-    chaiAsPromised = require('chai-as-promised'),
     sinon = require('sinon'),
-    sinonStubPromise = require('sinon-stub-promise'),
     proxyquire = require('proxyquire'),
     expect = chai.expect;
 
-sinonStubPromise(sinon);
-chai.use(chaiAsPromised);
-
 describe('Jira', function() {
     let Jira,
         domain,
@@ -122,7 +117,7 @@ describe('Jira', function() {
         let promise;
 
         beforeEach(function() {
-            promise = sinon.stub().returnsPromise();
+            promise = sinon.stub();
 
             Jira = proxyquire('../lib/Jira', {
                 'request-promise': promise
@@ -198,7 +193,9 @@ describe('Jira', function() {
             let result = jira.transitionIssue(issueId, options);
 
             // assert
-            expect(result.rejectValue.toString()).to.equal('Error: Can not transition issue FOO-666 to 323. Stack trace: bad request');
+            return result.catch((err) => {
+                expect(err.toString()).to.equal('Error: Can not transition issue FOO-666 to 323. Stack trace: bad request');
+            });
         });
 
         it('should return empty response if successful', function() {