adding tests

Author: matthisk

package.json

@@ -42,6 +42,7 @@
     "glob": "~7.1.1",
     "jscs": "~3.0.7",
     "mocha": "~3.1.0",
+    "pmock": "~0.2.3",
     "rewire": "~2.5.2",
     "should": "~4.0.0"
   },

src/FeedManager.js

@@ -1,5 +1,5 @@
-var stream = require('getstream');
-
+var stream = require('getstream')
+  , Promise = require('promise');
 var FeedManager = function () {
     this.initialize.apply(this, arguments);
 };
@@ -9,7 +9,7 @@ FeedManager.prototype = {
     initialize: function (settings) {
         this.settings = settings;
 
-        options = {};
+        var options = {};
 
         if (this.settings.apiLocation != '') {
             options.location = this.settings.apiLocation;
@@ -36,31 +36,39 @@ FeedManager.prototype = {
     },
 
     getNewsFeeds: function (userId) {
-        feeds = [];
-        newsFeeds = this.settings.newsFeeds;
+        var feeds = [];
+        var newsFeeds = this.settings.newsFeeds;
 
-        for (key in newsFeeds) {
-            slug = newsFeeds[key];
+        for (var key in newsFeeds) {
+            var slug = newsFeeds[key];
             feeds[slug] = this.client.feed(slug, userId);
         }
 
         return feeds;
     },
 
     followUser: function (userId, targetUserId) {
-        newsFeeds = this.getNewsFeeds(userId);
+        var newsFeeds = this.getNewsFeeds(userId);
+        var ps = [];
 
-        for (slug in newsFeeds) {
-            newsFeeds[slug].follow(this.settings.userFeed, targetUserId);
+        for (var slug in newsFeeds) {
+            var p = newsFeeds[slug].follow(this.settings.userFeed, targetUserId);
+            ps.push(p);
         }
+
+        return Promise.all(ps);
     },
 
     unfollowUser: function (userId, targetUserId) {
-        newsFeeds = this.getNewsFeeds(userId);
+        var newsFeeds = this.getNewsFeeds(userId);
+        var ps = [];
 
-        for (slug in newsFeeds) {
-            newsFeeds[slug].unfollow(this.settings.userFeed, targetUserId);
+        for (var slug in newsFeeds) {
+            var p = newsFeeds[slug].unfollow(this.settings.userFeed, targetUserId);
+            ps.push(p);
         }
+
+        return Promise.all(ps);
     },
 
     getFeed: function (slug, userId) {
@@ -71,27 +79,29 @@ FeedManager.prototype = {
         if (this.trackingEnabled(instance)) {
             var activity = instance.createActivity();
             var backend = instance.getStreamBackend();
+            
             backend.serializeActivities([activity]);
+            
             var feedType = instance.activityActorFeed() || this.settings.userFeed;
             var userId = backend.getIdFromRef(activity.actor);
-            feed = this.getFeed(feedType, userId);
-            feed.addActivity(activity, function (err, response, body) {
-                if (err) console.log('err: ', err);
-            });
+            var feed = this.getFeed(feedType, userId);
+            
+            return feed.addActivity(activity);
         }
     },
 
     activityDeleted: function (instance) {
         if (this.trackingEnabled(instance)) {
             var activity = instance.createActivity();
             var backend = instance.getStreamBackend();
+            
             backend.serializeActivities([activity]);
+            
             var feedType = instance.activityActorFeed() || this.settings.userFeed;
             var userId = backend.getIdFromRef(activity.actor);
-            feed = this.getFeed(feedType, userId);
-            feed.removeActivity({ 'foreignId': activity.foreign_id }, function (err, response, body) {
-                if (err) console.log('err: ', err);
-            });
+            var feed = this.getFeed(feedType, userId);
+
+            return feed.removeActivity({ 'foreignId': activity.foreign_id });
         }
     },
 

src/backends/activity.js

@@ -48,8 +48,7 @@ module.exports = function (schema, options) {
 
     // User specific proto functions (with decent defaults)
     schema.methods.getStreamBackend = function () {
-        var stream = require('../index.js');
-        return new stream.BaseBackend();
+        throw new Error('Not implemented');
     };
 
     schema.methods.activityActorProp = function () {

src/config.js

@@ -28,6 +28,7 @@ var Config = function () {
 
     var default_config_file = path.join(__dirname, 'config.default.js');
 
+    /* istanbul skip else */
     if (exists(config_file)) {
         settings = _loadFile(config_file);
     } else {

test/backend_activity_test.js

@@ -0,0 +1,49 @@
+var Activity = require('../src/backends/activity')
+  , expect = require('expect.js');
+
+describe('Activity', function() {
+    var activity;
+    var schema;
+
+    before(function() {
+
+    });
+
+    beforeEach(function() {
+        schema = { methods : {} };
+        activity = Activity(schema, {});
+    });
+
+    it('#getStreamBackend', function() {
+        expect(function() {
+            schema.methods.getStreamBackend();
+        }).to.throwError();
+    });
+
+    it('#activityActorProp', function() {
+        var prop = schema.methods.activityActorProp();
+
+        expect(prop).to.be('user');
+    });
+
+    it('#activityVerb', function() {
+        var prop = schema.methods.activityVerb();
+
+        expect(prop).to.be('Object');
+    });
+
+    it('#activityExtraData', function() {
+        var prop = schema.methods.activityExtraData();
+
+        expect(prop).to.eql({});
+    });
+
+    it('#activityNotify', function() {
+        schema.methods.activityNotify();
+    });
+
+    after(function() {
+
+    });
+
+});

test/feed_manager_test.js

@@ -0,0 +1,78 @@
+var FeedManager = require('../src/FeedManager')
+  , pmock = require('pmock')
+  , mockery = require('mockery')
+  , sinon = require('sinon')
+  , expect = require('expect.js');
+
+describe('FeedManager', function() {
+    var fm;
+
+    before(function() {
+        // replace the module `request` with a stub object
+        mockery.enable({});
+        requestStub = sinon.stub();
+        mockery.registerMock('request', requestStub);
+
+        this.env = pmock.env({
+            STREAM_URL: null,
+        });
+    });
+
+    beforeEach(function() {
+        fm = new FeedManager({ 
+            apiKey: 12345,
+            apiSecret: 'abcdefg',
+            apiAppId: 1000,
+            apiLocation: 'qa',
+            userFeed: 'user',
+            notificationFeed: 'notification',
+            newsFeeds: {
+                flat: 'timeline',
+                aggregated: 'timeline_aggregated',
+            }
+        });
+    });
+
+    it('#settings', function() {
+        expect(fm.client.options.location).to.be('qa');
+        expect(fm.client.apiKey).to.be(12345);
+        expect(fm.client.apiSecret).to.be('abcdefg');
+        expect(fm.client.appId).to.be(1000);
+    });
+
+    it('#getUserFeed', function() {
+        var feed = fm.getUserFeed('matthisk');
+        
+        expect(feed.id).to.be('user:matthisk');
+    });
+
+    it('#getNotificationFeed', function() {
+        var feed = fm.getNotificationFeed('matthisk');
+        
+        expect(feed.id).to.be('notification:matthisk');
+    });
+
+    it('#getNewsFeeds', function() {
+        var feeds = fm.getNewsFeeds('matthisk');
+        
+        expect(feeds['timeline'].id).to.be('timeline:matthisk');
+        expect(feeds['timeline_aggregated'].id).to.be('timeline_aggregated:matthisk');
+    });
+
+    it('#followUser', function() {
+        var p = fm.followUser('harry', 'matthisk');
+
+        expect(p.then).to.be.a(Function);
+    });
+
+    it('#unfollowUser', function() {
+        var p = fm.unfollowUser('matthisk', 'harry');
+        
+        expect(p.then).to.be.a(Function);
+    });
+
+    after(function() {
+        this.env.reset();
+    });
+
+});

test/index_test.js

@@ -2,6 +2,7 @@ var should = require('should')
   , expect = require('expect.js')
   , fs = require('fs')
   , path = require('path')
+  , pmock = require('pmock')
   , Config = require('../src/config')
   , BaseBackend = require('../src/backends/base.js')
   , FeedManager = require('../src/FeedManager')
@@ -57,7 +58,7 @@ describe('feedManagerFactory', function() {
 
 });
 
-describe('Feed manager', function() {
+describe('Config', function() {
 
     it('default config', function() {
         var settings = main.FeedManager.settings;
@@ -66,32 +67,59 @@ describe('Feed manager', function() {
         expect(settings).to.eql(expected);
     });
 
-    describe('haha', function() {
-        var configDir = path.join(__dirname, './tmp');
-        var configFile = path.join(configDir, 'getstream.js');
+});
+
+describe('Config Env Var', function() {
+    var configDir = path.join(__dirname, './tmp');
+    var configFile = path.join(configDir, 'getstream.js');
 
-        before(function() {
-            process.env.STREAM_NODE_CONFIG_DIR = configDir;
+    before(function() {
+        this.env = pmock.env({
+            STREAM_NODE_CONFIG_DIR: configDir,
+        });
 
+        try {
             fs.mkdirSync(configDir);
             fs.writeFileSync(configFile, 'exports.config = { apiKey: 12345 };');
-        });
+        } catch(e) {
+            console.error(e);
+        }
+    });
 
-        after(function() { 
+    after(function() { 
+        try {
             fs.unlink(configFile);
             fs.rmdirSync(configDir);
-            delete process.env.STREAM_NODE_CONFIG_DIR;            
-        });
+        } catch(e) {
+            console.error(e);
+        }
+        this.env.reset();
+    });
 
-        it('env var config dir', function() {
-            var settings = Config();
+    it('env var config dir', function() {
+        var settings = Config();
 
-            expect(settings.apiKey).to.be(12345);
-        });
+        expect(settings.apiKey).to.be(12345);
     });
 
+});
 
-    it('override config', function() {
+describe('Config Default', function() {
 
+    before(function() {
+        this.cwd = pmock.cwd('/tmp');
     });
+
+    after(function() { 
+        this.cwd.reset();
+    });
+
+    it('env var config dir', function() {
+        var settings = Config();
+
+        var expected = require('../src/config.default.js').config;
+
+        expect(settings).to.eql(expected);
+    });
+
 });