Use travis matrix

This commit is contained in:
Jan Nicklas 2016-05-02 14:00:06 +02:00
parent 10058066d7
commit c6f59019b3
4 changed files with 12 additions and 5 deletions

View File

@ -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

View File

@ -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';

View File

@ -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({

View File

@ -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);