entrouvert
/
lingo
15
0
Fork 0
Code Issues Pull Requests 8 Releases Wiki Activity

misc: remove django2 compat in tests (#89605)

This commit is contained in:
Lauréline Guérin 2024-04-17 15:23:03 +02:00
parent 4615f17360
commit 736136afd0
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
1 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/pricing/manager/test_pricing.py
View File

@ -1256,31 +1256,17 @@ def test_detail_pricing_test_tool_for_event(mock_pricing_data_event, mock_event,
)
]
# XXX Compat: html entities are slightly different under django 2 and django 3
# the following code ensure tests pass under both versions.
# The output looks exactly the same to an end user.
assert '<p>Pricing: 42.00</p>' in resp
django2_match = (
'<pre>{&#39;foo&#39;: &#39;bar&#39;, &#39;pricing&#39;: Decimal(&#39;42&#39;)}</pre>' in resp
)
django3_match = (
assert (
'<pre>{&#x27;foo&#x27;: &#x27;bar&#x27;, &#x27;pricing&#x27;: Decimal(&#x27;42&#x27;)}</pre>' in resp
)
assert django2_match or django3_match
mock_pricing_data_event.side_effect = PricingError(details={'foo': 'error'})
resp = resp.form.submit().follow()
assert 'Computed pricing data' in resp
django2_match = '&#39;error&#39;: &lt;class &#39;lingo.pricing.models.PricingError&#39;&gt;' in resp
django3_match = '&#x27;error&#x27;: &lt;class &#x27;lingo.pricing.models.PricingError&#x27;&gt;' in resp
assert django2_match or django3_match
django2_match = '&#39;error_details&#39;: {&#39;foo&#39;: &#39;error&#39;}' in resp
django3_match = '&#x27;error_details&#x27;: {&#x27;foo&#x27;: &#x27;error&#x27;}' in resp
assert django2_match or django3_match
assert '&#x27;error&#x27;: &lt;class &#x27;lingo.pricing.models.PricingError&#x27;&gt;' in resp
assert '&#x27;error_details&#x27;: {&#x27;foo&#x27;: &#x27;error&#x27;}' in resp
# check recurring event
mock_pricing_data_event.reset_mock()
@ -1432,28 +1418,16 @@ def test_detail_pricing_test_tool_for_flat_fee_schedule(mock_pricing_data, app,
)
]
assert '<p>Pricing: 42.00</p>' in resp
django2_match = (
'<pre>{&#39;foo&#39;: &#39;bar&#39;, &#39;pricing&#39;: Decimal(&#39;42&#39;)}</pre>' in resp
)
django3_match = (
assert (
'<pre>{&#x27;foo&#x27;: &#x27;bar&#x27;, &#x27;pricing&#x27;: Decimal(&#x27;42&#x27;)}</pre>' in resp
)
assert django2_match or django3_match
mock_pricing_data.side_effect = PricingError(details={'foo': 'error'})
resp = resp.form.submit().follow()
assert 'Computed pricing data' in resp
django2_match = '&#39;error&#39;: &lt;class &#39;lingo.pricing.models.PricingError&#39;&gt;' in resp
django3_match = '&#x27;error&#x27;: &lt;class &#x27;lingo.pricing.models.PricingError&#x27;&gt;' in resp
assert django2_match or django3_match
django2_match = '&#39;error_details&#39;: {&#39;foo&#39;: &#39;error&#39;}' in resp
django3_match = '&#x27;error_details&#x27;: {&#x27;foo&#x27;: &#x27;error&#x27;}' in resp
assert django2_match or django3_match
assert '&#x27;error&#x27;: &lt;class &#x27;lingo.pricing.models.PricingError&#x27;&gt;' in resp
assert '&#x27;error_details&#x27;: {&#x27;foo&#x27;: &#x27;error&#x27;}' in resp
billing_date1 = pricing.billingdates.create(
date_start=datetime.date(2021, 9, 1),