Skip to content

Commit

Permalink
Merge branch 'master' into validate-months-based-on-year
Browse files Browse the repository at this point in the history
Conflicts:
	test/unit/expiration-year.js
  • Loading branch information
kyledetella committed Jun 22, 2015
2 parents 4593b30 + 418c646 commit e445324
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/unit/expiration-year.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('expirationYear', function () {
['20015', FALSE_VALIDATION]
],

'returns null for incomplete strings': [
'returns the appropriate values for incomplete strings': [
['', {isValid: false, isPotentiallyValid: true, isCurrentYear: false}],
['2', {isValid: false, isPotentiallyValid: true, isCurrentYear: false}],
['9', {isValid: false, isPotentiallyValid: true, isCurrentYear: false}],
Expand Down

0 comments on commit e445324

Please sign in to comment.