fix coverage path

This commit is contained in:
Philipp Kunz 2016-02-09 17:26:25 +01:00
parent cf507a4a17
commit bfc5bbbbb7
8 changed files with 20 additions and 19 deletions

2
index.d.ts vendored
View File

@ -6,7 +6,6 @@ declare module NpmtsPlugins {
gulp: any; gulp: any;
g: { g: {
coveralls: any; coveralls: any;
if: any;
insert: any; insert: any;
istanbul: any; istanbul: any;
mocha: any; mocha: any;
@ -44,7 +43,6 @@ declare var plugins: {
gulp: any; gulp: any;
g: { g: {
coveralls: any; coveralls: any;
if: any;
insert: any; insert: any;
istanbul: any; istanbul: any;
mocha: any; mocha: any;

View File

@ -10,7 +10,6 @@ var NpmtsPlugins;
gulp: require("gulp"), gulp: require("gulp"),
g: { g: {
coveralls: require("gulp-coveralls"), coveralls: require("gulp-coveralls"),
if: require("gulp-if"),
insert: require("gulp-insert"), insert: require("gulp-insert"),
istanbul: require("gulp-istanbul"), istanbul: require("gulp-istanbul"),
mocha: require("gulp-mocha"), mocha: require("gulp-mocha"),
@ -209,15 +208,20 @@ var NpmtsTests;
return stream; return stream;
}; };
var coveralls = function () { var coveralls = function () {
var stream = plugins.gulp.src("./coverage/**/lcov.info") var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "./coverage/lcov.info")])
.pipe(plugins.g.if((process.env.TRAVIS && config.coveralls), plugins.g.coveralls())); .pipe(plugins.g.coveralls());
return stream; return stream;
}; };
istanbul().on("finish", function () { istanbul().on("finish", function () {
mocha().on("finish", function () { mocha().on("finish", function () {
if (process.env.TRAVIS && config.coveralls) {
coveralls().on("finish", function () { coveralls().on("finish", function () {
done.resolve(config); done.resolve(config);
}); });
}
else {
done.resolve(config);
}
}); });
}); });
return done.promise; return done.promise;

View File

@ -30,7 +30,6 @@
"fs-extra": "^0.26.5", "fs-extra": "^0.26.5",
"gulp": "3.9.0", "gulp": "3.9.0",
"gulp-coveralls": "^0.1.4", "gulp-coveralls": "^0.1.4",
"gulp-if": "^2.0.0",
"gulp-insert": "0.5.0", "gulp-insert": "0.5.0",
"gulp-istanbul": "^0.10.3", "gulp-istanbul": "^0.10.3",
"gulp-mocha": "^2.2.0", "gulp-mocha": "^2.2.0",

View File

@ -77,7 +77,7 @@
</div><!-- /wrapper --> </div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'> <div class='footer quiet pad2 space-top1 center small'>
Code coverage Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 17:01:13 GMT+0100 (CET) generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 17:25:54 GMT+0100 (CET)
</div> </div>
</div> </div>
<script src="../prettify.js"></script> <script src="../prettify.js"></script>

View File

@ -76,7 +76,7 @@ module.exports = testplugin;
</div><!-- /wrapper --> </div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'> <div class='footer quiet pad2 space-top1 center small'>
Code coverage Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 17:01:13 GMT+0100 (CET) generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 17:25:54 GMT+0100 (CET)
</div> </div>
</div> </div>
<script src="../prettify.js"></script> <script src="../prettify.js"></script>

View File

@ -77,7 +77,7 @@
</div><!-- /wrapper --> </div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'> <div class='footer quiet pad2 space-top1 center small'>
Code coverage Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 17:01:13 GMT+0100 (CET) generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 17:25:54 GMT+0100 (CET)
</div> </div>
</div> </div>
<script src="prettify.js"></script> <script src="prettify.js"></script>

View File

@ -7,7 +7,6 @@ module NpmtsPlugins {
gulp: require("gulp"), gulp: require("gulp"),
g: { g: {
coveralls: require("gulp-coveralls"), coveralls: require("gulp-coveralls"),
if: require("gulp-if"),
insert: require("gulp-insert"), insert: require("gulp-insert"),
istanbul: require("gulp-istanbul"), istanbul: require("gulp-istanbul"),
mocha: require("gulp-mocha"), mocha: require("gulp-mocha"),

View File

@ -23,19 +23,20 @@ module NpmtsTests {
}; };
var coveralls = function(){ var coveralls = function(){
var stream = plugins.gulp.src("./coverage/**/lcov.info") var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"./coverage/lcov.info")])
.pipe(plugins.g.if( .pipe(plugins.g.coveralls());
(process.env.TRAVIS && config.coveralls),
plugins.g.coveralls()
));
return stream; return stream;
}; };
istanbul().on("finish",function(){ istanbul().on("finish",function(){
mocha().on("finish",function(){ mocha().on("finish",function(){
if(process.env.TRAVIS && config.coveralls){
coveralls().on("finish",function(){ coveralls().on("finish",function(){
done.resolve(config); done.resolve(config);
}) })
} else {
done.resolve(config);
}
}) })
}); });
return done.promise; return done.promise;