Merge pull request #29 from node-oauth/chai

HappyZombies · web-flow · commit a6c257f41438 · 2021-10-12T11:15:18.000-04:00
Replace exception library Should with Chai
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,10 +25,10 @@
     "type-is": "1.6.18"
   },
   "devDependencies": {
+    "chai": "^4.3.4",
     "jshint": "2.13.0",
     "mocha": "5.2.0",
     "nyc": "^15.1.0",
-    "should": "13.2.3",
     "sinon": "7.5.0"
   },
   "license": "MIT",
diff --git a/test/assertions.js b/test/assertions.js
@@ -4,14 +4,16 @@
  * Module dependencies.
  */
 
-var should = require('should');
+var chai = require('chai');
 
 /**
  * SHA-1 assertion.
  */
+chai.use(function (_chai, utils) {
 
-should.Assertion.add('sha1', function() {
-  this.params = { operator: 'to be a valid SHA-1 hash' };
-
-  this.obj.should.match(/^[a-f0-9]{40}$/i);
-}, true);
+  utils.addMethod(chai.Assertion.prototype, 'sha1', function () {
+    var obj = utils.flag(this, 'object');
+    new chai.Assertion(obj).match(/^[a-f0-9]{40}$/i);
+  });
+  
+});
diff --git a/test/integration/grant-types/abstract-grant-type_test.js b/test/integration/grant-types/abstract-grant-type_test.js
@@ -8,7 +8,7 @@ var AbstractGrantType = require('../../../lib/grant-types/abstract-grant-type');
 var InvalidArgumentError = require('../../../lib/errors/invalid-argument-error');
 var Promise = require('bluebird');
 var Request = require('../../../lib/request');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `AbstractGrantType` integration.
diff --git a/test/integration/grant-types/authorization-code-grant-type_test.js b/test/integration/grant-types/authorization-code-grant-type_test.js
@@ -11,7 +11,7 @@ var InvalidRequestError = require('../../../lib/errors/invalid-request-error');
 var Promise = require('bluebird');
 var Request = require('../../../lib/request');
 var ServerError = require('../../../lib/errors/server-error');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `AuthorizationCodeGrantType` integration.
diff --git a/test/integration/grant-types/client-credentials-grant-type_test.js b/test/integration/grant-types/client-credentials-grant-type_test.js
@@ -9,7 +9,7 @@ var InvalidArgumentError = require('../../../lib/errors/invalid-argument-error')
 var InvalidGrantError = require('../../../lib/errors/invalid-grant-error');
 var Promise = require('bluebird');
 var Request = require('../../../lib/request');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `ClientCredentialsGrantType` integration.
diff --git a/test/integration/grant-types/password-grant-type_test.js b/test/integration/grant-types/password-grant-type_test.js
@@ -10,7 +10,7 @@ var InvalidRequestError = require('../../../lib/errors/invalid-request-error');
 var PasswordGrantType = require('../../../lib/grant-types/password-grant-type');
 var Promise = require('bluebird');
 var Request = require('../../../lib/request');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `PasswordGrantType` integration.
diff --git a/test/integration/grant-types/refresh-token-grant-type_test.js b/test/integration/grant-types/refresh-token-grant-type_test.js
@@ -11,7 +11,7 @@ var Promise = require('bluebird');
 var RefreshTokenGrantType = require('../../../lib/grant-types/refresh-token-grant-type');
 var Request = require('../../../lib/request');
 var ServerError = require('../../../lib/errors/server-error');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `RefreshTokenGrantType` integration.
diff --git a/test/integration/handlers/authenticate-handler_test.js b/test/integration/handlers/authenticate-handler_test.js
@@ -15,7 +15,7 @@ var Request = require('../../../lib/request');
 var Response = require('../../../lib/response');
 var ServerError = require('../../../lib/errors/server-error');
 var UnauthorizedRequestError = require('../../../lib/errors/unauthorized-request-error');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `AuthenticateHandler` integration.
diff --git a/test/integration/handlers/authorize-handler_test.js b/test/integration/handlers/authorize-handler_test.js
@@ -18,7 +18,7 @@ var Request = require('../../../lib/request');
 var Response = require('../../../lib/response');
 var ServerError = require('../../../lib/errors/server-error');
 var UnauthorizedClientError = require('../../../lib/errors/unauthorized-client-error');
-var should = require('should');
+var should = require('chai').should();
 var url = require('url');
 
 /**
diff --git a/test/integration/handlers/token-handler_test.js b/test/integration/handlers/token-handler_test.js
@@ -18,7 +18,7 @@ var ServerError = require('../../../lib/errors/server-error');
 var TokenHandler = require('../../../lib/handlers/token-handler');
 var UnauthorizedClientError = require('../../../lib/errors/unauthorized-client-error');
 var UnsupportedGrantTypeError = require('../../../lib/errors/unsupported-grant-type-error');
-var should = require('should');
+var should = require('chai').should();
 var util = require('util');
 
 /**
@@ -121,8 +121,7 @@ describe('TokenHandler integration', function() {
         saveToken: function() {}
       };
       var handler = new TokenHandler({ accessTokenLifetime: 120, extendedGrantTypes: extendedGrantTypes, model: model, refreshTokenLifetime: 120 });
-
-      handler.grantTypes.should.containEql(extendedGrantTypes);
+      handler.grantTypes.should.deep.include(extendedGrantTypes);
     });
 
     it('should set the `model`', function() {
@@ -997,8 +996,7 @@ describe('TokenHandler integration', function() {
       };
       var handler = new TokenHandler({ accessTokenLifetime: 120, model: model, refreshTokenLifetime: 120 });
       var tokenType = handler.getTokenType({ accessToken: 'foo', refreshToken: 'bar', scope: 'foobar' });
-
-      tokenType.should.containEql({ accessToken: 'foo', accessTokenLifetime: undefined, refreshToken: 'bar', scope: 'foobar' });
+      tokenType.should.deep.include({ accessToken: 'foo', accessTokenLifetime: undefined, refreshToken: 'bar', scope: 'foobar' });
     });
   });
 
diff --git a/test/integration/request_test.js b/test/integration/request_test.js
@@ -6,7 +6,7 @@
 
 var Request = require('../../lib/request');
 var InvalidArgumentError = require('../../lib/errors/invalid-argument-error');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `Request` integration.
diff --git a/test/integration/response-types/code-response-type_test.js b/test/integration/response-types/code-response-type_test.js
@@ -6,7 +6,7 @@
 
 var CodeResponseType = require('../../../lib/response-types/code-response-type');
 var InvalidArgumentError = require('../../../lib/errors/invalid-argument-error');
-var should = require('should');
+var should = require('chai').should();
 var url = require('url');
 
 /**
diff --git a/test/integration/server_test.js b/test/integration/server_test.js
@@ -9,7 +9,7 @@ var Promise = require('bluebird');
 var Request = require('../../lib/request');
 var Response = require('../../lib/response');
 var Server = require('../../lib/server');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `Server` integration.
diff --git a/test/integration/token-types/bearer-token-type_test.js b/test/integration/token-types/bearer-token-type_test.js
@@ -6,7 +6,7 @@
 
 var BearerTokenType = require('../../../lib/token-types/bearer-token-type');
 var InvalidArgumentError = require('../../../lib/errors/invalid-argument-error');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `BearerTokenType` integration.
diff --git a/test/integration/utils/token-util_test.js b/test/integration/utils/token-util_test.js
@@ -5,7 +5,7 @@
  */
 
 var TokenUtil = require('../../../lib/utils/token-util');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `TokenUtil` integration.
diff --git a/test/mocha.opts b/test/mocha.opts
@@ -1,4 +1,3 @@
---require should
 --require test/assertions
 --ui bdd
 --reporter spec
diff --git a/test/unit/grant-types/abstract-grant-type_test.js b/test/unit/grant-types/abstract-grant-type_test.js
@@ -6,7 +6,7 @@
 
 var AbstractGrantType = require('../../../lib/grant-types/abstract-grant-type');
 var sinon = require('sinon');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `AbstractGrantType`.
diff --git a/test/unit/grant-types/authorization-code-grant-type_test.js b/test/unit/grant-types/authorization-code-grant-type_test.js
@@ -8,7 +8,7 @@ var AuthorizationCodeGrantType = require('../../../lib/grant-types/authorization
 var Promise = require('bluebird');
 var Request = require('../../../lib/request');
 var sinon = require('sinon');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `AuthorizationCodeGrantType`.
diff --git a/test/unit/grant-types/client-credentials-grant-type_test.js b/test/unit/grant-types/client-credentials-grant-type_test.js
@@ -6,7 +6,7 @@
 
 var ClientCredentialsGrantType = require('../../../lib/grant-types/client-credentials-grant-type');
 var sinon = require('sinon');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `ClientCredentialsGrantType`.
diff --git a/test/unit/grant-types/password-grant-type_test.js b/test/unit/grant-types/password-grant-type_test.js
@@ -7,7 +7,7 @@
 var PasswordGrantType = require('../../../lib/grant-types/password-grant-type');
 var Request = require('../../../lib/request');
 var sinon = require('sinon');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `PasswordGrantType`.
diff --git a/test/unit/grant-types/refresh-token-grant-type_test.js b/test/unit/grant-types/refresh-token-grant-type_test.js
@@ -7,7 +7,7 @@
 var RefreshTokenGrantType = require('../../../lib/grant-types/refresh-token-grant-type');
 var Request = require('../../../lib/request');
 var sinon = require('sinon');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `RefreshTokenGrantType`.
diff --git a/test/unit/handlers/authenticate-handler_test.js b/test/unit/handlers/authenticate-handler_test.js
@@ -7,7 +7,7 @@
 var AuthenticateHandler = require('../../../lib/handlers/authenticate-handler');
 var Request = require('../../../lib/request');
 var sinon = require('sinon');
-var should = require('should');
+var should = require('chai').should();
 var ServerError = require('../../../lib/errors/server-error');
 
 /**
diff --git a/test/unit/handlers/authorize-handler_test.js b/test/unit/handlers/authorize-handler_test.js
@@ -9,7 +9,7 @@ var Request = require('../../../lib/request');
 var Response = require('../../../lib/response');
 var Promise = require('bluebird');
 var sinon = require('sinon');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `AuthorizeHandler`.
diff --git a/test/unit/handlers/token-handler_test.js b/test/unit/handlers/token-handler_test.js
@@ -7,7 +7,7 @@
 var Request = require('../../../lib/request');
 var TokenHandler = require('../../../lib/handlers/token-handler');
 var sinon = require('sinon');
-var should = require('should');
+var should = require('chai').should();
 
 /**
  * Test `TokenHandler`.
diff --git a/test/unit/models/token-model_test.js b/test/unit/models/token-model_test.js
diff --git a/test/unit/request_test.js b/test/unit/request_test.js
diff --git a/test/unit/response_test.js b/test/unit/response_test.js
