mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-03-09 03:20:21 +00:00
Changes names from helpers to prevent leak between specs
This commit is contained in:
committed by
Maikel Linke
parent
bded15a869
commit
97f18d7b86
@@ -107,7 +107,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
|
||||
expect(page).to have_selector('#tax-row', text: with_currency(1.15))
|
||||
|
||||
# DB checks
|
||||
assert_db_tax
|
||||
assert_db_tax_incl
|
||||
end
|
||||
|
||||
after { logout }
|
||||
@@ -137,7 +137,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
|
||||
expect(page).to have_selector('#tax-row', text: with_currency(1.15))
|
||||
|
||||
# DB checks
|
||||
assert_db_tax
|
||||
assert_db_tax_incl
|
||||
end
|
||||
|
||||
after { logout }
|
||||
@@ -169,7 +169,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
|
||||
expect(page).not_to have_content("includes tax")
|
||||
|
||||
# DB checks
|
||||
assert_db_no_tax
|
||||
assert_db_no_tax_incl
|
||||
end
|
||||
|
||||
after { logout }
|
||||
@@ -202,7 +202,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
|
||||
expect(page).not_to have_content("includes tax")
|
||||
|
||||
# DB checks
|
||||
assert_db_no_tax
|
||||
assert_db_no_tax_incl
|
||||
end
|
||||
|
||||
after { logout }
|
||||
@@ -213,13 +213,13 @@ end
|
||||
|
||||
private
|
||||
|
||||
def assert_db_tax
|
||||
def assert_db_tax_incl
|
||||
order_within_zone.reload
|
||||
expect(order_within_zone.included_tax_total).to eq(1.15)
|
||||
expect(order_within_zone.additional_tax_total).to eq(0.0)
|
||||
end
|
||||
|
||||
def assert_db_no_tax
|
||||
def assert_db_no_tax_incl
|
||||
order_outside_zone.reload
|
||||
expect(order_outside_zone.included_tax_total).to eq(0.0)
|
||||
expect(order_outside_zone.additional_tax_total).to eq(0.0)
|
||||
|
||||
@@ -109,7 +109,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
|
||||
click_on "Place order now"
|
||||
|
||||
# DB checks
|
||||
assert_db_tax
|
||||
assert_db_tax_added
|
||||
|
||||
# UI checks
|
||||
expect(page).to have_selector('#order_total', text: with_currency(11.30))
|
||||
@@ -138,13 +138,15 @@ describe "As a consumer, I want to see adjustment breakdown" do
|
||||
click_on "Complete order"
|
||||
|
||||
# DB checks
|
||||
assert_db_tax
|
||||
assert_db_tax_added
|
||||
|
||||
# UI checks
|
||||
expect(page).to have_content("Confirmed")
|
||||
expect(page).to have_selector('#order_total', text: with_currency(11.30))
|
||||
expect(page).to have_selector('#tax-row', text: with_currency(1.30))
|
||||
end
|
||||
|
||||
after { logout }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -168,7 +170,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
|
||||
click_on "Place order now"
|
||||
|
||||
# DB checks
|
||||
assert_db_no_tax
|
||||
assert_db_no_tax_added
|
||||
|
||||
# UI checks
|
||||
expect(page).to have_content("Confirmed")
|
||||
@@ -198,7 +200,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
|
||||
click_on "Complete order"
|
||||
|
||||
# DB checks
|
||||
assert_db_no_tax
|
||||
assert_db_no_tax_added
|
||||
|
||||
# UI checks
|
||||
expect(page).to have_content("Confirmed")
|
||||
@@ -242,13 +244,15 @@ describe "As a consumer, I want to see adjustment breakdown" do
|
||||
click_on "Complete order"
|
||||
|
||||
# DB checks
|
||||
assert_db_tax
|
||||
assert_db_tax_added
|
||||
|
||||
# UI checks - Order confirmation page should reflect changes
|
||||
expect(page).to have_content("Confirmed")
|
||||
expect(page).to have_selector('#order_total', text: with_currency(11.30))
|
||||
expect(page).to have_selector('#tax-row', text: with_currency(1.30))
|
||||
end
|
||||
|
||||
after { logout }
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -257,13 +261,13 @@ end
|
||||
|
||||
private
|
||||
|
||||
def assert_db_tax
|
||||
def assert_db_tax_added
|
||||
order_within_zone.reload
|
||||
expect(order_outside_zone.included_tax_total).to eq(0.0)
|
||||
expect(order_within_zone.additional_tax_total).to eq(1.3)
|
||||
end
|
||||
|
||||
def assert_db_no_tax
|
||||
def assert_db_no_tax_added
|
||||
order_outside_zone.reload
|
||||
expect(order_outside_zone.included_tax_total).to eq(0.0)
|
||||
expect(order_outside_zone.additional_tax_total).to eq(0.0)
|
||||
|
||||
Reference in New Issue
Block a user