Skip to content

Commit f44bf7e

Browse files
committed
Merge pull request facebook#3966 from spicyj/no-worker-test
Remove web worker test
2 parents 1503994 + 12ea09a commit f44bf7e

File tree

4 files changed

+4
-91
lines changed

4 files changed

+4
-91
lines changed

Gruntfile.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,17 +205,13 @@ module.exports = function(grunt) {
205205
'coverage:parse'
206206
]);
207207
grunt.registerTask('fasttest', function() {
208-
if (grunt.option('debug')) {
209-
grunt.task.run('build:test', 'connect:server:keepalive');
210-
} else {
211-
grunt.task.run('build:test', 'test:webdriver:phantomjs');
212-
}
208+
grunt.task.run('test');
213209
});
214210
grunt.registerTask('test', function() {
215211
if (grunt.option('debug')) {
216-
grunt.task.run('build:test', 'build:basic', 'connect:server:keepalive');
212+
grunt.task.run('build:test', 'connect:server:keepalive');
217213
} else {
218-
grunt.task.run('build:test', 'build:basic', 'test:webdriver:phantomjs');
214+
grunt.task.run('build:test', 'test:webdriver:phantomjs');
219215
}
220216
});
221217
grunt.registerTask('npm:test', ['build', 'npm:pack']);

src/renderers/dom/client/__tests__/ReactWebWorker-test.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/test/worker.js

Lines changed: 0 additions & 38 deletions
This file was deleted.

test/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
'the-files-to-test.generated.js',
2121
'lib/jasmine-execute.js'
2222
];
23-
23+
2424
if (typeof Function.prototype.bind == 'undefined') {
2525
urls.unshift('../node_modules/es5-shim/es5-sham.js');
2626
urls.unshift('../node_modules/es5-shim/es5-shim.js');
@@ -33,7 +33,6 @@
3333
}
3434

3535
var base = location.protocol + '//' + location.hostname + ':' + location.port + location.pathname.replace(/^\/?/,'/').split('/').reverse().slice(1).reverse().join('/');
36-
window.ReactWebWorker_URL = base + '/../src/test/worker.js' + cacheBust;
3736

3837
}());
3938
</script>

0 commit comments

Comments
 (0)