-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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.
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
UI: rearrange logic for adding timezone in date-format helper #26693
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
c42ae8e
rearrange logic for timezone
hellobontempo 5eac5e3
pull into separate function for test purposes
hellobontempo f8a7ae1
add changelog
hellobontempo ba6f982
add assert that zone is not undefined
hellobontempo 5871541
whoops forgot space
hellobontempo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
```release-note:bug | ||
ui: Remove possibility of returning an undefined timezone from date-format helper | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,7 @@ import { module, test } from 'qunit'; | |
import { setupRenderingTest } from 'ember-qunit'; | ||
import { find, render, settled } from '@ember/test-helpers'; | ||
import hbs from 'htmlbars-inline-precompile'; | ||
import { formatTimeZone } from 'core/helpers/date-format'; | ||
|
||
const TEST_DATE = new Date('2018-04-03T14:15:30'); | ||
|
||
|
@@ -68,4 +69,21 @@ module('Integration | Helper | date-format', function (hooks) { | |
await settled(); | ||
assert.dom(this.element).hasText('', 'renders empty string when falsey'); | ||
}); | ||
|
||
test('it formats timezone', async function (assert) { | ||
assert.strictEqual(formatTimeZone('not a date'), '', 'returns an empty string for a non-date value'); | ||
|
||
// compute expected because we can't reliably assume timezone of the test suite | ||
const expected = new Intl.DateTimeFormat('en', { timeZoneName: 'shortOffset' }) | ||
.format(TEST_DATE) | ||
.split(',')[1]; | ||
|
||
const formatted = formatTimeZone(TEST_DATE); | ||
|
||
assert.strictEqual( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe we add one more assertion, since the expected value is computed, that makes sure the zone is NOT There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah! Good call ⚡ |
||
formatted, | ||
expected, | ||
`formatted timezone: "${formatted}" equals expected: "${expected}"` | ||
); | ||
}); | ||
}); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed the space here so if
toLocaleTimeString
doesn't error but returnsundefined
again in the future for some reason,zone
will be falsey