Merge branch 'main' into ruby-3.2.2
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing

This commit is contained in:
Andrew Tomaka 2023-07-10 23:10:23 -04:00
commit 699d241517
Signed by: atomaka
GPG key ID: 61209BF70A5B18BE
5 changed files with 9 additions and 9 deletions

View file

@ -6,10 +6,10 @@
<%= render @credit_card_bill %>
<%= link_to 'Edit this credit_card_bill', edit_credit_card_bill_path(@credit_card_bill), class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
<%= link_to 'Edit this credit card bill', edit_credit_card_bill_path(@credit_card_bill), class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
<div class="inline-block ml-2">
<%= button_to 'Destroy this credit_card_bill', credit_card_bill_path(@credit_card_bill), method: :delete, class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 font-medium" %>
<%= button_to 'Destroy this credit card bill', credit_card_bill_path(@credit_card_bill), method: :delete, class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 font-medium" %>
</div>
<%= link_to 'Back to credit_card_bills', credit_card_bills_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
<%= link_to 'Back to credit card bills', credit_card_bills_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
</div>
</div>

View file

@ -1,9 +1,9 @@
# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
one:
name: MyString
name: Member One
pays: false
two:
name: MyString
name: Member Two
pays: false

View file

@ -18,7 +18,7 @@ class ExpensesTest < ApplicationSystemTestCase
fill_in "Description", with: @expense.description
check "Estimated" if @expense.estimated
fill_in "Payment", with: @expense.payment
fill_in "Period", with: @expense.period
select @expense.period.capitalize, from: "Period"
click_on "Create Expense"
assert_text "Expense was successfully created"
@ -33,7 +33,7 @@ class ExpensesTest < ApplicationSystemTestCase
fill_in "Description", with: @expense.description
check "Estimated" if @expense.estimated
fill_in "Payment", with: @expense.payment
fill_in "Period", with: @expense.period
select @expense.period.capitalize, from: "Period"
click_on "Update Expense"
assert_text "Expense was successfully updated"

View file

@ -17,7 +17,7 @@ class IncomesTest < ApplicationSystemTestCase
fill_in "Amount", with: @income.amount
fill_in "Description", with: @income.description
check "Included" if @income.included
fill_in "Member", with: @income.member_id
select @income.member.name, from: "Member"
click_on "Create Income"
assert_text "Income was successfully created"
@ -31,7 +31,7 @@ class IncomesTest < ApplicationSystemTestCase
fill_in "Amount", with: @income.amount
fill_in "Description", with: @income.description
check "Included" if @income.included
fill_in "Member", with: @income.member_id
select @income.member.name, from: "Member"
click_on "Update Income"
assert_text "Income was successfully updated"