diff --git a/framework/src/source/BaseTestReporter.bs b/framework/src/source/BaseTestReporter.bs index fdc42f9d..2f114272 100644 --- a/framework/src/source/BaseTestReporter.bs +++ b/framework/src/source/BaseTestReporter.bs @@ -5,10 +5,10 @@ namespace rooibos public config = invalid public allStats = invalid - function new(testRunner as dynamic) - m.testRunner = testRunner - m.config = testRunner.config - m.allStats = testRunner.stats + function new(runner as dynamic) + m.testRunner = runner + m.config = runner.config + m.allStats = runner.stats end function function reportResults(allStats as dynamic) diff --git a/framework/src/source/ConsoleTestReporter.bs b/framework/src/source/ConsoleTestReporter.bs index 8d7056e2..285d48de 100644 --- a/framework/src/source/ConsoleTestReporter.bs +++ b/framework/src/source/ConsoleTestReporter.bs @@ -3,9 +3,9 @@ namespace rooibos private lineWidth = 60 - function new(testRunner) + function new(runner) 'bs:disable-next-line - super(testRunner) + super(runner) if m.config.lineWidth <> invalid m.lineWidth = m.config.lineWidth else diff --git a/tests/src/source/Common.spec.bs b/tests/src/source/Common.spec.bs index a6794ea7..38795cf8 100644 --- a/tests/src/source/Common.spec.bs +++ b/tests/src/source/Common.spec.bs @@ -53,7 +53,9 @@ namespace tests newManager = Rooibos.Common.makePathStubbable(manager, "manager.item.data") - m.assertEqual(newManager, { + m.assertEqual(newManager, { id: "data" }) + + m.assertEqual(manager, { id: "man" item: { id: "item" @@ -74,8 +76,9 @@ namespace tests } newManager = Rooibos.Common.makePathStubbable(manager, "manager.item.data") + m.assertEqual(newManager, { id: "data" }) - m.assertEqual(newManager, { + m.assertEqual(manager, { id: "man" item: { data: { diff --git a/tests/src/source/Expect.spec.bs b/tests/src/source/Expect.spec.bs index 82bf62c3..43e26ffa 100644 --- a/tests/src/source/Expect.spec.bs +++ b/tests/src/source/Expect.spec.bs @@ -1,10 +1,14 @@ namespace tests - @noEarlyExit @suite class ExpectTests extends rooibos.BaseTestSuite + protected override function beforeEach() + super.beforeEach() + m.isAutoAssertingMocks = true + end function + '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ '+ Helper '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/tests/src/source/NodeExample.spec.bs b/tests/src/source/NodeExample.spec.bs index f70b35e8..c8c03408 100644 --- a/tests/src/source/NodeExample.spec.bs +++ b/tests/src/source/NodeExample.spec.bs @@ -1,5 +1,4 @@ namespace tests - @only @SGNode("NodeExample") @suite class NodeExampleTests extends rooibos.BaseTestSuite