diff --git a/test-harness/box.json b/test-harness/box.json index a231683..87e0631 100644 --- a/test-harness/box.json +++ b/test-harness/box.json @@ -8,7 +8,7 @@ "coldbox":"^5.0.0" }, "devDependencies":{ - "testbox":"^2.8.0" + "testbox":"^3.0.0" }, "installPaths":{ "coldbox":"coldbox/", diff --git a/test-harness/config/Coldbox.cfc b/test-harness/config/Coldbox.cfc index 7e4b412..5122bc6 100644 --- a/test-harness/config/Coldbox.cfc +++ b/test-harness/config/Coldbox.cfc @@ -40,14 +40,6 @@ development = "localhost,127\.0\.0\.1" }; - // Module Directives - modules = { - // An array of modules names to load, empty means all of them - include = [], - // An array of modules names to NOT load, empty means none - exclude = [] - }; - //Register interceptors as an array, we need order interceptors = [ ]; diff --git a/test-harness/tests/index.cfm b/test-harness/tests/index.cfm index f67cdb0..0ccfa80 100644 --- a/test-harness/tests/index.cfm +++ b/test-harness/tests/index.cfm @@ -13,7 +13,6 @@ - @@ -26,14 +25,14 @@ #testbox.init( directory=rootMapping & url.path ).run()# -

Invalid incoming directory: #rootMapping & url.path#

 +

Invalid incoming directory: #rootMapping & url.path#

 - + @@ -42,155 +41,75 @@ + - TestBox Global Runner - - + + + + - }); - function runTests(){ - $("#btn-run").html( 'Running...' ).css( "opacity", "0.5" ); - $("#tb-results").load( "index.cfm", $("#runnerForm").serialize(), function( data ){ - $("#btn-run").html( 'Run' ).css( "opacity", "1" ); - } ); - } - function clearResults(){ - $("#tb-results").html( '' ); - $("#target").html( '' ); - $("#labels").html( '' ); - } - - -
-
- - -
-
v#testbox.getVersion()#
- - +
+
+
+ +
+ v#testbox.getVersion()# +
+ +
- -
-

TestBox Test Browser:

-

- Below is a listing of the files and folders starting from your root #rootPath#. You can click on individual tests in order to execute them - or click on the Run All button on your left and it will execute a directory runner from the visible folder. -

- -
Contents: #executePath# - -
- - - - - - - - - +#qResults.name#
- - target="_blank">#qResults.name#
- - target="_blank">#qResults.name#
- - #qResults.name#
- - - -
- +
+
+ + +

TestBox Test Browser:

+

+ Below is a listing of the files and folders starting from your root #rootPath#. You can click on individual tests in order to execute them + or click on the Run All button on your left and it will execute a directory runner from the visible folder. +

+ +
+ Contents: #executePath# + +
+ + + + + + + + + ✚ #qResults.name#
+ + target="_blank">#qResults.name#
+ + target="_blank">#qResults.name#
+ + #qResults.name#
+ + + +
+ +
- -
- -
- \ No newline at end of file diff --git a/test-harness/tests/specs/integration/i18n.cfc b/test-harness/tests/specs/integration/i18n.cfc index c41f355..ffa7747 100644 --- a/test-harness/tests/specs/integration/i18n.cfc +++ b/test-harness/tests/specs/integration/i18n.cfc @@ -63,7 +63,7 @@ component extends="coldbox.system.testing.BaseTestCase" appMapping="/root"{ }); it( "can load from modules", function(){ - var event = execute( event="test1:test.i18n", renderResults=true ); + var event = execute( route="test1/test/i18n", renderResults=true ); expect( event.getValue( "cbox_rendered_content" ) ).toInclude( "Welcome to my awesome multi-lingual module" ); });