don't require async tests to also return synchronously
This commit is contained in:
parent
54694e3d7e
commit
f996a24ce2
1 changed files with 15 additions and 14 deletions
|
@ -558,26 +558,27 @@ Ox.test = function(file, callback) {
|
|||
item.tests && item.tests.some(function(test) {
|
||||
return test.result;
|
||||
}) && item.tests.forEach(function(test) {
|
||||
Ox.Log('TEST', test.statement);
|
||||
actual = eval(test.statement);
|
||||
match = test.statement.match(/Ox\.test\.async\('([\w\.]+)'/);
|
||||
if (match) {
|
||||
Ox.test.data[file].tests[match[1]] = {
|
||||
section: item.section,
|
||||
statement: test.statement
|
||||
};
|
||||
}
|
||||
Ox.Log('TEST', test.statement);
|
||||
actual = eval(test.statement);
|
||||
if (test.result) {
|
||||
Ox.test.data[file].results.push({
|
||||
actual: JSON.stringify(actual),
|
||||
expected: test.result,
|
||||
name: item.name,
|
||||
section: item.section,
|
||||
statement: test.statement,
|
||||
passed: Ox.isEqual(eval(
|
||||
'(' + test.result + ')'
|
||||
), actual)
|
||||
});
|
||||
} else {
|
||||
if (test.result) {
|
||||
Ox.test.data[file].results.push({
|
||||
actual: JSON.stringify(actual),
|
||||
expected: test.result,
|
||||
name: item.name,
|
||||
section: item.section,
|
||||
statement: test.statement,
|
||||
passed: Ox.isEqual(eval(
|
||||
'(' + test.result + ')'
|
||||
), actual)
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue