Skip to content
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

Jump to bottom

4635: Comment is missing from purchase details #4642

Merged
merged 6 commits into from
Sep 16, 2024
Merged

4635: Comment is missing from purchase details #4642

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f96571
chore(model/purchase): add comment_view
victorhwmn Sep 6, 2024
1731bfe
feat(view/purchases/show): show comment on purchase details
victorhwmn Sep 6, 2024
803a9dd
chore(model/purchase): remove comment_view
victorhwmn Sep 12, 2024
834f25f
fix(purchases/show): indent html
victorhwmn Sep 12, 2024
83ee754
chore(purchases_requests_rspec): use expected value on test
victorhwmn Sep 12, 2024
1364f82
fix(purchases_requests_rspec): use freeze_time on show purchase info …
victorhwmn Sep 14, 2024
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
23 changes: 17 additions & 6 deletions app/views/purchases/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,28 @@
<div class="card-body p-0">
<table class="table">
<thead>
<tr>
<th>Date of Purchase:</th>
<th>Vendor:</th>
<th>Storage Location:</th>
</tr>
</thead>
<tbody>
<tr>
<th>Date of Purchase:</th>
<th>Vendor:</th>
<th>Storage Location:</th>
<td><%= @purchase.issued_at.to_fs(:distribution_date) %> (entered: <%= @purchase.created_at.to_fs(:distribution_date) %>)</td>
<td><%= @purchase.purchased_from_view %></td>
<td><%= @purchase.storage_view %></td>
</tr>
</table>
<table class="table">
<thead>
<tr>
<th>Comment:</th>
</tr>
</thead>
<tbody>
<tr>
<td><%= @purchase.issued_at.to_fs(:distribution_date) %> (entered: <%= @purchase.created_at.to_fs(:distribution_date) %>)</td>
<td><%= @purchase.purchased_from_view %></td>
<td><%= @purchase.storage_view %></td>
<td><%= @purchase.comment || '' %></td>
</tr>
</table>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you fix up the spacing here? Nested elements like tr and td should be indented more than the parent.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fixed here 834f25f
I also fixed the indentation of the tr and td tags from the table above

</div>
Expand Down
14 changes: 13 additions & 1 deletion spec/requests/purchases_requests_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,19 @@

describe "GET #show" do
let(:item) { create(:item) }
let!(:purchase) { create(:purchase, :with_items, item: item) }
let(:storage_location) { create(:storage_location, organization: organization, name: 'Some Storage') }
let(:vendor) { create(:vendor, organization: organization, business_name: 'Another Business') }
let!(:purchase) { create(:purchase, :with_items, comment: 'Fine day for diapers, it is.', created_at: 1.month.ago, issued_at: 1.day.ago, item: item, storage_location: storage_location, vendor: vendor) }

it "shows the purchase info" do
date_of_purchase = "#{1.day.ago.to_fs(:distribution_date)} (entered: #{1.month.ago.to_fs(:distribution_date)})"
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think you might have to use the freeze_time helper here, and use let instead of let! so that the correct dates get set. Otherwise you might get flakiness here with times being off by part of a second.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fixed here 1364f82


get purchase_path(id: purchase.id)
expect(response.body).to include(date_of_purchase)
expect(response.body).to include('Another Business')
expect(response.body).to include('Some Storage')
expect(response.body).to include('Fine day for diapers, it is.')
end

it "shows an enabled edit button" do
get purchase_path(id: purchase.id)
Expand Down