Merge conflicts

2025-12-05 23:53:27 +00:00 · 2017-05-06 13:47:26 +01:00
parent 5d52c49c31 274e1139fa
commit 03fc22d3da
11 changed files with 218 additions and 13 deletions
--- a/test/TestRegister.js
+++ b/test/TestRegister.js
@@ -40,13 +40,13 @@ import Chef from "../src/core/Chef.js";
            this.tests.map(function(test, i) {
                let chef = new Chef();

-                return Promise.resolve(chef.bake(
+                return chef.bake(
                    test.input,
                    test.recipeConfig,
                    {},
                    0,
                    false
-                ))
+                )
                .then(function(result) {
                    let ret = {
                        test: test,