Skip to content

Remove words, use only numbers in countdowns #807

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

Merged
monfresh merged 1 commit into from
Dec 5, 2016
Merged

Remove words, use only numbers in countdowns #807

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
12 changes: 3 additions & 9 deletions app/assets/javascripts/app/utils/ms-formatter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
function pluralize(word, count) {
return `${word}${count !== 1 ? 's' : ''}`;
}

function formatMinutes(minutes) {
Copy link
Contributor

@brendansudol brendansudol Dec 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could this be simplified to return minutes || 0;?

if (!minutes) return 0;

return `${minutes} ${pluralize('minute', minutes)}`;
return minutes || 0;
}

function formatSeconds(seconds) {
return `${seconds} ${pluralize('second', seconds)}`;
return seconds < 10 ? `0{seconds}` : seconds;
}

export default (milliseconds) => {
Expand All @@ -20,5 +14,5 @@ export default (milliseconds) => {
const displayMinutes = formatMinutes(minutes);
const displaySeconds = formatSeconds(remainingSeconds);

return `${displayMinutes} and ${displaySeconds}`;
return `${displayMinutes}:${displaySeconds}`;
};
4 changes: 2 additions & 2 deletions spec/features/users/sign_in_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
ajax_headers = { 'name' => 'X-Requested-With', 'value' => 'XMLHttpRequest' }

expect(request_headers).to include ajax_headers
expect(page).to have_content('7 minutes and 59 seconds')
expect(page).to have_content('7 minutes and 58 seconds')
expect(page).to have_content('7:59')
expect(page).to have_content('7:58')
end

scenario 'user can continue browsing' do
Expand Down