提交 b043384e 编写于 作者: M Mislav Marohnić

Render main test suite as root resource of test server

上级 667995fd
...@@ -12,5 +12,16 @@ node ./script/server $port &>/dev/null & ...@@ -12,5 +12,16 @@ node ./script/server $port &>/dev/null &
server_pid=$! server_pid=$!
trap "kill $server_pid" INT EXIT trap "kill $server_pid" INT EXIT
node ./node_modules/.bin/mocha-phantomjs -s localToRemoteUrlAccessEnabled=true -s webSecurityEnabled=false "http://localhost:$port/test/test.html" STATUS=0
node ./node_modules/.bin/mocha-phantomjs -s localToRemoteUrlAccessEnabled=true -s webSecurityEnabled=false "http://localhost:$port/test/test-worker.html"
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
...@@ -25,7 +25,7 @@ job="$(./script/saucelabs-api --raw "js-tests" <<JSON ...@@ -25,7 +25,7 @@ job="$(./script/saucelabs-api --raw "js-tests" <<JSON
"tags": ["$TRAVIS_PULL_REQUEST", "$TRAVIS_BRANCH"], "tags": ["$TRAVIS_PULL_REQUEST", "$TRAVIS_BRANCH"],
"tunnel-identifier": "$TRAVIS_JOB_NUMBER", "tunnel-identifier": "$TRAVIS_JOB_NUMBER",
"platforms": [["$SAUCE_PLATFORM", "$SAUCE_BROWSER", "$SAUCE_VERSION"]], "platforms": [["$SAUCE_PLATFORM", "$SAUCE_BROWSER", "$SAUCE_VERSION"]],
"url": "http://localhost:$port/test/test.html", "url": "http://localhost:$port/",
"framework": "mocha" "framework": "mocha"
} }
JSON JSON
......
...@@ -129,6 +129,7 @@ server = http.createServer(function(req, res) { ...@@ -129,6 +129,7 @@ server = http.createServer(function(req, res) {
if (route) { if (route) {
route(res, req); route(res, req);
} else { } else {
if (pathname == '/') pathname = '/test/test.html'
fs.readFile(__dirname + '/..' + pathname, function(err, data) { fs.readFile(__dirname + '/..' + pathname, function(err, data) {
if (err) { if (err) {
res.writeHead(404, {'Content-Type': types.txt}); res.writeHead(404, {'Content-Type': types.txt});
......
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Fetch Worker Tests</title> <title>Fetch Worker Tests</title>
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" /> <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
</head> </head>
<body> <body>
<div id="mocha"></div> <div id="mocha"></div>
<script src="../node_modules/mocha/mocha.js"></script> <script src="/node_modules/mocha/mocha.js"></script>
<script> <script>
mocha.setup('tdd') mocha.setup('tdd')
var worker = new Worker('worker.js') var worker = new Worker('/test/worker.js')
worker.addEventListener('message', function(e) { worker.addEventListener('message', function(e) {
switch (e.data.name) { switch (e.data.name) {
......
...@@ -3,21 +3,20 @@ ...@@ -3,21 +3,20 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Fetch Tests</title> <title>Fetch Tests</title>
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" /> <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
</head> </head>
<body> <body>
<div id="mocha"></div> <div id="mocha"></div>
<script src="../node_modules/chai/chai.js"></script> <script src="/node_modules/chai/chai.js"></script>
<script src="../node_modules/mocha/mocha.js"></script> <script src="/node_modules/mocha/mocha.js"></script>
<script> <script>
mocha.setup('tdd') mocha.setup('tdd')
self.assert = chai.assert self.assert = chai.assert
</script> </script>
<script src="../bower_components/es6-promise/promise.js"></script> <script src="/bower_components/es6-promise/promise.js"></script>
<script src="../fetch.js"></script> <script src="/test/test.js"></script>
<script src="/fetch.js"></script>
<script src="test.js"></script>
<script> <script>
if (self.mochaPhantomJS) { if (self.mochaPhantomJS) {
......
importScripts('../node_modules/chai/chai.js') importScripts('/node_modules/chai/chai.js')
importScripts('../node_modules/mocha/mocha.js') importScripts('/node_modules/mocha/mocha.js')
mocha.setup('tdd') mocha.setup('tdd')
self.assert = chai.assert self.assert = chai.assert
importScripts('../bower_components/es6-promise/promise.js') importScripts('/bower_components/es6-promise/promise.js')
importScripts('../fetch.js') importScripts('/test/test.js')
importScripts('/fetch.js')
importScripts('test.js')
function title(test) { function title(test) {
return test.fullTitle().replace(/#/g, ''); return test.fullTitle().replace(/#/g, '');
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册