Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix foxx-manager test for running in arangosh

This commit is contained in:
Wilfried Goesgens 2015-10-02 15:39:49 +02:00
parent 3060e1d63d
commit a968707134
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/client/tests/shell-foxx-manager-spec-nightly.js → js/client/tests/shell-foxx-manager-nightly-spec.js
View File

@ -33,7 +33,7 @@
var FoxxManager = require("org/arangodb/foxx/manager"); var FoxxManager = require("org/arangodb/foxx/manager");
var fs = require("fs"); var fs = require("fs");
var db = require("internal").db; var db = require("internal").db;
var basePath = fs.makeAbsolute(fs.join(module.startupPath(), "common", "test-data", "apps")); var basePath = fs.makeAbsolute(fs.join(require("internal").startupPath, "common", "test-data", "apps"));
var arango = require("org/arangodb").arango; var arango = require("org/arangodb").arango;
var originalEndpoint = arango.getEndpoint().replace(/localhost/, '127.0.0.1'); var originalEndpoint = arango.getEndpoint().replace(/localhost/, '127.0.0.1');

14
js/common/modules/org/arangodb/testrunner.js
View File

@ -14,13 +14,13 @@ function runJSUnityTests(tests) {
var allResults = []; var allResults = [];
var res; var res;
// find out whether we're on server or client...
var runenvironment = "arangod";
if (typeof(require('internal').arango) === 'object') {
runenvironment = "arangosh";
}
_.each(tests, function (file) { _.each(tests, function (file) {
// find out whether we're on server or client...
var runenvironment = "arangod";
if (typeof(require('internal').arango) === 'object') {
runenvironment = "arangosh";
}
if (result) { if (result) {
print("\n" + Date() + " " + runenvironment + ": Running JSUnity test from file '" + file + "'"); print("\n" + Date() + " " + runenvironment + ": Running JSUnity test from file '" + file + "'");
} else { } else {
@ -69,7 +69,7 @@ function runCommandLineTests(opts) {
options = opts || {}, options = opts || {},
jasmineReportFormat = options.jasmineReportFormat || 'progress', jasmineReportFormat = options.jasmineReportFormat || 'progress',
unitTests = internal.unitTests(), unitTests = internal.unitTests(),
isSpecRegEx = /.+spec\.js/, isSpecRegEx = /.+-spec.*\.js/,
isSpec = function (unitTest) { isSpec = function (unitTest) {
return isSpecRegEx.test(unitTest); return isSpecRegEx.test(unitTest);
}, },