From ccad33282ac28028786af1b55024b401255f61db Mon Sep 17 00:00:00 2001 From: erikkemperman Date: Sat, 17 Oct 2015 01:38:51 +0200 Subject: [PATCH] Use gulp#4.0 for testing gulp-cli#4.0 --- package.json | 2 +- test/fixtures/gulpfile.js | 15 +++++++++++---- test/flags-tasks.js | 20 ++++++++++++-------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 5b87e3d8..dbf68311 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "devDependencies": { "code": "^1.2.1", "coveralls": "^2.7.0", - "gulp": ">=3.8.10", + "gulp": "gulpjs/gulp#4.0", "jscs": "^1.11.3", "jshint": "^2.5.0", "jshint-stylish": "^2.0.1", diff --git a/test/fixtures/gulpfile.js b/test/fixtures/gulpfile.js index 852c5d81..581fc5e4 100644 --- a/test/fixtures/gulpfile.js +++ b/test/fixtures/gulpfile.js @@ -2,12 +2,19 @@ var gulp = require('gulp'); -function noop() {} -function described() {} +function noop(done) { + done(); +} + +function described(done) { + done(); +} + described.description = 'description'; gulp.task('test1', noop); -gulp.task('test2', ['test1'], noop); +gulp.task('test2', gulp.series('test1')); gulp.task('test3', described); -gulp.task('default', ['test1', 'test3'], noop); +gulp.task('default', gulp.series('test1', 'test3')); + diff --git a/test/flags-tasks.js b/test/flags-tasks.js index 439de618..9263f1d9 100644 --- a/test/flags-tasks.js +++ b/test/flags-tasks.js @@ -11,16 +11,20 @@ lab.experiment('flag: --tasks', function() { child.exec('node ' + __dirname + '/../bin/gulp.js --tasks --cwd ./test/fixtures', function(err, stdout) { code.expect(stdout).to.contain('Tasks for'); stdout = stdout.replace(/\\/g, '/').split('Tasks for')[1].split('\n'); - code.expect(stdout[0]).to.contain('/gulp-cli/test'); - code.expect(stdout[1]).to.contain('├── test1'); - code.expect(stdout[2]).to.contain('├─┬ test2'); - code.expect(stdout[3]).to.contain('│ └── test1'); - code.expect(stdout[4]).to.contain('├── test3 description'); - code.expect(stdout[5]).to.contain('└─┬ default'); - code.expect(stdout[6]).to.contain(' ├── test1'); - code.expect(stdout[7]).to.contain(' └── test3'); + var i = 0; + code.expect(stdout[i++]).to.contain('/gulp-cli/test'); + code.expect(stdout[i++]).to.contain('├── test1'); + code.expect(stdout[i++]).to.contain('├─┬ test2'); + code.expect(stdout[i++]).to.contain('│ └─┬ '); + code.expect(stdout[i++]).to.contain('│ └── test1'); + code.expect(stdout[i++]).to.contain('├── test3 description'); + code.expect(stdout[i++]).to.contain('└─┬ default'); + code.expect(stdout[i++]).to.contain(' └─┬ '); + code.expect(stdout[i++]).to.contain(' ├── test1'); + code.expect(stdout[i++]).to.contain(' └── test3'); done(err); }); }); }); +