test(reload): unload watcher when client unloads

socketstream · Jun 14, 2015 · e494c68 · e494c68
1 parent 37da79e
commit e494c68
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 16 deletions.
diff --git a/lib/client/index.js b/lib/client/index.js
@@ -21,7 +21,6 @@ function setDefaultOptions(options) {
   // Determine if assets should be (re)packed on startup
   var packAssets = process.env['SS_PACK'];
 
-  //TODO packAssets vs packedAssets
   options.packedAssets = packAssets || false;
 
   options.liveReload = ['code', 'css', 'static', 'templates', 'views'];
@@ -68,7 +67,8 @@ module.exports = function(ss, router) {
 
   // Require sub modules
   var templateEngine = require('./template_engine')(ss,options),
-      formatters = require('./formatters')(ss,options);
+      formatters = require('./formatters')(ss,options),
+      liveReload = require('./live_reload');
 
   // extend http response API
   require('./http')(ss, clients, options);
@@ -260,15 +260,15 @@ module.exports = function(ss, router) {
         // Else serve files and watch for changes to files in development
         require('./serve/dev')(ss, router, options);
         if (options.liveReload) {
-          require('./live_reload')(ss, options);
+          liveReload(ss, options);
         }
       }
       // Listen out for requests to async load new assets
       require('./serve/ondemand')(ss, router, options);
     },
 
     unload: function() {
-
+      liveReload.unload();
       ss.client.formatters = {};
       ss.client.templateEngines = {};
       ss.bundler.unload();

diff --git a/lib/client/live_reload.js b/lib/client/live_reload.js
@@ -12,7 +12,7 @@ var pathlib = require('path'),
 var lastRun = {
   updateCSS: {at:Date.now()},
   reload: {at:Date.now()}
-};
+}, watcher;
 
 var cssExtensions = ['.css', '.styl', '.stylus', '.less'];
 
@@ -39,7 +39,7 @@ module.exports = function(ss, options) {
     return _results;
   })();
 
-  var watcher = chokidar.watch(watchDirs, {
+  watcher = chokidar.watch(watchDirs, {
     ignored: /(\/\.|~$)/
   });
   watcher.on('add', function(path) {
@@ -97,3 +97,10 @@ module.exports = function(ss, options) {
   return onChange;
 };
 
+module.exports.unload = function() {
+  if (watcher) {
+    watcher.close();
+    watcher = null;
+  }
+};
+
diff --git a/test/unit/client/bundler/custom.test.js b/test/unit/client/bundler/custom.test.js
@@ -14,6 +14,7 @@ describe('custom bundler', function () {
       // back to initial client state
       ss.client.assets.unload();
       ss.client.assets.load();
+      ss.client.set({liveReload:false});
     });
 
     afterEach(function() {

diff --git a/test/unit/client/bundler/default.test.js b/test/unit/client/bundler/default.test.js
@@ -17,13 +17,13 @@ describe('default bundler:', function () {
     ss.root = ss.api.root = fixtures.project;
     //ss.api.bundler = require('../../../../lib/client/bundler/index')(ss.api,options);
 
-  options.liveReload = false;
-
   describe('client with standard css+code', function() {
 
     var client;
 
     beforeEach(function() {
+      ss.client.set({liveReload:false});
+
       client = ss.client.define('main', {
         css: 'main',
         code: 'main/demo.coffee',

diff --git a/test/unit/client/bundler/index.test.js b/test/unit/client/bundler/index.test.js
@@ -12,10 +12,11 @@ describe('bundler', function () {
 
   ss.root = ss.api.root = fixtures.project;
 
-  options.liveReload = false;
-
   describe('API',function() {
 
+    beforeEach(function() {
+      ss.client.set({liveReload:false});
+    });
     afterEach(function() {
       ss.client.forget();
     });

diff --git a/test/unit/client/constants.test.js b/test/unit/client/constants.test.js
@@ -22,6 +22,7 @@ describe('constants',function() {
     // back to initial client state
     ss.client.assets.unload();
     ss.client.assets.load();
+    ss.client.set({liveReload:false});
   });
 
   afterEach(function() {

diff --git a/test/unit/client/formatters.test.js b/test/unit/client/formatters.test.js
@@ -17,6 +17,7 @@ var ss      = require( '../../../lib/socketstream'),
         // back to initial client state
         ss.client.assets.unload();
         ss.client.assets.load();
+        ss.client.set({liveReload:false});
       });
 
       afterEach(function() {

diff --git a/test/unit/client/formatters/css.test.js b/test/unit/client/formatters/css.test.js
@@ -12,6 +12,7 @@ describe('css formatter', function () {
     // back to initial client state
     ss.client.assets.unload();
     ss.client.assets.load();
+    ss.client.set({liveReload:false});
   });
 
   afterEach(function() {

diff --git a/test/unit/client/formatters/html.test.js b/test/unit/client/formatters/html.test.js
@@ -12,6 +12,7 @@ describe('html formatter', function () {
     // back to initial client state
     ss.client.assets.unload();
     ss.client.assets.load();
+    ss.client.set({liveReload:false});
   });
 
   afterEach(function() {

diff --git a/test/unit/client/formatters/javascript.test.js b/test/unit/client/formatters/javascript.test.js
@@ -12,6 +12,7 @@ describe('js formatter', function () {
     // back to initial client state
     ss.client.assets.unload();
     ss.client.assets.load();
+    ss.client.set({liveReload:false});
   });
 
   afterEach(function() {

diff --git a/test/unit/client/index.test.js b/test/unit/client/index.test.js
@@ -18,6 +18,7 @@ describe('client asset manager index', function () {
     if (ss.client.assets.assets.constants.abc) {
       delete ss.client.assets.assets.constants.abc;
     }
+    ss.client.set({liveReload:false});
   });
 
     afterEach(function() {

diff --git a/test/unit/client/pack.test.js b/test/unit/client/pack.test.js
@@ -19,14 +19,15 @@ describe('pack',function() {
     // back to initial client state
     ss.client.assets.unload();
     ss.client.assets.load();
+    ss.client.set({liveReload:false});
   });
 
   afterEach(function(done) {
     ss.client.forget();
     fixtures.cleanup(done);
   });
 
-  var newEngine = function newEngine(api,config,options) {
+  function newEngine(api,config,options) {
     api.should.equal(ss.api);
     options.should.equal(ss.client.options);
     return {
@@ -35,7 +36,7 @@ describe('pack',function() {
         return '<script id="new-' + id + '" type="text/x-tmpl">' + template + JSON.stringify(opts.constants) + '</script>';
       }
     }
-  };
+  }
 
   it('should make blank css and minimal js bundles when nothing is defined', function() {
 

diff --git a/test/unit/client/template_engine.test.js b/test/unit/client/template_engine.test.js
@@ -21,6 +21,7 @@ describe('Template engine', function() {
       // back to initial client state
       ss.client.assets.unload();
       ss.client.assets.load();
+      ss.client.set({liveReload:false});
 
       ss.client.formatters.add('html');
     });

diff --git a/test/unit/client/template_engines/angular.test.js b/test/unit/client/template_engines/angular.test.js
@@ -12,15 +12,14 @@ describe('angular.js template engine', function () {
 
   ss.root = ss.api.root = fixtures.project;
 
-  options.liveReload = false;
-
   ss.api.bundler = bundlerMod(ss.api, options);
 
   beforeEach(function() {
 
     // back to initial client state
     ss.client.assets.unload();
     ss.client.assets.load();
+    ss.client.set({liveReload:false});
 
     ss.client.formatters.add('html');
   });

diff --git a/test/unit/client/template_engines/default.test.js b/test/unit/client/template_engines/default.test.js
@@ -12,8 +12,6 @@ describe('default template engine', function () {
 
   ss.root = ss.api.root = fixtures.project;
 
-  options.liveReload = false;
-
   ss.api.bundler = bundlerMod(ss.api, options);
 
   engineMod(ss.api,options);
@@ -23,6 +21,7 @@ describe('default template engine', function () {
     // back to initial client state
     ss.client.assets.unload();
     ss.client.assets.load();
+    ss.client.set({liveReload:false});
 
     ss.client.formatters.add('html');
   });

diff --git a/test/unit/client/template_engines/ember.test.js b/test/unit/client/template_engines/ember.test.js
@@ -16,6 +16,7 @@ describe('Ember.js template engine', function () {
     // back to initial client state
     ss.client.assets.unload();
     ss.client.assets.load();
+    ss.client.set({liveReload:false});
 
     ss.client.formatters.add('html');
   });