tyler.durden
/
test262
mirror of https://github.com/tc39/test262.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #325 from bocoup/fix-browser 

Update browser runner to inject `assert.js`
This commit is contained in:
Brian Terlson 2015-06-18 15:39:37 -04:00
parent 42d16da901 73aa06275a
commit 0164622232
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
harness/sth.js
View File

@ -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)) {

1
tools/packaging/templates/runner.bestPractice.html
View File

@ -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>

1
tools/packaging/templates/runner.intl402.html
View File

@ -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>

1
tools/packaging/templates/runner.test262.html
View File

@ -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>