mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 19:53:36 +00:00
Resolved conflict unit tests between currentweather and newsfeed.
This commit is contained in:
parent
7fc82ccead
commit
739fb99ced
@ -7,13 +7,17 @@ var vm = require("vm");
|
|||||||
|
|
||||||
describe("Functions module currentweather", function() {
|
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(){
|
before(function(){
|
||||||
Module = {};
|
|
||||||
config = {};
|
|
||||||
Module.definitions = {};
|
|
||||||
Module.register = function (name, moduleDefinition) {
|
|
||||||
Module.definitions[name] = moduleDefinition;
|
|
||||||
};
|
|
||||||
require("../../../modules/default/currentweather/currentweather.js");
|
require("../../../modules/default/currentweather/currentweather.js");
|
||||||
Module.definitions.currentweather.config = {};
|
Module.definitions.currentweather.config = {};
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user