diff --git a/.travis.yml b/.travis.yml index 8148fa783..dfca6c30a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,7 +66,7 @@ before_install: - "[ $MAKE != false ] && mkdir ./node_modules/lodash-cli/node_modules && cd ./node_modules/lodash-cli/node_modules/ && ln -s ../../../ ./lodash && cd ../ && npm i . && cd ../../ || true" - "[ $MAKE != false ] && node ./node_modules/lodash-cli/bin/lodash $BUILD -o ./dist/lodash.$BUILD.js || true" script: - - "[ $BIN == 'istanbul' ] && $BIN cover ./test/test.js || true" + - "[ $BIN == 'istanbul' ] && $BIN cover -x \"**/vendor/**\" ./test/test.js -- ./dist/lodash.js || true" - "([ $SAUCE_LABS != false ] || [ $BUILD == false ]) && true || cd ./test" - "([ $SAUCE_LABS != false ] || [ $BUILD == false ]) && true || $BIN $OPTION ./test.js ../dist/lodash.$BUILD.js" - "([ $SAUCE_LABS != false ] || [ $BUILD == false ]) && true || $BIN $OPTION ./test.js ../dist/lodash.$BUILD.min.js" diff --git a/test/test.js b/test/test.js index 1ee7e8de2..b0fe13cf6 100644 --- a/test/test.js +++ b/test/test.js @@ -1459,7 +1459,7 @@ equal(counts[1], 2); QUnit.start(); - }, 256); + }, 512); } else { skipTest(7); @@ -1647,7 +1647,7 @@ asyncTest('should delay `func` execution', 2, function() { if (!(isRhino && isModularize)) { var pass = false; - _.delay(function(){ pass = true; }, 100); + _.delay(function(){ pass = true; }, 128); setTimeout(function() { ok(!pass); @@ -1656,7 +1656,7 @@ setTimeout(function() { ok(pass); QUnit.start(); - }, 256); + }, 512); } else { skipTest(2); @@ -7041,7 +7041,7 @@ setTimeout(function() { throttled(); throttled(); - }, 100); + }, 96); setTimeout(function() { ok(count > 1);