diff --git a/orders/tests.py b/orders/tests.py index a3ea841..9998d80 100644 --- a/orders/tests.py +++ b/orders/tests.py @@ -10,11 +10,15 @@ class OrderOrderingTestCase(TestCase): def test_orders_are_split_by_shipping_method(self): #fcm, pri = Order.split_by_shipping_method() + pri=[O.id for O in Order.objects.filter(shipping_method = 'PRI')] + fcm=[O.id for O in Order.objects.filter(shipping_method = 'FCM')] self.assertEqual(results.fcm, fcm) self.assertEqual(results.pri, pri) def test_orders_are_split_by_single_and_multiple(self): #singles, multiples = Order.split_by_single_and_multiple() + singles=[O.id for O in Order.objects.all() if len(O.items.all()) == 1] + multiples=[O.id for O in Order.objects.all() if len(O.items.all()) > 1] self.assertEqual(results.singles, singles) self.assertEqual(results.multiples, multiples) @@ -24,5 +28,7 @@ def test_single_orders_are_sorted(self): def test_multiple_orders_are_split_by_xxl_and_not(self): #xxl, not_xxl = Order.orders_split_by_xxl_and_not() + xxl=[O.id for O in Order.objects.all() if len(O.items.all()) > 1 and 'XXL' in set([I.product for I in O.items.all()])] + not_xxl=[O.id for O in Order.objects.all() if len(O.items.all()) > 1 and 'XXL' not in set([I.product for I in O.items.all()])] self.assertEqual(results.xxl, xxl) - self.assertEqual(results.not_xxl, not_xxl) \ No newline at end of file + self.assertEqual(results.not_xxl, not_xxl)