fixes #78 : Add UnitTests for modules

Refactoring modules in preparation of unit test creation
YouTransfer · Sep 17, 2015 · a528bbb · a528bbb
1 parent 7881016
commit a528bbb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/lib/scheduler.js b/lib/scheduler.js
@@ -9,7 +9,7 @@ var schedule = require('node-schedule');
 // ------------------------------------------------------------------------------------------ Module definition
 
 function Scheduler() {
-	this.schedules = [];
+	this.schedules = new Array();
 };
 
 Scheduler.prototype.get = function(name) {
@@ -34,10 +34,12 @@ Scheduler.prototype.clear = function(name) {
 		this.schedules[name].cancel();
 		this.schedules = _.remove(this.schedules, this.schedules[name]);
 	} else {
-		_.each(this.schedules, function(schedule) {
+		for(var name in this.schedules) {
+			var schedule = this.schedules[name];
 			schedule.cancel();
-		});
-		this.schedules = Array();
+			delete this.schedules[name];
+		};
+		this.schedules = new Array();
 	}
 	return true;
 };

diff --git a/lib/settings.js b/lib/settings.js
@@ -42,8 +42,8 @@ Settings.prototype.get = function(next) {
 				var settings = JSON.parse(content);
 				var output = _.assign(config, settings);
 
-				if(!path.isAbsolute(output.localstoragepath)) {
-					output.localstoragepath = path.resolve(nconf.get('basedir'), output.localstoragepath);
+				if(output.localstoragepath && !path.isAbsolute(output.localstoragepath)) {
+					output.localstoragepath = path.resolve(output.basedir, output.localstoragepath);
 				}
 
 				next(null, output);