diff --git a/.travis.yml b/.travis.yml index 595f556..719b754 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,12 @@ node_js: - "4" - "5" - "6" +env: + - WEBPACK=webpack + - WEBPACK=webpack@beta +install: + - npm install --ignore-scripts + - npm rm webpack + - npm install $WEBPACK --ignore-scripts || true script: - - npm test - - npm rm webpack && npm i webpack@beta || true - - npm test + - npm test \ No newline at end of file diff --git a/spec/BasicSpec.js b/spec/BasicSpec.js index bf8de01..9413b4c 100644 --- a/spec/BasicSpec.js +++ b/spec/BasicSpec.js @@ -20,7 +20,7 @@ var HtmlWebpackPlugin = require('../index.js'); var OUTPUT_DIR = path.join(__dirname, '../dist'); -jasmine.getEnv().defaultTimeoutInterval = 5000; +jasmine.getEnv().defaultTimeoutInterval = 10000; function testHtmlPlugin (webpackConfig, expectedResults, outputFile, done, expectErrors, expectWarnings) { outputFile = outputFile || 'index.html'; diff --git a/spec/CachingSpec.js b/spec/CachingSpec.js index 0e02659..cc47bdf 100644 --- a/spec/CachingSpec.js +++ b/spec/CachingSpec.js @@ -18,6 +18,8 @@ var HtmlWebpackPlugin = require('../index.js'); var OUTPUT_DIR = path.join(__dirname, '../dist'); +jasmine.getEnv().defaultTimeoutInterval = 10000; + function setUpCompiler (htmlWebpackPlugin) { spyOn(htmlWebpackPlugin, 'evaluateCompilationResult').and.callThrough(); var compiler = new WebpackRecompilationSimulator(webpack({ diff --git a/spec/ExampleSpec.js b/spec/ExampleSpec.js index b40a571..98e79a7 100644 --- a/spec/ExampleSpec.js +++ b/spec/ExampleSpec.js @@ -20,7 +20,7 @@ var webpackMajorVersion = require('webpack/package.json').version.split('.')[0]; var OUTPUT_DIR = path.join(__dirname, '../dist'); -jasmine.getEnv().defaultTimeoutInterval = 5000; +jasmine.getEnv().defaultTimeoutInterval = 10000; function runExample (exampleName, done) { var examplePath = path.resolve(__dirname, '..', 'examples', exampleName);