Skip to content

Commit

Permalink
Merge branch '1.X'
Browse files Browse the repository at this point in the history
  • Loading branch information
nmccready committed Jan 9, 2017
2 parents 23db837 + 5c6bb18 commit 1f13876
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions test/integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ test('combined: inline concatenated file', function(t) {
});
});

test('combined: less: inline concatenated file', {timeout: 1500}, function(t) {
test('combined: less: inline concatenated file', {timeout: 3000}, function(t) { //note ~1000 ms is fine locally, travis needs more
// proves that gulp-less compilation is not slow
// https://github.com/floridoo/gulp-sourcemaps/issues/215

Expand All @@ -136,11 +136,11 @@ test('combined: less: inline concatenated file', {timeout: 1500}, function(t) {
.pipe($.if("*.less",$.less()))
.pipe(sourcemaps.write({sourceRoot:'../../test/assets'}))
.pipe(gulp.dest('tmp/combined_inline_less'))
.on('error', function() {
.once('error', function() {
t.fail('emitted error');
t.end();
})
.on('finish', function(){
.once('finish', function(){
moveHtml('combined_inline_less', t);
});
});
Expand All @@ -157,7 +157,7 @@ test('combined: mapped preExisting', function(t) {
.pipe($.if("*.js",$.concat("index.js")))
.pipe(sourcemaps.write('.', {sourceRoot:'../../test/assets'}))
.pipe(gulp.dest('tmp/combined_map_preExisting'))
.on('error', function() {
.once('error', function() {
t.fail('emitted error');
t.end();
})
Expand All @@ -169,7 +169,7 @@ test('combined: mapped preExisting', function(t) {
'concatenated file is mapped once');
}
})
.on('finish', function(){
.once('finish', function(){
moveHtml('combined_map_preExisting', t);
});
});
Expand Down

0 comments on commit 1f13876

Please sign in to comment.