Fixed integration tests, removed debug statements

Author: Michael Salinger

index.js

@@ -45,7 +45,6 @@ ExpressOAuthServer.prototype.authenticate = function(options) {
   return function(req, res, next) {
     var request = new Request(req);
     var response = new Response(res);
-
     return Promise.bind(that)
       .then(function() {
         return this.server.authenticate(request, response, options);
@@ -55,7 +54,6 @@ ExpressOAuthServer.prototype.authenticate = function(options) {
         next();
       })
       .catch(function(e) {
-        console.log(e);
         return handleError.call(this, e, req, res, null, next);
       });
   };
@@ -90,7 +88,6 @@ ExpressOAuthServer.prototype.authorize = function(options) {
         return handleResponse.call(this, req, res, response);
       })
       .catch(function(e) {
-        console.log(e);
         return handleError.call(this, e, req, res, response, next);
       });
   };

test/integration/index_test.js

@@ -60,7 +60,7 @@ describe('ExpressOAuthServer', function() {
 
     it('should authenticate the request', function(done) {
       var tokenExpires = new Date();
-      tokenExpires = new Date(tokenExpires.setDate(tokenExpires.getDate() + 1));
+      tokenExpires.setDate(tokenExpires.getDate() + 1);
 
       var token = { user: {}, accessTokenExpiresAt: tokenExpires };
       var model = {
@@ -87,8 +87,7 @@ describe('ExpressOAuthServer', function() {
 
     it('should cache the authorization token', function(done) {
       var tokenExpires = new Date();
-      tokenExpires = new Date(tokenExpires.setDate(tokenExpires.getDate() + 1));
-
+      tokenExpires.setDate(tokenExpires.getDate() + 1);
       var token = { user: {}, accessTokenExpiresAt: tokenExpires };
       var model = {
         getAccessToken: function() {
@@ -101,27 +100,30 @@ describe('ExpressOAuthServer', function() {
 
       var spy = sinon.spy(function(req, res, next) {
         res.locals.oauth.token.should.equal(token);
-
+        res.send(token);
         next();
       });
       app.use(spy);
 
       request(app.listen())
         .get('/')
         .set('Authorization', 'Bearer foobar')
-        .expect(200, function(){
-            spy.called.should.be.true;
-            done();
+        .expect(200, function(err, res){
+            spy.called.should.be.True();
+            done(err);
         });
     });
   });
 
   describe('authorize()', function() {
     it('should cache the authorization code', function(done) {
+      var tokenExpires = new Date();
+      tokenExpires.setDate(tokenExpires.getDate() + 1);
+
       var code = { authorizationCode: 123 };
       var model = {
         getAccessToken: function() {
-          return { user: {} };
+          return { user: {}, accessTokenExpiresAt: tokenExpires };
         },
         getClient: function() {
           return { grants: ['authorization_code'], redirectUris: ['http://example.com'] };
@@ -144,9 +146,9 @@ describe('ExpressOAuthServer', function() {
         .post('/?state=foobiz')
         .set('Authorization', 'Bearer foobar')
         .send({ client_id: 12345, response_type: 'code' })
-        .expect(200, function(){
-            spy.called.should.be.true;
-            done();
+        .expect(302, function(err, res){
+            spy.called.should.be.True();
+            done(err);
         });
     });
 
@@ -173,7 +175,7 @@ describe('ExpressOAuthServer', function() {
         .expect(400, function(err, res) {
           res.body.error.should.eql('invalid_request');
           res.body.error_description.should.eql('Missing parameter: `response_type`');
-          done();
+          done(err);
         });
     });
 
@@ -241,9 +243,9 @@ describe('ExpressOAuthServer', function() {
         .post('/')
         .send('client_id=foo&client_secret=bar&grant_type=password&username=qux&password=biz')
         .expect({ access_token: 'foobar', token_type: 'Bearer' })
-        .expect(200, function(){ 
-          spy.called.should.be.true;
-          done();
+        .expect(200, function(err, res){
+          spy.called.should.be.True();
+          done(err);
         });
     });