Skip to content

Commit 6c0c1f6

Browse files
jaredpetersenroman-vanesyan
authored andcommittedOct 1, 2018
removed newline above and below errors
1 parent b6549f2 commit 6c0c1f6

4 files changed

+5
-17
lines changed
 

‎index.js

-8
Original file line numberDiff line numberDiff line change
@@ -792,9 +792,7 @@ Command.prototype.opts = function() {
792792
*/
793793

794794
Command.prototype.missingArgument = function(name) {
795-
console.error();
796795
console.error("error: missing required argument `%s'", name);
797-
console.error();
798796
process.exit(1);
799797
};
800798

@@ -807,13 +805,11 @@ Command.prototype.missingArgument = function(name) {
807805
*/
808806

809807
Command.prototype.optionMissingArgument = function(option, flag) {
810-
console.error();
811808
if (flag) {
812809
console.error("error: option `%s' argument missing, got `%s'", option.flags, flag);
813810
} else {
814811
console.error("error: option `%s' argument missing", option.flags);
815812
}
816-
console.error();
817813
process.exit(1);
818814
};
819815

@@ -826,9 +822,7 @@ Command.prototype.optionMissingArgument = function(option, flag) {
826822

827823
Command.prototype.unknownOption = function(flag) {
828824
if (this._allowUnknownOption) return;
829-
console.error();
830825
console.error("error: unknown option `%s'", flag);
831-
console.error();
832826
process.exit(1);
833827
};
834828

@@ -840,9 +834,7 @@ Command.prototype.unknownOption = function(flag) {
840834
*/
841835

842836
Command.prototype.variadicArgNotLast = function(name) {
843-
console.error();
844837
console.error("error: variadic arguments must be last `%s'", name);
845-
console.error();
846838
process.exit(1);
847839
};
848840

‎test/test.command.allowUnknownOption.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ program
1313
.option('-p, --pepper', 'add pepper');
1414
program.parse('node test -m'.split(' '));
1515

16-
stubError.callCount.should.equal(3);
16+
stubError.callCount.should.equal(1);
1717

1818

1919
// test subcommand
@@ -24,7 +24,7 @@ program
2424
});
2525
program.parse('node test sub -m'.split(' '));
2626

27-
stubError.callCount.should.equal(3);
27+
stubError.callCount.should.equal(1);
2828
stubExit.calledOnce.should.be.true();
2929

3030
// command with `allowUnknownOption`

‎test/test.options.args.required.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ console.error = function () {
1414

1515
process.on('exit', function (code) {
1616
code.should.equal(1);
17-
info.length.should.equal(3);
18-
info[1].should.equal("error: option `-c, --cheese <type>' argument missing");
17+
info.length.should.equal(1);
18+
info[0].should.equal("error: option `-c, --cheese <type>' argument missing");
1919
process.exit(0)
2020
});
2121

‎test/test.variadic.args.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,4 @@ try {
5757
process.exit = oldProcessExit;
5858
console.error = oldConsoleError;
5959

60-
[
61-
'',
62-
'error: variadic arguments must be last `variadicArg\'',
63-
''
64-
].join('\n').should.eql(errorMessage);
60+
'error: variadic arguments must be last `variadicArg\''.should.eql(errorMessage);

0 commit comments

Comments
 (0)
Please sign in to comment.