Fix up runtime tests

This commit is contained in:
Nick O'Leary
2018-04-23 14:24:51 +01:00
parent e3b1179a21
commit 34832d5942
15 changed files with 144 additions and 101 deletions

View File

@@ -27,7 +27,7 @@ var settings;
function init(runtime) {
settings = runtime.settings;
installer.init(runtime.settings);
installer.init(runtime);
loader.init(runtime);
registry.init(settings,loader);
}

View File

@@ -20,7 +20,7 @@ var path = require("path");
var fs = require("fs");
var registry = require("./registry");
var log = require("../../../util").log; // TODO: separate module
var log;
var events = require("../../events");
@@ -32,8 +32,9 @@ var settings;
var moduleRe = /^(@[^/]+?[/])?[^/]+?$/;
var slashRe = process.platform === "win32" ? /\\|[/]/ : /[/]/;
function init(_settings) {
settings = _settings;
function init(runtime) {
settings = runtime.settings;
log = runtime.log;
}
function checkModulePath(folder) {

View File

@@ -19,8 +19,8 @@ var fs = require("fs");
var path = require("path");
var events;
var log = require("../../../util").log; // TODO: separate module
var i18n = require("../../../util").i18n; // TODO: separate module
var log;
var i18n;
var settings;
var disableNodePathScan = false;
@@ -29,6 +29,8 @@ var iconFileExtensions = [".png", ".gif"];
function init(runtime) {
settings = runtime.settings;
events = runtime.events;
log = runtime.log;
i18n = runtime.i18n;
}
function isIncluded(name) {