diff --git a/framework/src/source/BaseTestSuite.bs b/framework/src/source/BaseTestSuite.bs index fe73329..da40806 100644 --- a/framework/src/source/BaseTestSuite.bs +++ b/framework/src/source/BaseTestSuite.bs @@ -199,6 +199,8 @@ namespace rooibos m.testRunner.top.unobserveFieldScoped("rooibosGroupFinished") ' m.testGroupDone() m.onAsyncGroupComplete(group) + else if m.testRunner.top.rooibosGroupFinished + m.onAsyncGroupComplete(group) end if end if diff --git a/framework/src/source/CommonUtils.bs b/framework/src/source/CommonUtils.bs index 9b9a6f5..3845120 100755 --- a/framework/src/source/CommonUtils.bs +++ b/framework/src/source/CommonUtils.bs @@ -334,7 +334,9 @@ namespace rooibos.common 'bs:disable-next-line isFirst = false end if - for each key in input + keys = input.keys() + keys.sort() + for each key in keys if rooibos.common.canSafelyIterateAAKey(input, key) text = text + key + ":" + rooibos.common.asString(input[key], includeType) end if diff --git a/framework/src/source/Rooibos.bs b/framework/src/source/Rooibos.bs index 2853a4a..03b1108 100644 --- a/framework/src/source/Rooibos.bs +++ b/framework/src/source/Rooibos.bs @@ -38,7 +38,7 @@ namespace rooibos ' leading to an instant exit of the application ' Give the io port time to finish sending all the logs - sleep(200) + sleep(400) end end if end if diff --git a/framework/src/source/TestRunner.bs b/framework/src/source/TestRunner.bs index e216b0d..ee5d6df 100644 --- a/framework/src/source/TestRunner.bs +++ b/framework/src/source/TestRunner.bs @@ -163,6 +163,7 @@ namespace rooibos ? "Running suite asynchronously!" m.nodeContext.top.observeFieldScoped("rooibosSuiteFinished", "Rooibos_onTestSuiteComplete") testSuite.run() + return invalid else ? "Running suite synchronously!" testSuite.run()