Setup Mocha for tests.

Makefile

@@ -1,9 +1,9 @@
-SOURCES = lib/**/*.js
-TESTS ?= test/*-test.js
+SOURCES = lib/*.js
+TESTS ?= test/*.test.js
 
 lint: lint-jshint
-test: test-vows
-test-cov: test-istanbul-vows
+test: test-mocha
+test-cov: test-istanbul-mocha
 view-cov: view-istanbul-report
 
 

lib/strategy.js

@@ -121,7 +121,7 @@ Strategy.prototype.userProfile = function(accessToken, done) {
   }
 
   this._oauth2.getProtectedResource(url, accessToken, function (err, body, res) {
-    if (err) { return done(new InternalOAuthError('failed to fetch user profile', err)); }
+    if (err) { return done(new InternalOAuthError('Failed to fetch user profile', err)); }
 
     try {
       var json = JSON.parse(body);

package.json

@@ -33,7 +33,9 @@
     "passport-oauth2": "1.0.0"
   },
   "devDependencies": {
-    "vows": "0.6.x"
+    "vows": "0.6.x",
+    "mocha": "1.x.x",
+    "chai": "1.x.x"
   },
   "engines": { "node": ">= 0.4.0" },
   "scripts": {

test/bootstrap/node.js

@@ -0,0 +1,3 @@
+var chai = require('chai');
+
+global.expect = chai.expect;

test/module.test.js

@@ -0,0 +1,14 @@
+var strategy = require('..');
+
+describe('passport-facebook', function() {
+
+  it('should export Strategy constructor directly from package', function() {
+    expect(strategy).to.be.a('function');
+    expect(strategy).to.equal(strategy.Strategy);
+  });
+
+  it('should export Strategy constructor', function() {
+    expect(strategy.Strategy).to.be.a('function');
+  });
+
+});

test/strategy-test.js

@@ -7,6 +7,7 @@ var FacebookStrategy = require('../lib/strategy');
 
 vows.describe('FacebookStrategy').addBatch({
 
+  // OK
   'strategy': {
     topic: function() {
       return new FacebookStrategy({
@@ -70,6 +71,7 @@ vows.describe('FacebookStrategy').addBatch({
     }
   },
 
+  // OK
   'strategy when loading user profile': {
     topic: function() {
       var strategy = new FacebookStrategy({
@@ -128,6 +130,7 @@ vows.describe('FacebookStrategy').addBatch({
     },
   },
 
+  // OK
   'strategy when loading user profile with profileURL option': {
     topic: function() {
       var strategy = new FacebookStrategy({
@@ -179,6 +182,7 @@ vows.describe('FacebookStrategy').addBatch({
     },
   },
 
+  // OK
   'strategy when loading user profile with mapped profile fields': {
     topic: function() {
       var strategy = new FacebookStrategy({
@@ -330,6 +334,7 @@ vows.describe('FacebookStrategy').addBatch({
     },
   },
 
+  // OK
   'strategy when loading user profile and encountering an error': {
     topic: function() {
       var strategy = new FacebookStrategy({

test/strategy.options.test.js

@@ -0,0 +1,78 @@
+var FacebookStrategy = require('../lib/strategy');
+
+
+describe('Strategy#userProfile', function() {
+
+  describe('with profile URL option', function() {
+    var strategy = new FacebookStrategy({
+        clientID: 'ABC123',
+        clientSecret: 'secret',
+        profileURL: 'https://graph.facebook.com/me?fields=id,username'
+      },
+      function() {});
+
+      // mock
+      strategy._oauth2.getProtectedResource = function(url, accessToken, callback) {
+        if (url != 'https://graph.facebook.com/me?fields=id,username') { return callback(new Error('incorrect url argument')); }
+        if (accessToken != 'token') { return callback(new Error('incorrect token argument')); }
+
+        var body = '{"id":"500308595","name":"Jared Hanson","first_name":"Jared","last_name":"Hanson","link":"http:\\/\\/www.facebook.com\\/jaredhanson","username":"jaredhanson","gender":"male","email":"jaredhanson\\u0040example.com"}';
+        callback(null, body, undefined);
+      }
+
+    describe('loading profile', function() {
+      var profile;
+
+      before(function(done) {
+        strategy.userProfile('token', function(err, p) {
+          if (err) { return done(err); }
+          profile = p;
+          done();
+        });
+      });
+
+      it('should parse profile', function() {
+        expect(profile.provider).to.equal('facebook');
+        expect(profile.id).to.equal('500308595');
+        expect(profile.username).to.equal('jaredhanson');
+      });
+    });
+  });
+
+  describe('with profile fields mapped from portable contacts schema', function() {
+    var strategy = new FacebookStrategy({
+        clientID: 'ABC123',
+        clientSecret: 'secret',
+        profileFields: ['id', 'username', 'displayName', 'name', 'gender', 'profileUrl', 'emails', 'photos']
+      },
+      function() {});
+
+      // mock
+      strategy._oauth2.getProtectedResource = function(url, accessToken, callback) {
+        if (url != 'https://graph.facebook.com/me?fields=id,username,name,last_name,first_name,middle_name,gender,link,email,picture') { return callback(new Error('incorrect url argument')); }
+        if (accessToken != 'token') { return callback(new Error('incorrect token argument')); }
+
+        var body = '{"id":"500308595","name":"Jared Hanson","first_name":"Jared","last_name":"Hanson","link":"http:\\/\\/www.facebook.com\\/jaredhanson","username":"jaredhanson","gender":"male","email":"jaredhanson\\u0040example.com"}';
+        callback(null, body, undefined);
+      }
+
+    describe('loading profile', function() {
+      var profile;
+
+      before(function(done) {
+        strategy.userProfile('token', function(err, p) {
+          if (err) { return done(err); }
+          profile = p;
+          done();
+        });
+      });
+
+      it('should parse profile', function() {
+        expect(profile.provider).to.equal('facebook');
+        expect(profile.id).to.equal('500308595');
+        expect(profile.username).to.equal('jaredhanson');
+      });
+    });
+  });
+
+});

test/strategy.profile.test.js

@@ -0,0 +1,78 @@
+var FacebookStrategy = require('../lib/strategy');
+
+
+describe('Strategy#userProfile', function() {
+
+  var strategy = new FacebookStrategy({
+      clientID: 'ABC123',
+      clientSecret: 'secret'
+    },
+    function() {});
+
+    // mock
+    strategy._oauth2.getProtectedResource = function(url, accessToken, callback) {
+      if (url != 'https://graph.facebook.com/me') { return callback(new Error('incorrect url argument')); }
+      if (accessToken != 'token') { return callback(new Error('incorrect token argument')); }
+
+      var body = '{"id":"500308595","name":"Jared Hanson","first_name":"Jared","last_name":"Hanson","link":"http:\\/\\/www.facebook.com\\/jaredhanson","username":"jaredhanson","gender":"male","email":"jaredhanson\\u0040example.com"}';
+      callback(null, body, undefined);
+    }
+
+  describe('loading profile', function() {
+    var profile;
+
+    before(function(done) {
+      strategy.userProfile('token', function(err, p) {
+        if (err) { return done(err); }
+        profile = p;
+        done();
+      });
+    });
+
+    it('should parse profile', function() {
+      expect(profile.provider).to.equal('facebook');
+
+      expect(profile.id).to.equal('500308595');
+      expect(profile.username).to.equal('jaredhanson');
+      expect(profile.displayName).to.equal('Jared Hanson');
+      expect(profile.name.familyName).to.equal('Hanson');
+      expect(profile.name.givenName).to.equal('Jared');
+      expect(profile.gender).to.equal('male');
+      expect(profile.profileUrl).to.equal('http://www.facebook.com/jaredhanson');
+      expect(profile.emails).to.have.length(1);
+      expect(profile.emails[0].value).to.equal('[email protected]');
+      expect(profile.photos).to.be.undefined;
+    });
+
+    it('should set raw property', function() {
+      expect(profile._raw).to.be.a('string');
+    });
+
+    it('should set json property', function() {
+      expect(profile._json).to.be.an('object');
+    });
+  });
+
+  describe('encountering an error', function() {
+    var err, profile;
+
+    before(function(done) {
+      strategy.userProfile('wrong-token', function(e, p) {
+        err = e;
+        profile = p;
+        done();
+      });
+    });
+
+    it('should error', function() {
+      expect(err).to.be.an.instanceOf(Error);
+      expect(err.constructor.name).to.equal('InternalOAuthError');
+      expect(err.message).to.equal('Failed to fetch user profile');
+    });
+
+    it('should not load profile', function() {
+      expect(profile).to.be.undefined;
+    });
+  });
+
+});

test/strategy.test.js

@@ -0,0 +1,16 @@
+var FacebookStrategy = require('../lib/strategy');
+
+
+describe('Strategy', function() {
+
+  var strategy = new FacebookStrategy({
+      clientID: 'ABC123',
+      clientSecret: 'secret'
+    },
+    function() {});
+
+  it('should be named facebook', function() {
+    expect(strategy.name).to.equal('facebook');
+  });
+
+});