Skip to content

Commit

Permalink
Merge pull request #339 from bcoe/cleanup-tests
Browse files Browse the repository at this point in the history 
split(' ') is no longer needed in tests
  • Loading branch information
@bcoe
bcoe committed Jan 10, 2016
2 parents 555b2f8 + 33b9482 commit afed474
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions test/usage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('usage tests', function () {
describe('using .demand()', function () {
it('should show an error along with the missing arguments on demand fail', function () {
var r = checkUsage(function () {
return yargs('-x 10 -z 20'.split(' '))
return yargs('-x 10 -z 20')
.usage('Usage: $0 -x NUM -y NUM')
.demand(['x', 'y'])
.wrap(null)
Expand All @@ -39,7 +39,7 @@ describe('usage tests', function () {
describe('using .require()', function () {
it('should show an error along with the missing arguments on demand fail', function () {
var r = checkUsage(function () {
return yargs('-x 10 -z 20'.split(' '))
return yargs('-x 10 -z 20')
.usage('Usage: $0 -x NUM -y NUM')
.require(['x', 'y'])
.wrap(null)
Expand All @@ -63,7 +63,7 @@ describe('usage tests', function () {

it('should show an error along with a custom message on demand fail', function () {
var r = checkUsage(function () {
return yargs('-z 20'.split(' '))
return yargs('-z 20')
.usage('Usage: $0 -x NUM -y NUM')
.demand(['x', 'y'], 'x and y are both required to multiply all the things')
.wrap(null)
Expand All @@ -85,7 +85,7 @@ describe('usage tests', function () {

it('should return valid values when demand passes', function () {
var r = checkUsage(function () {
return yargs('-x 10 -y 20'.split(' '))
return yargs('-x 10 -y 20')
.usage('Usage: $0 -x NUM -y NUM')
.demand(['x', 'y'])
.wrap(null)
Expand Down Expand Up @@ -178,7 +178,7 @@ describe('usage tests', function () {

it('should return valid values when check passes', function () {
var r = checkUsage(function () {
return yargs('-x 10 -y 20'.split(' '))
return yargs('-x 10 -y 20')
.usage('Usage: $0 -x NUM -y NUM')
.check(function (argv) {
if (!('x' in argv)) throw Error('You forgot about -x')
Expand All @@ -198,7 +198,7 @@ describe('usage tests', function () {

it('should display missing arguments when check fails with a thrown exception', function () {
var r = checkUsage(function () {
return yargs('-x 10 -z 20'.split(' '))
return yargs('-x 10 -z 20')
.usage('Usage: $0 -x NUM -y NUM')
.wrap(null)
.check(function (argv) {
Expand All @@ -221,7 +221,7 @@ describe('usage tests', function () {

it('should display missing arguments when check fails with a return value', function () {
var r = checkUsage(function () {
return yargs('-x 10 -z 20'.split(' '))
return yargs('-x 10 -z 20')
.usage('Usage: $0 -x NUM -y NUM')
.wrap(null)
.check(function (argv) {
Expand All @@ -248,7 +248,7 @@ describe('usage tests', function () {
return 'x' in argv && 'y' in argv
}
var r = checkUsage(function () {
return yargs('-x 10 -y 20'.split(' '))
return yargs('-x 10 -y 20')
.usage('Usage: $0 -x NUM -y NUM')
.check(checker)
.argv
Expand All @@ -267,7 +267,7 @@ describe('usage tests', function () {
return 'x' in argv && 'y' in argv
}
var r = checkUsage(function () {
return yargs('-x 10 -z 20'.split(' '))
return yargs('-x 10 -z 20')
.usage('Usage: $0 -x NUM -y NUM')
.check(checker)
.wrap(null)
Expand All @@ -290,7 +290,7 @@ describe('usage tests', function () {
it('should display missing arguments once', function () {
var r = checkUsage(function () {
try {
return yargs('-x 10 -z 20'.split(' '))
return yargs('-x 10 -z 20')
.usage('Usage: $0 -x NUM -y NUM')
.exitProcess(false)
.wrap(null)
Expand All @@ -314,7 +314,7 @@ describe('usage tests', function () {

it('should return a valid result when demanding a count of non-hyphenated values', function () {
var r = checkUsage(function () {
return yargs('1 2 3 --moo'.split(' '))
return yargs('1 2 3 --moo')
.usage('Usage: $0 [x] [y] [z] {OPTIONS}')
.demand(3)
.argv
Expand All @@ -329,7 +329,7 @@ describe('usage tests', function () {

it('should return a failure message when not enough non-hyphenated arguments are found after a demand count', function () {
var r = checkUsage(function () {
return yargs('1 2 --moo'.split(' '))
return yargs('1 2 --moo')
.usage('Usage: $0 [x] [y] [z] {OPTIONS}')
.demand(3)
.wrap(null)
Expand All @@ -349,7 +349,7 @@ describe('usage tests', function () {

it('should return a custom failure message when not enough non-hyphenated arguments are found after a demand count', function () {
var r = checkUsage(function () {
return yargs('src --moo'.split(' '))
return yargs('src --moo')
.usage('Usage: $0 [x] [y] [z] {OPTIONS} <src> <dest> [extra_files...]')
.demand(2, 'src and dest files are both required')
.wrap(null)
Expand All @@ -369,7 +369,7 @@ describe('usage tests', function () {

it('should return a valid result when setting defaults for singles', function () {
var r = checkUsage(function () {
return yargs('--foo 50 --baz 70 --powsy'.split(' '))
return yargs('--foo 50 --baz 70 --powsy')
.default('foo', 5)
.default('bar', 6)
.default('baz', 7)
Expand Down Expand Up @@ -414,7 +414,7 @@ describe('usage tests', function () {

it('should allow you to set default values for a hash of options', function () {
var r = checkUsage(function () {
return yargs('--foo 50 --baz 70'.split(' '))
return yargs('--foo 50 --baz 70')
.default({ foo: 10, bar: 20, quux: 30 })
.argv
})
Expand All @@ -435,7 +435,7 @@ describe('usage tests', function () {
bar: { description: 'bar option', alias: 'b', requiresArg: true }
}

return yargs('-f --bar 20'.split(' '))
return yargs('-f --bar 20')
.usage('Usage: $0 [options]', opts)
.wrap(null)
.argv
Expand All @@ -461,7 +461,7 @@ describe('usage tests', function () {
bar: { description: 'bar option', alias: 'b', requiresArg: true }
}

return yargs('-f --bar'.split(' '))
return yargs('-f --bar')
.usage('Usage: $0 [options]', opts)
.wrap(null)
.argv
Expand Down Expand Up @@ -489,7 +489,7 @@ describe('usage tests', function () {
bar: { description: 'bar option', alias: 'b' }
}

return yargs('-f --bar 20'.split(' '))
return yargs('-f --bar 20')
.usage('Usage: $0 [options]', opts)
.requiresArg(['foo', 'bar'])
.wrap(null)
Expand All @@ -512,7 +512,7 @@ describe('usage tests', function () {

it("still requires argument if 'type' hints are given", function () {
var r = checkUsage(function () {
return yargs('--foo --bar'.split(' '))
return yargs('--foo --bar')
.requiresArg('foo')
.string('foo')
.requiresArg('bar')
Expand All @@ -533,7 +533,7 @@ describe('usage tests', function () {
bar: { demand: 'bar option', alias: 'b' }
}

return yargs('-f 10 --bar 20 --baz 30'.split(' '))
return yargs('-f 10 --bar 20 --baz 30')
.usage('Usage: $0 [options]', opts)
.strict()
.wrap(null)
Expand Down Expand Up @@ -566,7 +566,7 @@ describe('usage tests', function () {
bar: { description: 'bar option', alias: 'b' }
}

return yargs('-f 10 --bar 20 --baz 30'.split(' '))
return yargs('-f 10 --bar 20 --baz 30')
.usage('Usage: $0 [options]', opts)
.strict()
.wrap(null)
Expand Down Expand Up @@ -599,7 +599,7 @@ describe('usage tests', function () {
bar: { description: 'bar option', alias: 'b' }
}

return yargs('-f 10 --bar 20 --baz 30 -q 40'.split(' '))
return yargs('-f 10 --bar 20 --baz 30 -q 40')
.usage('Usage: $0 [options]', opts)
.strict()
.wrap(null)
Expand Down Expand Up @@ -633,7 +633,7 @@ describe('usage tests', function () {
bar: { description: 'bar option' }
}

return yargs('--foo 10 --bar 20'.split(' '))
return yargs('--foo 10 --bar 20')
.usage('Usage: $0 [options]', opts)
.strict()
.argv
Expand Down Expand Up @@ -677,7 +677,7 @@ describe('usage tests', function () {
describe('with demand option', function () {
it('should report missing required arguments', function () {
var r = checkUsage(function () {
return yargs('-y 10 -z 20'.split(' '))
return yargs('-y 10 -z 20')
.usage('Usage: $0 -x NUM [-y NUM]')
.options({
'x': { description: 'an option', demand: true },
Expand Down Expand Up @@ -706,7 +706,7 @@ describe('usage tests', function () {
describe('with required option', function () {
it('should report missing required arguments', function () {
var r = checkUsage(function () {
return yargs('-y 10 -z 20'.split(' '))
return yargs('-y 10 -z 20')
.usage('Usage: $0 -x NUM [-y NUM]')
.options({
'x': { description: 'an option', required: true },
Expand Down Expand Up @@ -734,7 +734,7 @@ describe('usage tests', function () {

it('should not report missing required arguments when given an alias', function () {
var r = checkUsage(function () {
return yargs('-w 10'.split(' '))
return yargs('-w 10')
.usage('Usage: $0 --width NUM [--height NUM]')
.options({
'width': { description: 'Width', alias: 'w', demand: true },
Expand Down

0 comments on commit afed474

Please sign in to comment.