diff --git a/harness/sth.js b/harness/sth.js index c3f94c6b8a00ef6607c55179e56ce4de7793b11f..3a6e9ca9dcf2c846dac00fdff106cb64118c1d98 100644 --- a/harness/sth.js +++ b/harness/sth.js @@ -27,6 +27,7 @@ function BrowserRunner() { errorDetectorFileContents, simpleTestAPIContents, globalScopeContents, + assertContents, timerContents, startTime, harnessDir = "harness/"; @@ -45,6 +46,11 @@ function BrowserRunner() { dataType: "text", success: function(data){globalScopeContents = data;}, url:harnessDir+"gs.js"}); + + $.ajax({async: false, + dataType: "text", + success: function(data){assertContents = data;}, + url:harnessDir+"assert.js"}); $.ajax({async: false, dataType: "text", @@ -215,6 +221,10 @@ function BrowserRunner() { idoc.writeln(globalScopeContents); idoc.writeln("</script>"); + idoc.writeln("<script type='text/javascript'>"); + idoc.writeln(assertContents); + idoc.writeln("</script>"); + //this is mainly applicable for consoles that do not have setTimeout support //idoc.writeln("<script type='text/javascript' src='harness/timer.js' defer>" + "</script>"); if(setTimeout === undefined && isAsyncTest(code)) { diff --git a/tools/packaging/templates/runner.bestPractice.html b/tools/packaging/templates/runner.bestPractice.html index 5f2d4df723e21d35e4cc5e12fbf6b3d7037ddef7..60c3bbef6f66115c1a1cb8759352721f0082169f 100644 --- a/tools/packaging/templates/runner.bestPractice.html +++ b/tools/packaging/templates/runner.bestPractice.html @@ -11,7 +11,6 @@ </script> <script type="text/javascript" src="harness/sth.js"></script> <script type="text/javascript" src="harness/sta.js"></script> -<script type="text/javascript" src="harness/assert.js"></script> <script type="text/javascript" src="harness/jqueryprogressbar.js"></script> <script type="text/javascript" src="harness/helper.js"></script> <script type="text/javascript" src="harness/jquery.base64.js"></script> diff --git a/tools/packaging/templates/runner.intl402.html b/tools/packaging/templates/runner.intl402.html index 989d734bf6cb7b1abec9143d93805bee16e53594..11f8321f062362bca625af9891303621481692ed 100644 --- a/tools/packaging/templates/runner.intl402.html +++ b/tools/packaging/templates/runner.intl402.html @@ -11,7 +11,6 @@ </script> <script type="text/javascript" src="harness/sth.js"></script> <script type="text/javascript" src="harness/sta.js"></script> -<script type="text/javascript" src="harness/assert.js"></script> <script type="text/javascript" src="harness/jqueryprogressbar.js"></script> <script type="text/javascript" src="harness/helper.js"></script> <script type="text/javascript" src="harness/jquery.base64.js"></script> diff --git a/tools/packaging/templates/runner.test262.html b/tools/packaging/templates/runner.test262.html index 60745b96e4f62da15adeb1f0ea793edeb21042bc..9f51b6b02b64ed6831ef7b278e3105c4fa77d93f 100644 --- a/tools/packaging/templates/runner.test262.html +++ b/tools/packaging/templates/runner.test262.html @@ -11,7 +11,6 @@ </script> <script type="text/javascript" src="harness/sth.js"></script> <script type="text/javascript" src="harness/sta.js"></script> -<script type="text/javascript" src="harness/assert.js"></script> <script type="text/javascript" src="harness/jqueryprogressbar.js"></script> <script type="text/javascript" src="harness/helper.js"></script> <script type="text/javascript" src="harness/jquery.base64.js"></script>