summaryrefslogtreecommitdiff
path: root/js/gulpfile.js
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-06-17 21:50:03 +0200
committerJose <jose@zeroc.com>2015-06-17 21:50:03 +0200
commit256a3aaaa2da84bfdc34dce1aa5c5287b8a15761 (patch)
tree91684522737e3ef56920ed58b272acc6d6556407 /js/gulpfile.js
parentIE timeout not very accurate (diff)
downloadice-256a3aaaa2da84bfdc34dce1aa5c5287b8a15761.tar.bz2
ice-256a3aaaa2da84bfdc34dce1aa5c5287b8a15761.tar.xz
ice-256a3aaaa2da84bfdc34dce1aa5c5287b8a15761.zip
Fixed ICE-6610: timeout test fails with IE 10
The connection limit of IE was exceed with some tests, remove browser sync fixes the issue, as there is a few more connections available to the test.
Diffstat (limited to 'js/gulpfile.js')
-rw-r--r--js/gulpfile.js26
1 files changed, 5 insertions, 21 deletions
diff --git a/js/gulpfile.js b/js/gulpfile.js
index 594c5251832..972f1997cf5 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -113,10 +113,7 @@ gulp.task("common:slice:watch", ["common:slice"],
function(){
gulp.watch(["test/Common/Controller.ice"],
function(){
- gulp.start("common:slice",
- function(){
- browserSync.reload("test/Common/Controller.js");
- });
+ gulp.start("common:slice");
});
});
@@ -135,10 +132,7 @@ gulp.task("common:js:watch", ["common:js"],
function(){
gulp.watch(common.scripts,
function(){
- gulp.start("common:js",
- function(){
- browserSync.reload("assets/common.min.js");
- });
+ gulp.start("common:js");
});
});
@@ -157,10 +151,7 @@ gulp.task("common:css:watch", ["common:css"],
function(){
gulp.watch(common.styles,
function(){
- gulp.start("common:css",
- function(){
- browserSync.reload("assets/common.css");
- });
+ gulp.start("common:css");
});
});
@@ -219,8 +210,7 @@ tests.forEach(
gulp.watch(
[path.join(name, "*.js"), path.join(name, "browser", "*.js"),
- path.join(name, "*.html")],
- function(e){ browserSync.reload(e.path); });
+ path.join(name, "*.html")]);
});
gulp.task(testCleanDependTask(name), [],
@@ -361,12 +351,7 @@ libs.forEach(
gulp.task(libCleanTask(lib), [], function(){ del(libGeneratedFiles(lib, sources)); });
gulp.task(libWatchTask(lib), [minLibTask(lib)],
function(){
- gulp.watch(sources.slice.map(sliceFile).concat(watchSources(lib, sources)),
- function(){
- gulp.start(minLibTask(lib), function(){
- browserSync.reload(libFileMin(lib));
- });
- });
+ gulp.watch(sources.slice.map(sliceFile).concat(watchSources(lib, sources)));
});
});
@@ -388,7 +373,6 @@ gulp.task("watch", ["test:watch"].concat(useBinDist ? [] : ["dist:watch"]));
gulp.task("test:run-with-browser", ["watch"].concat(useBinDist ? ["test"] : ["build"]),
function(){
- browserSync();
require("./bin/HttpServer")();
var p = require("child_process").spawn("python", ["../scripts/TestController.py"], {stdio: "inherit"});