Skip to content

null issue with truncateWords fixes #84, added tests #89

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
blakeyc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

null issue with truncateWords fixes #84, added tests #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion __tests__/humanize.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,19 @@ describe('Truncating objects to shorter versions', () => {
const objs = {
str: 'abcdefghijklmnopqrstuvwxyz',
num: 1234567890,
arr: [1, 2, 3, 4, 5]
arr: [1, 2, 3, 4, 5],
wrd: 'hello world'
};

it('should truncate a long string with ellipsis', () => {
expect(Humanize.truncate(objs.str, 14)).toEqual('abcdefghijk...');
expect(Humanize.truncate(objs.str, 14, '...kidding')).toEqual('abcd...kidding');
});

it('should truncate a string of words with ellipsis', () => {
expect(Humanize.truncateWords(objs.wrd, 1)).toEqual('hello ...');
});

it('should truncate a number to an upper bound', () => {
expect(Humanize.truncatenumber(objs.num, 500)).toEqual('500+');
expect(Humanize.boundedNumber(objs.num, 500)).toEqual('500+');
Expand All @@ -210,6 +215,7 @@ describe('Truncating objects to shorter versions', () => {
expect(Humanize.truncate(objs.str, objs.str.length + 1)).toEqual(objs.str);
expect(Humanize.truncatenumber(objs.num, objs.num + 1)).toEqual(String(objs.num));
expect(Humanize.boundedNumber(objs.num, objs.num + 1)).toEqual(String(objs.num));
expect(Humanize.truncateWords(objs.wrd, 3)).toEqual('hello world');
});
});

Expand Down
20 changes: 9 additions & 11 deletions src/humanize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,21 +287,19 @@
// Truncates a string after a certain number of words.
truncateWords(string, length) {
const array = string.split(' ');
let result = '';
let i = 0;

while (i < length) {
if (exists(array[i])) {
result += `${array[i]} `;
}
i++;
}

if (array.length > length) {
let result = '';
let i = 0;
while (i < length) {
if (exists(array[i])) {
result += `${array[i]} `;
}
i++;
}
return `${result}...`;
}

return null;
return string;
},

truncatewords(...args) {
Expand Down