--notest now working

This commit is contained in:
Philipp Kunz 2016-06-16 03:24:01 +02:00
parent 5221d3ee84
commit 20ad0d0b38
8 changed files with 23 additions and 33 deletions

View File

@ -11,7 +11,7 @@ exports.run = function (argvArg) {
} }
if (plugins.smartfile.checks.fileExistsSync(configPath)) { if (plugins.smartfile.checks.fileExistsSync(configPath)) {
plugins.beautylog.info("npmts.json".blue + " config file found!"); plugins.beautylog.info("npmts.json".blue + " config file found!");
config = plugins.smartfile.local.toObjectSync(configPath); config = plugins.lodashObject.assign(config, plugins.smartfile.local.toObjectSync(configPath));
switch (config.mode) { switch (config.mode) {
case "default": case "default":
case "custom": case "custom":

View File

@ -9,7 +9,6 @@ var NpmtsConfigFile = require("./npmts.configfile");
var NpmtsInstall = require("./npmts.install"); var NpmtsInstall = require("./npmts.install");
var NpmtsJsdoc = require("./npmts.jsdoc"); var NpmtsJsdoc = require("./npmts.jsdoc");
var NpmtsOptions = require("./npmts.options"); var NpmtsOptions = require("./npmts.options");
var NpmtsPublish = require("./npmts.publish");
var NpmtsTests = require("./npmts.tests"); var NpmtsTests = require("./npmts.tests");
exports.promisechain = function (argvArg) { exports.promisechain = function (argvArg) {
var done = plugins.Q.defer(); var done = plugins.Q.defer();
@ -22,7 +21,6 @@ exports.promisechain = function (argvArg) {
.then(NpmtsAssets.run) .then(NpmtsAssets.run)
.then(NpmtsJsdoc.run) .then(NpmtsJsdoc.run)
.then(NpmtsTests.run) .then(NpmtsTests.run)
.then(NpmtsPublish.run)
.then(function (configArg) { .then(function (configArg) {
var shipString = "" + var shipString = "" +
"\n" + "\n" +

3
dist/npmts.tests.js vendored
View File

@ -56,7 +56,7 @@ var coverage = function (configArg) {
exports.run = function (configArg) { exports.run = function (configArg) {
var done = plugins.Q.defer(); var done = plugins.Q.defer();
var config = configArg; var config = configArg;
if (!config.notest) { if (config.notest != true) {
npmts_promisechain_1.npmtsOra.text("now starting tests"); npmts_promisechain_1.npmtsOra.text("now starting tests");
plugins.beautylog.log("-------------------------------------------------------\n" + plugins.beautylog.log("-------------------------------------------------------\n" +
"*************************** TESTS: ***************************\n" + "*************************** TESTS: ***************************\n" +
@ -69,6 +69,7 @@ exports.run = function (configArg) {
}); });
} }
else { else {
npmts_promisechain_1.npmtsOra.end();
done.resolve(config); done.resolve(config);
} }
return done.promise; return done.promise;

View File

@ -7,9 +7,10 @@
"npmts": "dist/cli.js" "npmts": "dist/cli.js"
}, },
"scripts": { "scripts": {
"test": "(npm run compile && npm run check && npm run checkVersion)", "test": "(npm run compile && npm run check && npm run checkVersion && npm run checkNoTest)",
"check": "(cd ./test/assets && node ../../dist/index.js)", "check": "(cd ./test/assets && node ../../dist/index.js)",
"checkVersion": "cd ./test/assets && node ../../dist/index.js -v", "checkVersion": "cd ./test/assets && node ../../dist/index.js -v",
"checkNoTest":"cd ./test/assets && node ../../dist/index.js --notest",
"compile": "(cd compile && node compile.js)" "compile": "(cd compile && node compile.js)"
}, },
"repository": { "repository": {

View File

@ -10,7 +10,10 @@ export var run = function(argvArg){
} }
if(plugins.smartfile.checks.fileExistsSync(configPath)){ if(plugins.smartfile.checks.fileExistsSync(configPath)){
plugins.beautylog.info("npmts.json".blue + " config file found!"); plugins.beautylog.info("npmts.json".blue + " config file found!");
config = plugins.smartfile.local.toObjectSync(configPath); config = plugins.lodashObject.assign(
config,
plugins.smartfile.local.toObjectSync(configPath)
);
switch (config.mode){ switch (config.mode){
case "default": case "default":
case "custom": case "custom":

View File

@ -10,7 +10,6 @@ import NpmtsConfigFile = require("./npmts.configfile");
import NpmtsInstall = require("./npmts.install"); import NpmtsInstall = require("./npmts.install");
import NpmtsJsdoc = require("./npmts.jsdoc"); import NpmtsJsdoc = require("./npmts.jsdoc");
import NpmtsOptions = require("./npmts.options"); import NpmtsOptions = require("./npmts.options");
import NpmtsPublish = require("./npmts.publish");
import NpmtsTests = require("./npmts.tests"); import NpmtsTests = require("./npmts.tests");
export let promisechain = function(argvArg){ export let promisechain = function(argvArg){
@ -24,7 +23,6 @@ export let promisechain = function(argvArg){
.then(NpmtsAssets.run) .then(NpmtsAssets.run)
.then(NpmtsJsdoc.run) .then(NpmtsJsdoc.run)
.then(NpmtsTests.run) .then(NpmtsTests.run)
.then(NpmtsPublish.run)
.then(function(configArg){ .then(function(configArg){
let shipString = "" + let shipString = "" +
"\n" + "\n" +

View File

@ -1,11 +0,0 @@
import "typings-global";
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
import NpmtsJsdoc = require("./npmts.jsdoc");
export let run = function(configArg){
let done = plugins.Q.defer();
let config = configArg;
done.resolve();
return done.promise;
};

View File

@ -62,22 +62,22 @@ let coverage = function(configArg){
export let run = function(configArg) { export let run = function(configArg) {
let done = plugins.Q.defer(); let done = plugins.Q.defer();
let config = configArg; let config = configArg;
if(!config.notest){ if(config.notest != true){
npmtsOra.text("now starting tests");
plugins.beautylog.log(
"-------------------------------------------------------\n" +
"*************************** TESTS: ***************************\n" +
"--------------------------------------------------------------"
);
npmtsOra.text("now starting tests"); istanbul(config)
plugins.beautylog.log( .then(mocha)
"-------------------------------------------------------\n" + .then(coverage)
"*************************** TESTS: ***************************\n" + .then(() => {
"--------------------------------------------------------------" done.resolve(config);
); });
istanbul(config)
.then(mocha)
.then(coverage)
.then(() => {
done.resolve(config);
});
} else { } else {
npmtsOra.end();
done.resolve(config); done.resolve(config);
} }
return done.promise; return done.promise;