tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/loadUrl-removed-4349' of ssh://git.icinga.org/icinga2-web

Browse Source
This commit is contained in:
Jannis Moßhammer 2013-06-27 15:32:14 +02:00
commit eaf6314efe
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/js/icinga/icinga.js
View File

@ -40,7 +40,6 @@ define([
}; };
var loadModuleScript = function(name) { var loadModuleScript = function(name) {
console.log("Loading ", name);
moduleMgr.enableModule("modules/"+name+"/"+name, function(error) { moduleMgr.enableModule("modules/"+name+"/"+name, function(error) {
failedModules.push({ failedModules.push({
name: name, name: name,

4
test/js/testlib/requiremock.js
View File

@ -59,7 +59,7 @@ var defineMock = function() {
fn = arguments[currentArg+1]; fn = arguments[currentArg+1];
for (var i=0;i<argList.length;i++) { for (var i=0;i<argList.length;i++) {
if (typeof registerDependencies[argList[i]] === "undefined" && debug) { if (typeof registerDependencies[argList[i]] === "undefined" && debug) {
console.warn("Unknown dependency "+argList[i]+" in define()"); // console.warn("Unknown dependency "+argList[i]+" in define()");
} }
fnargs.push(registeredDependencies[argList[i]]); fnargs.push(registeredDependencies[argList[i]]);
@ -98,7 +98,7 @@ function purgeDependencies() {
}; };
} }
// helper to log debug messages with console // helper to log debug messages with console
console.debug = console.log; console.debug = function() {};
/** /**
* Registers a name=>object map of dependencies * Registers a name=>object map of dependencies

6
test/php/phpunit.xml
View File

@ -17,4 +17,10 @@
<directory>regression/</directory> <directory>regression/</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
<filter>
<blacklist>
<directory suffix=".php">/usr/share/php</directory>
<directory suffix=".php">/usr/lib</directory>
</blacklist>
</filter>
</phpunit> </phpunit>