Fixed integration tests

Author: Michael Salinger

test/integration/index_test.js

@@ -59,7 +59,10 @@ describe('ExpressOAuthServer', function() {
     });
 
     it('should authenticate the request', function(done) {
-      var token = { user: {} };
+      var tokenExpires = new Date();
+      tokenExpires = new Date(tokenExpires.setDate(tokenExpires.getDate() + 1));
+
+      var token = { user: {}, accessTokenExpiresAt: tokenExpires };
       var model = {
         getAccessToken: function() {
           return token;
@@ -83,7 +86,10 @@ describe('ExpressOAuthServer', function() {
     });
 
     it('should cache the authorization token', function(done) {
-      var token = { user: {} };
+      var tokenExpires = new Date();
+      tokenExpires = new Date(tokenExpires.setDate(tokenExpires.getDate() + 1));
+
+      var token = { user: {}, accessTokenExpiresAt: tokenExpires };
       var model = {
         getAccessToken: function() {
           return token;
@@ -144,10 +150,10 @@ describe('ExpressOAuthServer', function() {
         });
     });
 
-    it('should return a `location` header with the error', function(done) {
+    it('should return an error', function(done) {
       var model = {
         getAccessToken: function() {
-          return { user: {} };
+          return { user: {}, accessTokenExpiresAt: new Date() };
         },
         getClient: function() {
           return { grants: ['authorization_code'], redirectUris: ['http://example.com'] };
@@ -164,14 +170,17 @@ describe('ExpressOAuthServer', function() {
         .post('/?state=foobiz')
         .set('Authorization', 'Bearer foobar')
         .send({ client_id: 12345 })
-        .expect('Location', 'http://example.com/?error=invalid_request&error_description=Missing%20parameter%3A%20%60response_type%60&state=foobiz')
-        .end(done);
+        .expect(400, function(err, res) {
+          res.body.error.should.eql('invalid_request');
+          res.body.error_description.should.eql('Missing parameter: `response_type`');
+          done();
+        });
     });
 
     it('should return a `location` header with the code', function(done) {
       var model = {
         getAccessToken: function() {
-          return { user: {} };
+          return { user: {}, accessTokenExpiresAt: new Date() };
         },
         getClient: function() {
           return { grants: ['authorization_code'], redirectUris: ['http://example.com'] };