Merge branch 'master' into v9

This commit is contained in:
n1474335 2019-07-05 12:30:28 +01:00
commit e4e32a9c56
22 changed files with 384 additions and 264 deletions

View file

@ -66,7 +66,7 @@ import Chef from "../../src/core/Chef";
ret.output = "Expected an error but did not receive one.";
} else if (result.result === test.expectedOutput) {
ret.status = "passing";
} else if (test.hasOwnProperty("expectedMatch") && test.expectedMatch.test(result.result)) {
} else if ("expectedMatch" in test && test.expectedMatch.test(result.result)) {
ret.status = "passing";
} else {
ret.status = "failing";