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

Fix a typo which caused a typeerror on string formatting #4274

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix a typo which caused a typeerror on string formatting #4274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bb9e3b
Fix a typo which caused a typeerror on string formatting
Thomasvdh92 Apr 11, 2024
7e7ff9b
Add unit test testing the ordersearchform description
Thomasvdh92 Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/oscar/apps/customer/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def _orders_description(self, date_from, date_to, order_number):
"%(order_number)s"
)
else:
desc = _("Orders placed between %(date_from)s and% (date_to)s")
desc = _("Orders placed between %(date_from)s and %(date_to)s")
elif date_from:
if order_number:
desc = _(
Expand Down
54 changes: 54 additions & 0 deletions tests/unit/customer/test_forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,57 @@ def test_get_filters(self):
"number__contains": "100",
},
)

def test_orders_descriptions(self):
form = OrderSearchForm(data={"date_from": "2023-01-01", "date_to": "2023-01-02", "order_number": "100"})
self.assertTrue(form.is_valid())
self.assertEqual(
form.description(),
"Orders placed between 2023-01-01 and 2023-01-02 and order number containing 100",
)

form = OrderSearchForm(data={"date_from": "2023-01-01", "date_to": "2023-01-02", "order_number": ""})
self.assertTrue(form.is_valid())
self.assertEqual(
form.description(),
"Orders placed between 2023-01-01 and 2023-01-02",
)

form = OrderSearchForm(data={"date_from": "2023-01-01", "date_to": "", "order_number": "100"})
self.assertTrue(form.is_valid())
self.assertEqual(
form.description(),
"Orders placed since 2023-01-01 and order number containing 100",
)

form = OrderSearchForm(data={"date_from": "2023-01-01", "date_to": "", "order_number": ""})
self.assertTrue(form.is_valid())
self.assertEqual(
form.description(),
"Orders placed since 2023-01-01",
)

form = OrderSearchForm(data={"date_from": "", "date_to": "2023-01-02", "order_number": "100"})
self.assertTrue(form.is_valid())
self.assertEqual(
form.description(),
"Orders placed until 2023-01-02 and order number containing 100",
)

form = OrderSearchForm(data={"date_from": "", "date_to": "2023-01-02", "order_number": ""})
self.assertTrue(form.is_valid())
self.assertEqual(
form.description(),
"Orders placed since 2023-01-02",
)

form = OrderSearchForm(data={"date_from": "", "date_to": "", "order_number": "100"})
self.assertTrue(form.is_valid())
self.assertEqual(
form.description(),
"Orders with order number containing 100",
)

form = OrderSearchForm(data={"date_from": "", "date_to": "", "order_number": ""})
self.assertTrue(form.is_valid())
self.assertIsNone(form.description())