serve worker.js from its actual relative path
Thomas Aylott committed
Oct 28, 2013 at 16:34 UTC
8205c681eb214dd8155d4ab05c4189d55a6a9737
4 files changed
+6
-2
src/environment/__tests__/ReactWebWorker-test.js
+1
-1
@@ -26,7 +26,7 @@ describe('ReactWebWorker', function() {
26
var done = false;
27
var error;
28
29
- var worker = new Worker('/worker.js');
29
+ var worker = new Worker(window.ReactWebWorker_URL || '/src/test/worker.js?_=' + Date.now().toString(36));
30
worker.addEventListener('message', function(e) {
31
var data = JSON.parse(e.data);
32
if (data.type == 'error') {
src/test/worker.js
+1
-1
@@ -6,7 +6,7 @@ var global = {};
6
importScripts("phantomjs-shims.js");
7
8
try {
9
- importScripts("react.js");
9
+ importScripts("../../build/react.js");
10
} catch (e) {
11
postMessage(JSON.stringify({
12
type: 'error',
test/browser-runner.js
+2
@@ -18,6 +18,8 @@
18
19
var cacheBust = '?_=' + Date.now().toString(36);
20
21
+ window.ReactWebWorker_URL = __dirname + '/../src/test/worker.js' + cacheBust;
22
+
23
document.write('<script src="' + __dirname + '/../build/jasmine.js' + cacheBust + '"><\/script>');
24
document.write('<script src="' + __dirname + '/../build/react.js' + cacheBust + '"><\/script>');
25
document.write('<script src="' + __dirname + '/../build/react-test.js' + cacheBust + '"><\/script>');
test/phantom-harness.js
+2
@@ -56,6 +56,8 @@ server.listen(port, function(req, res) {
56
file = "../build/" + file;
57
break;
58
59
+ case "src/test/worker.js":
60
+ file = file.replace('src/test/', '');
61
case "phantomjs-shims.js":
62
case "worker.js":
63
file = "../src/test/" + file;