Skip to content

Commit 1f81f27

Browse files
tleguijttleguijt
committed
Testing backend: Try matching on key lookup first
1 parent 74bf102 commit 1f81f27

File tree

10 files changed

+22
-20
lines changed

10 files changed

+22
-20
lines changed

‎src/commercetools/testing/cart_discounts.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ def urls(self):
5656
return [
5757
("^$", "GET", self.query),
5858
("^$", "POST", self.create),
59-
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
6059
("^key=(?P<key>[^/]+)$", "GET", self.get_by_key),
61-
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
6260
("^key=(?P<key>[^/]+)$", "POST", self.update_by_key),
63-
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
6461
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
62+
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
63+
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
64+
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
6565
]
6666

6767
_actions = {

‎src/commercetools/testing/categories.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def urls(self):
4949
("^$", "GET", self.query),
5050
("^$", "POST", self.create),
5151
("^key=(?P<key>[^/]+)$", "GET", self.get_by_key),
52-
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
5352
("^key=(?P<key>[^/]+)$", "POST", self.update_by_key),
53+
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
5454
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
5555
]

‎src/commercetools/testing/orders.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,9 @@ def urls(self):
138138
("^$", "GET", self.query),
139139
("^$", "POST", self.create),
140140
("^key=(?P<key>[^/]+)$", "GET", self.get_by_key),
141-
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
142141
("^key=(?P<key>[^/]+)$", "POST", self.update_by_key),
142+
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
143+
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
143144
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
144145
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
145146
]

‎src/commercetools/testing/payments.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@ def urls(self):
139139
("^$", "GET", self.query),
140140
("^$", "POST", self.create),
141141
("^key=(?P<key>[^/]+)$", "GET", self.get_by_key),
142-
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
143142
("^key=(?P<key>[^/]+)$", "POST", self.update_by_key),
143+
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
144+
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
144145
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
145146
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
146147
]

‎src/commercetools/testing/product_types.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ def urls(self):
137137
("^$", "GET", self.query),
138138
("^$", "POST", self.create),
139139
("^key=(?P<key>[^/]+)$", "GET", self.get_by_key),
140-
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
141140
("^key=(?P<key>[^/]+)$", "POST", self.update_by_key),
141+
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
142+
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
142143
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
143144
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
144-
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
145145
]
146146

147147
_actions = {

‎src/commercetools/testing/products.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,11 +425,11 @@ def urls(self):
425425
("^$", "GET", self.query),
426426
("^$", "POST", self.create),
427427
("^key=(?P<key>[^/]+)$", "GET", self.get_by_key),
428-
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
429428
("^key=(?P<key>[^/]+)$", "POST", self.update_by_key),
429+
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
430+
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
430431
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
431432
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
432-
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
433433
("^(?P<id>[^/]+)\/images$", "POST", self.upload_image),
434434
]
435435

‎src/commercetools/testing/shipping_methods.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,12 @@ def urls(self):
216216
return [
217217
("^$", "GET", self.query),
218218
("^$", "POST", self.create),
219-
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
220219
("^key=(?P<key>[^/]+)$", "GET", self.get_by_key),
221-
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
222220
("^key=(?P<key>[^/]+)$", "POST", self.update_by_key),
223-
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
224221
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
222+
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
223+
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
224+
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
225225
]
226226

227227
_actions = {

‎src/commercetools/testing/stores.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ def urls(self):
108108
return [
109109
("^$", "GET", self.query),
110110
("^$", "POST", self.create),
111-
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
112-
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
113-
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
114111
("^key=(?P<key>[^/]+)$", "GET", self.get_by_key),
115112
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
116113
("^key=(?P<key>[^/]+)$", "POST", self.update_by_key),
114+
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
115+
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
116+
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
117117
]
118118

119119
_actions = {

‎src/commercetools/testing/tax_categories.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ def urls(self):
9393
("^$", "GET", self.query),
9494
("^$", "POST", self.create),
9595
("^key=(?P<key>[^/]+)$", "GET", self.get_by_key),
96-
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
9796
("^key=(?P<key>[^/]+)$", "POST", self.update_by_key),
98-
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
9997
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
98+
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
99+
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
100100
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
101101
]
102102

‎src/commercetools/testing/types.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ def urls(self):
4848
("^$", "GET", self.query),
4949
("^$", "POST", self.create),
5050
("^key=(?P<key>[^/]+)$", "GET", self.get_by_key),
51-
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
5251
("^key=(?P<key>[^/]+)$", "POST", self.update_by_key),
52+
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
53+
("^(?P<id>[^/]+)$", "GET", self.get_by_id),
5354
("^(?P<id>[^/]+)$", "POST", self.update_by_id),
5455
("^(?P<id>[^/]+)$", "DELETE", self.delete_by_id),
55-
("^key=(?P<key>[^/]+)$", "DELETE", self.delete_by_key),
5656
]
5757

5858
# Fixme: use decorator for this

0 commit comments

Comments
 (0)