Merge pull request #3966 from spicyj/no-worker-test

Remove web worker test
facebook · May 27, 2015 · f44bf7e · f44bf7e
2 parents 1503994 + 12ea09a
commit f44bf7e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 91 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -205,17 +205,13 @@ module.exports = function(grunt) {
     'coverage:parse'
   ]);
   grunt.registerTask('fasttest', function() {
-    if (grunt.option('debug')) {
-      grunt.task.run('build:test', 'connect:server:keepalive');
-    } else {
-      grunt.task.run('build:test', 'test:webdriver:phantomjs');
-    }
+    grunt.task.run('test');
   });
   grunt.registerTask('test', function() {
     if (grunt.option('debug')) {
-      grunt.task.run('build:test', 'build:basic', 'connect:server:keepalive');
+      grunt.task.run('build:test', 'connect:server:keepalive');
     } else {
-      grunt.task.run('build:test', 'build:basic', 'test:webdriver:phantomjs');
+      grunt.task.run('build:test', 'test:webdriver:phantomjs');
     }
   });
   grunt.registerTask('npm:test', ['build', 'npm:pack']);

diff --git a/src/renderers/dom/client/__tests__/ReactWebWorker-test.js b/src/renderers/dom/client/__tests__/ReactWebWorker-test.js
diff --git a/src/test/worker.js b/src/test/worker.js
diff --git a/test/index.html b/test/index.html
@@ -20,7 +20,7 @@
     'the-files-to-test.generated.js',
     'lib/jasmine-execute.js'
   ];
-  
+
   if (typeof Function.prototype.bind == 'undefined') {
     urls.unshift('../node_modules/es5-shim/es5-sham.js');
     urls.unshift('../node_modules/es5-shim/es5-shim.js');
@@ -33,7 +33,6 @@
   }
 
   var base = location.protocol + '//' + location.hostname + ':' + location.port + location.pathname.replace(/^\/?/,'/').split('/').reverse().slice(1).reverse().join('/');
-  window.ReactWebWorker_URL = base + '/../src/test/worker.js' + cacheBust;
 
 }());
 </script>