atomaka/budget
1
0
Fork 0
Code Issues 1 Pull requests Activity Actions

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/credit_card_bills/show.html.erb
View file

@ -6,10 +6,10 @@
<%= render @credit_card_bill %> <%= 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"> <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> </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>
</div> </div>

4
test/fixtures/members.yml vendored
View file

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

0
test/system/extra_bills_test.rb → test/system/credit_card_bills_test.rb
View file

4
test/system/expenses_test.rb
View file

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

4
test/system/incomes_test.rb
View file

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