From 739fb99cedef43bb30b978f2f559c0c02ad0c228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= <a@rodrigoramirez.com>
Date: Sun, 6 Aug 2017 07:53:03 -0400
Subject: [PATCH] Resolved conflict unit tests between currentweather and
 newsfeed.

---
 tests/unit/functions/currentweather_spec.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/unit/functions/currentweather_spec.js b/tests/unit/functions/currentweather_spec.js
index 8744fce2..18b52c81 100644
--- a/tests/unit/functions/currentweather_spec.js
+++ b/tests/unit/functions/currentweather_spec.js
@@ -7,13 +7,17 @@ var vm = require("vm");
 
 describe("Functions module currentweather", function() {
 
+
+	// Fake for use by currentweather.js
+	Module = {};
+	config = {};
+	Module.definitions = {};
+	Module.register = function (name, moduleDefinition) {
+		Module.definitions[name] = moduleDefinition;
+	};
+
+
 	before(function(){
-		Module = {};
-		config = {};
-		Module.definitions = {};
-		Module.register = function (name, moduleDefinition) {
-			Module.definitions[name] = moduleDefinition;
-		};
 		require("../../../modules/default/currentweather/currentweather.js");
 		Module.definitions.currentweather.config = {};
 	});