kopia lustrzana https://github.com/c9/core
Merge pull request +8583 from c9/fix-tests
fix test runner stopping on metrics testpull/124/head
commit
c5048020f1
|
@ -134,7 +134,7 @@ var processLoadQueue = function(err, id) {
|
|||
}
|
||||
};
|
||||
|
||||
define.amd = true;
|
||||
define.amd = {};
|
||||
define.queue = [];
|
||||
define.loaded = {};
|
||||
define.errors = {};
|
||||
|
@ -296,7 +296,7 @@ require.MODULE_LOAD_URL = MODULE_LOAD_URL;
|
|||
require.toUrl = function(moduleName, ext, skipExt) {
|
||||
var absRe = /^([\w\+\.\-]+:|\/)/;
|
||||
var index = moduleName.indexOf("!");
|
||||
if (index !== -1 || !ext)
|
||||
if (index !== -1 || !ext || /^\/|\.js$/.test(moduleName))
|
||||
ext = "";
|
||||
|
||||
var paths = config.paths;
|
||||
|
|
|
@ -105,9 +105,9 @@
|
|||
"c9.ide.run": "#1e99c8c1d2",
|
||||
"c9.ide.run.build": "#ad45874c88",
|
||||
"c9.ide.run.debug.xdebug": "#3b1520f83d",
|
||||
"c9.ide.save": "#58b8616a88",
|
||||
"c9.ide.save": "#cc613b6ead",
|
||||
"c9.ide.scm": "#undefined",
|
||||
"c9.ide.terminal.monitor": "#b0b4d03280",
|
||||
"c9.ide.terminal.monitor": "#b52a3f2144",
|
||||
"c9.ide.theme.flat": "#2de8414db7",
|
||||
"c9.ide.threewaymerge": "#229382aa0b",
|
||||
"c9.ide.undo": "#b028bcb4d5",
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
<div id="mocha"></div>
|
||||
<div id='jserror' width='100%' height='20px' style='font: 10px \"courier new\"; color: red; display: none;'></div>
|
||||
|
||||
<script src="require.js"></script>
|
||||
<script src="mini_require.js"></script>
|
||||
<script src="/configs/require_config.js"></script>
|
||||
<script src="lib/mocha/mocha.js"></script>
|
||||
<script>
|
||||
|
@ -156,7 +156,7 @@
|
|||
require([path]);
|
||||
}
|
||||
// allow running some tests in both client and server
|
||||
["amd-loader", "../../test/setup_paths"].forEach(defineEmpty);
|
||||
["amd-loader", "test/setup_paths"].forEach(defineEmpty);
|
||||
// require.config({paths: {chai: "lib/chai/chai"}});
|
||||
|
||||
|
||||
|
@ -173,7 +173,13 @@
|
|||
});
|
||||
|
||||
|
||||
var deps = ["text!/test/all.json", "lib/architect/architect", "lib/chai/chai", "test.js"];
|
||||
var deps = [
|
||||
"text!/test/all.json",
|
||||
"lib/architect/architect",
|
||||
"lib/chai/chai",
|
||||
"test",
|
||||
"plugins/c9.ide.ui/lib_less1.5"
|
||||
];
|
||||
if (options.ui === "none")
|
||||
deps.shift();
|
||||
|
||||
|
@ -226,8 +232,10 @@
|
|||
running = false;
|
||||
lastDone && lastDone();
|
||||
}
|
||||
running ? done() : mocha.run(done);
|
||||
if (!running) {
|
||||
running = true;
|
||||
mocha.run(done);
|
||||
}
|
||||
};
|
||||
onload.remain = onload.remain == "1";
|
||||
|
||||
|
@ -347,14 +355,14 @@
|
|||
}
|
||||
|
||||
/* global requirejs require: true*/
|
||||
var defaultModules = Object.keys(requirejs.s.contexts._.defined).filter(function(x) {
|
||||
var defaultModules = Object.keys(define.modules).filter(function(x) {
|
||||
return !/text!/.test(x);
|
||||
});
|
||||
function cleanupRequireModules() {
|
||||
Object.keys(require.s.contexts._.defined).forEach(function(x) {
|
||||
Object.keys(define.modules).forEach(function(x) {
|
||||
if (/text!/.test(x) || defaultModules.indexOf(x) != -1)
|
||||
return;
|
||||
if (/lib\/ace|lib\/treehugger|\/ctags\/ctags$/.test(x) && !/_test/.test(x))
|
||||
if (/^ace|^treehugger|\/ctags\/ctags$/.test(x) && !/_test/.test(x))
|
||||
return;
|
||||
|
||||
require.undef(x);
|
||||
|
@ -366,7 +374,15 @@
|
|||
c = function(err) {
|
||||
lastDone && lastDone(err.message);
|
||||
};
|
||||
return requirejs(a, b, c);
|
||||
// workaround for sync minirequire behaviour
|
||||
var bt = b && function() {
|
||||
var args = [].slice.call(arguments);
|
||||
var self = this;
|
||||
setTimeout(function() {
|
||||
b.apply(self, args);
|
||||
});
|
||||
};
|
||||
return requirejs(a, bt, c);
|
||||
};
|
||||
Object.keys(requirejs).forEach(function(x) {
|
||||
if (!(x in require)) {
|
||||
|
|
Ładowanie…
Reference in New Issue