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

fixed tests

This commit is contained in:
Jan Steemann 2014-12-15 21:06:43 +01:00
parent a90ee78ae1
commit 1ba3d65485
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/common/tests/shell-database.js
View File

@ -577,7 +577,7 @@ function DatabaseSuite () {
}
catch (err) {
// cannot call method ... of undefined
assertMatch(/^Cannot call method.*of undefined/, err.message);
assertMatch(/^Cannot read property 'save' of undefined/, err.message);
}
},
@ -610,7 +610,7 @@ function DatabaseSuite () {
}
catch (err) {
// cannot call method ... of undefined
assertMatch(/^Cannot call method.*of undefined/, err.message);
assertMatch(/^Cannot read property 'save' of undefined/, err.message);
}
db._create(name);

16
js/server/modules/org/arangodb/testing.js
View File

@ -592,20 +592,20 @@ function runThere (options, instanceInfo, file) {
function runHere (options, instanceInfo, file) {
var result;
try {
var test;
if (file.indexOf("-spec") === -1) {
test = 'var runTest = require("jsunity").runTest; '+
'result = runTest(' + JSON.stringify(file) + ');';
var runTest = require("jsunity").runTest;
result = runTest(file);
}
else {
var jasmineReportFormat = options.jasmineReportFormat || 'progress';
test = 'var executeTestSuite = require("jasmine").executeTestSuite; '+
'result = executeTestSuite([' + JSON.stringify(file) + '],{"format": '+
JSON.stringify(jasmineReportFormat) + '});';
var executeTestSuite = require("jasmine").executeTestSuite;
result = executeTestSuite([ file ], { format: jasmineReportFormat });
}
eval(test);
if (file.indexOf("-spec") !== -1) {
result = {status: result, message: ''};
result = {
status: result,
message: ''
};
}
}
catch (err) {