summaryrefslogtreecommitdiff
path: root/tools/packaging
diff options
context:
space:
mode:
authorMike Pennisi <mike@mikepennisi.com>2015-06-18 13:40:05 -0400
committerMike Pennisi <mike@mikepennisi.com>2015-06-18 13:53:09 -0400
commit73aa06275a8c7eba19cbcfab323ad2062b273c00 (patch)
tree0153211841c65d5e24494d3d858b95704e9b328f /tools/packaging
parent42d16da90113c4739df3a8161ea898e80df70697 (diff)
downloadqtdeclarative-testsuites-73aa06275a8c7eba19cbcfab323ad2062b273c00.tar.gz
Update browser runner to inject `assert.js`
Since the Python runner was updated to include `assert.js` in all tests unconditionally, a number of tests have been written that implicitly rely on its presence. The browser runner does not currently provide this file's contents to these tests, so they fail unconditionally. Update the browser runner to inject that file's contents into every test context. Note: the existing approach to file retrieval (namely loading via synchronous XHR requests) is inefficient and deprecated in some browsers. It is honored here for the sake of consistency and to minimize the changeset necessary to fix the browser runner.
Diffstat (limited to 'tools/packaging')
-rw-r--r--tools/packaging/templates/runner.bestPractice.html1
-rw-r--r--tools/packaging/templates/runner.intl402.html1
-rw-r--r--tools/packaging/templates/runner.test262.html1
3 files changed, 0 insertions, 3 deletions
diff --git a/tools/packaging/templates/runner.bestPractice.html b/tools/packaging/templates/runner.bestPractice.html
index 5f2d4df72..60c3bbef6 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 989d734bf..11f8321f0 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 60745b96e..9f51b6b02 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>