Skip to content

Tests weren't working so I fixed them, and added test cases/code #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Tests weren't working so I fixed them, and added test cases/code #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9b1e1c
Updated unit tests to work with latest version of expresso
philip-peterson Apr 20, 2012
05ce2d1
Added test cases and code for 'walrus'
philip-peterson Apr 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ en.plural(/$/, "s")
.plural(/(?:([^f])fe|([lr])f)$/i, "$1$2ves")
.plural(/([^aeiouy]|qu)y$/i, "$1ies")
.plural(/(matr|vert|ind)(?:ix|ex)$/i, "$1ices")
.plural(/(walrus)$/i, "$1")
.plural(/([m|l])ouse$/i, "$1ice")
.plural(/^(ox)$/i, "$1en")
.plural(/(quiz)$/i, "$1zes");
Expand Down Expand Up @@ -65,6 +66,7 @@ en.singular(/s$/i, "")
.singular(/(cris|ax|test)es$/i, "$1is")
.singular(/(octop|vir)i$/i, "$1us")
.singular(/(alias|status)es$/i, "$1")
.singular(/(walrus)(es)?$/i, "$1")
.singular(/^(ox)en/i, "$1")
.singular(/(vert|ind)ices$/i, "$1ex")
.singular(/(matr)ices$/i, "$1ix")
Expand Down Expand Up @@ -120,6 +122,7 @@ en.uncountable('advice')
.uncountable('fish')
.uncountable('sheep')
.uncountable('moose')
.uncountable('walrus')
.uncountable('deer')
.uncountable('bison')
.uncountable('proceedings')
Expand Down
20 changes: 12 additions & 8 deletions test/inflection.en.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,31 @@ var lingo = require('./..')
, en = lingo.en;

module.exports = {
'test .name': function(assert){
'test .name': function(beforeExit, assert){
assert.equal('English', en.name);
},

'test .isUncountable()': function(assert){
'test .isUncountable()': function(beforeExit, assert){
assert.equal(true, en.isUncountable('moose'));
assert.equal(true, en.isUncountable('walrus'));
assert.equal(false, en.isUncountable('person'));
},

'test .uncountable()': function(assert){
'test .uncountable()': function(beforeExit, assert){
delete en.rules.uncountable.foobar;
assert.equal(false, en.isUncountable('foobar'));
en.uncountable('foobar');
assert.equal(true, en.isUncountable('foobar'));
},

'test .pluralNumbers()': function(assert){
'test .pluralNumbers()': function(beforeExit, assert){
delete en.rules.pluralNumbers;
assert.equal(true, en.isPlural(1));
en.pluralNumbers(/[^1]/);
assert.equal(false, en.isPlural(1));
},

'test .pluralize()': function(assert){
'test .pluralize()': function(beforeExit, assert){
assert.equal('ids', en.pluralize('id'));
assert.equal('friends', en.pluralize('friend'));
assert.equal('buses', en.pluralize('bus'));
Expand Down Expand Up @@ -64,6 +65,7 @@ module.exports = {
assert.equal('theirs', en.pluralize('its'));
assert.equal('theirs', en.pluralize('theirs'));
assert.equal('monkeys', en.pluralize('monkey'));
assert.equal('walrus', en.pluralize('walrus'));
assert.equal('keys', en.pluralize('key'));
assert.equal('dogs', en.pluralize('dog'));
assert.equal('boys', en.pluralize('boy'));
Expand All @@ -73,7 +75,7 @@ module.exports = {
assert.equal('categories', en.pluralize('category'));
},

'test .singularize()': function(assert){
'test .singularize()': function(beforeExit, assert){
assert.equal('paper', en.singularize('paper'));
assert.equal('ox', en.singularize('oxen'));
assert.equal('shoe', en.singularize('shoes'));
Expand All @@ -90,6 +92,8 @@ module.exports = {
assert.equal('kiss', en.singularize('kiss'));
assert.equal('man', en.singularize('man'));
assert.equal('monkey', en.singularize('monkeys'));
assert.equal('walrus', en.singularize('walrus'));
assert.equal('walrus', en.singularize('walruses'));
assert.equal('key', en.singularize('keys'));
assert.equal('boy', en.singularize('boys'));
assert.equal('movie', en.singularize('movies'));
Expand All @@ -99,15 +103,15 @@ module.exports = {
assert.equal('series', en.singularize('series'));
},

'test .isPlural()': function(assert){
'test .isPlural()': function(beforeExit, assert){
assert.equal(true, en.isPlural('dogs'));
assert.equal(true, en.isPlural('monkies'));
assert.equal(true, en.isPlural('foxes'));
assert.equal(false, en.isPlural('key'));
assert.equal(false, en.isPlural('fox'));
},

'test .isSingular()': function(assert){
'test .isSingular()': function(beforeExit, assert){
assert.equal(true, en.isSingular('fox'));
assert.equal(true, en.isSingular('person'));
assert.equal(true, en.isSingular('dog'));
Expand Down
12 changes: 6 additions & 6 deletions test/inflection.es.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,40 @@ var lingo = require('./..')
, es = lingo.es;

module.exports = {
'test .isUncountable()': function(assert){
'test .isUncountable()': function(beforeExit, assert) {
assert.equal(true, es.isUncountable('agua'));
assert.equal(false, es.isUncountable('arbol'));
},

'test .pluralNumbers()': function(assert){
'test .pluralNumbers()': function(beforeExit, assert) {
delete es.rules.pluralNumbers;
assert.equal(true, es.isPlural(1));
es.pluralNumbers(/[^1]/);
assert.equal(false, es.isPlural(1));
},

'test .pluralize()': function(assert){
'test .pluralize()': function(beforeExit, assert) {
assert.equal('perros', es.pluralize('perro'));
assert.equal('arboles', es.pluralize('arbol'));
assert.equal('cojones', es.pluralize('cojón'));
assert.equal('androides', es.pluralize('androide'));
},

'test .singularize()': function(assert){
'test .singularize()': function(beforeExit, assert) {
assert.equal('perro', es.singularize('perros'));
assert.equal('árbol', es.singularize('árboles'));
assert.equal('cojón', es.singularize('cojones'));
assert.equal('androide', es.singularize('androides'));
},

'test .isPlural()': function(assert){
'test .isPlural()': function(beforeExit, assert) {
assert.equal(true, es.isPlural('perros'));
assert.equal(true, es.isPlural('árboles'));
assert.equal(true, es.isPlural('cojones'));
assert.equal(true, es.isPlural('androides'));
},

'test .isSingular()': function(assert){
'test .isSingular()': function(beforeExit, assert) {
assert.equal(true, es.isSingular('perro'));
assert.equal(true, es.isSingular('árbol'));
assert.equal(true, es.isSingular('cojón'));
Expand Down
14 changes: 7 additions & 7 deletions test/lingo.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,34 @@
* Module dependencies.
*/

var lingo = require('lingo');
var lingo = require('./..');

module.exports = {
'test .version': function(assert){
'test .version': function(beforeExit, assert){
assert.match(lingo.version, /^\d+\.\d+\.\d+$/);
},

'test .capitalize()': function(assert){
'test .capitalize()': function(beforeExit, assert){
assert.equal('Hello there', lingo.capitalize('hello there'));
assert.equal('Hello There', lingo.capitalize('hello there', true));
},

'test .camelcase()': function(assert){
'test .camelcase()': function(beforeExit, assert){
assert.equal('foo', lingo.camelcase('foo'));
assert.equal('fooBar', lingo.camelcase('foo bar'));
assert.equal('fooBarBaz', lingo.camelcase('foo bar baz'));
assert.equal('base64Encode', lingo.camelcase('base -! 64 encode'));
assert.equal('UserRole', lingo.camelcase('user role', true));
},

'test .join()': function(assert){
'test .join()': function(beforeExit, assert){
assert.equal('foo', lingo.join(['foo']));
assert.equal('foo and bar', lingo.join(['foo', 'bar']));
assert.equal('foo, bar and baz', lingo.join(['foo', 'bar', 'baz']));
assert.equal('foo, bar or baz', lingo.join(['foo', 'bar', 'baz'], 'or'));
},

'test Language mapping': function(assert){
'test Language mapping': function(beforeExit, assert){
assert.equal('en', lingo.en.code);
}
}
}
8 changes: 4 additions & 4 deletions test/translation.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Module dependencies.
*/

var lingo = require('lingo')
var lingo = require('./..')
, en = lingo.en;

var fr = new lingo.Language('fr');
Expand All @@ -15,15 +15,15 @@ fr.translations = {
};

module.exports = {
'test .translate()': function(assert){
'test .translate()': function(beforeExit, assert){
assert.equal('Hello World', en.translate('Hello World'));
assert.equal('Hello TJ', en.translate('Hello {name}', { name: 'TJ' }));
assert.equal('Hello foo bar', en.translate('Hello {first} {last}', { first: 'foo', last: 'bar' }));
},

'test .translate() with translations': function(assert){
'test .translate() with translations': function(beforeExit, assert){
assert.equal('Bonjour tout le monde', fr.translate('Hello World'));
assert.equal('Bonjour TJ', fr.translate('Hello {name}', { name: 'TJ' }));
assert.equal('Bonjour foo bar', fr.translate('Hello {first} {last}', { first: 'foo', last: 'bar' }));
}
}
}