196 round json format #203
Merged
Conversation
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
Extracted into a seprate WithAttributes module. This helper could be useful in other test where we want to make sure that rounding works as expected. In a following commit I will make use of it to make sure JSON formatted output is rounded correctly.
This commit fixes: samg#196 Instead of outputting raw data to JSON we make use of model provided values for end and start time. This is convenient since the model already outputs end and start time as rounded when the `-r` attribute is set.
fbuys
commented
Sep 2, 2021
|
|
||
| e.values.inject({}) do |h, (k,v)| | ||
| h[k] = v | ||
| h[k] = e.public_send(k) if %i[end start].include?(k) |
There was a problem hiding this comment.
🥦 - Only start and end keys are forwarded onto the model.
| @@ -33,8 +33,22 @@ def with_stubbed_config options = {} | |||
| end | |||
| end | |||
|
|
|||
| module Timetrap::WithAttributes | |||
| def with_rounding_on | |||
There was a problem hiding this comment.
🥦 Extracted helper for other cases where we might want to test attributes and have them reverted/reset after the test.
| @@ -740,17 +754,29 @@ def output | |||
|
|
|||
| describe 'json' do | |||
| before do | |||
| create_entry(:start => local_time_cli('2008-10-03 12:00:00'), :end => local_time_cli('2008-10-03 14:00:00')) | |||
| create_entry(:start => local_time_cli('2008-10-03 12:07:00'), :end => local_time_cli('2008-10-03 14:08:00')) | |||
There was a problem hiding this comment.
🥦 Rounding defaults to 900s (15min), so 7min goes to 0 and 8min goes to 15.
| create_entry(:start => local_time_cli('2008-10-05 12:00:00'), :end => local_time_cli('2008-10-05 14:00:00')) | ||
| end | ||
|
|
||
| it "should export to json not including running items" do | ||
| invoke 'in' | ||
| invoke 'display -f json' | ||
| expect(JSON.parse($stdout.string)).to eq JSON.parse(<<-EOF) | ||
| [{\"sheet\":\"default\",\"end\":\"#{local_time('2008-10-03 14:00:00')}\",\"start\":\"#{local_time('2008-10-03 12:00:00')}\",\"note\":\"note\",\"id\":1},{\"sheet\":\"default\",\"end\":\"#{local_time('2008-10-05 14:00:00')}\",\"start\":\"#{local_time('2008-10-05 12:00:00')}\",\"note\":\"note\",\"id\":2}] | ||
| [{\"sheet\":\"default\",\"end\":\"#{local_time('2008-10-03 14:08:00')}\",\"start\":\"#{local_time('2008-10-03 12:07:00')}\",\"note\":\"note\",\"id\":1},{\"sheet\":\"default\",\"end\":\"#{local_time('2008-10-05 14:00:00')}\",\"start\":\"#{local_time('2008-10-05 12:00:00')}\",\"note\":\"note\",\"id\":2}] |
| # rounds to 900s by default | ||
| invoke 'display -r -f json' | ||
| expect(JSON.parse($stdout.string)).to eq JSON.parse(<<~EOF) | ||
| [{\"sheet\":\"default\",\"end\":\"#{local_time('2008-10-03 14:15:00')}\",\"start\":\"#{local_time('2008-10-03 12:00:00')}\",\"note\":\"note\",\"id\":1},{\"sheet\":\"default\",\"end\":\"#{local_time('2008-10-05 14:00:00')}\",\"start\":\"#{local_time('2008-10-05 12:00:00')}\",\"note\":\"note\",\"id\":2}] |
There was a problem hiding this comment.
🥦 Uses default rounding (15min), so 7min goes to 0 and 8min goes to 15.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What
Notes
✅ Tests added.
Instead of outputting raw data to JSON we make use of model provided values for end and start time.