Render main test suite as root resource of test server

OlegDokuka · Jan 13, 2016 · b043384 · b043384
1 parent 667995f
commit b043384
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 19 deletions.
diff --git a/script/phantomjs b/script/phantomjs
@@ -12,5 +12,16 @@ node ./script/server $port &>/dev/null &
 server_pid=$!
 trap "kill $server_pid" INT EXIT
 
-node ./node_modules/.bin/mocha-phantomjs -s localToRemoteUrlAccessEnabled=true -s webSecurityEnabled=false "http://localhost:$port/test/test.html"
-node ./node_modules/.bin/mocha-phantomjs -s localToRemoteUrlAccessEnabled=true -s webSecurityEnabled=false "http://localhost:$port/test/test-worker.html"
+STATUS=0
+
+run() {
+  node ./node_modules/.bin/mocha-phantomjs \
+    -s localToRemoteUrlAccessEnabled=true \
+    -s webSecurityEnabled=false \
+    "$@" || STATUS=$?
+}
+
+run "http://localhost:$port/"
+run "http://localhost:$port/test/test-worker.html"
+
+exit $STATUS
diff --git a/script/saucelabs b/script/saucelabs
@@ -25,7 +25,7 @@ job="$(./script/saucelabs-api --raw "js-tests" <<JSON
     "tags": ["$TRAVIS_PULL_REQUEST", "$TRAVIS_BRANCH"],
     "tunnel-identifier": "$TRAVIS_JOB_NUMBER",
     "platforms": [["$SAUCE_PLATFORM", "$SAUCE_BROWSER", "$SAUCE_VERSION"]],
-    "url": "http://localhost:$port/test/test.html",
+    "url": "http://localhost:$port/",
     "framework": "mocha"
   }
 JSON

diff --git a/script/server b/script/server
@@ -129,6 +129,7 @@ server = http.createServer(function(req, res) {
   if (route) {
     route(res, req);
   } else {
+    if (pathname == '/') pathname = '/test/test.html'
     fs.readFile(__dirname + '/..' + pathname, function(err, data) {
       if (err) {
         res.writeHead(404, {'Content-Type': types.txt});

diff --git a/test/test-worker.html b/test/test-worker.html
@@ -3,16 +3,16 @@
 <head>
   <meta charset="utf-8">
   <title>Fetch Worker Tests</title>
-  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+  <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
 </head>
 <body>
   <div id="mocha"></div>
-  <script src="../node_modules/mocha/mocha.js"></script>
+  <script src="/node_modules/mocha/mocha.js"></script>
 
   <script>
     mocha.setup('tdd')
 
-    var worker = new Worker('worker.js')
+    var worker = new Worker('/test/worker.js')
 
     worker.addEventListener('message', function(e) {
       switch (e.data.name) {

diff --git a/test/test.html b/test/test.html
@@ -3,21 +3,20 @@
 <head>
   <meta charset="utf-8">
   <title>Fetch Tests</title>
-  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+  <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
 </head>
 <body>
   <div id="mocha"></div>
-  <script src="../node_modules/chai/chai.js"></script>
-  <script src="../node_modules/mocha/mocha.js"></script>
+  <script src="/node_modules/chai/chai.js"></script>
+  <script src="/node_modules/mocha/mocha.js"></script>
   <script>
     mocha.setup('tdd')
     self.assert = chai.assert
   </script>
 
-  <script src="../bower_components/es6-promise/promise.js"></script>
-  <script src="../fetch.js"></script>
-
-  <script src="test.js"></script>
+  <script src="/bower_components/es6-promise/promise.js"></script>
+  <script src="/test/test.js"></script>
+  <script src="/fetch.js"></script>
 
   <script>
     if (self.mochaPhantomJS) {

diff --git a/test/worker.js b/test/worker.js
@@ -1,13 +1,12 @@
-importScripts('../node_modules/chai/chai.js')
-importScripts('../node_modules/mocha/mocha.js')
+importScripts('/node_modules/chai/chai.js')
+importScripts('/node_modules/mocha/mocha.js')
 
 mocha.setup('tdd')
 self.assert = chai.assert
 
-importScripts('../bower_components/es6-promise/promise.js')
-importScripts('../fetch.js')
-
-importScripts('test.js')
+importScripts('/bower_components/es6-promise/promise.js')
+importScripts('/test/test.js')
+importScripts('/fetch.js')
 
 function title(test) {
   return test.fullTitle().replace(/#/g, '');