瀏覽代碼

Consolidate `oscar.test.factories` imports in the test modules

master
Michael van Tellingen 10 年之前
父節點
當前提交
174d4dcd67

+ 5
- 5
tests/functional/checkout/customer_checkout_tests.py 查看文件

4
 
4
 
5
 from oscar.core.loading import get_model, get_class
5
 from oscar.core.loading import get_model, get_class
6
 from oscar.test import factories
6
 from oscar.test import factories
7
-from oscar.test.factories import UserAddressFactory
8
 from oscar.test.testcases import WebTestCase
7
 from oscar.test.testcases import WebTestCase
9
 from . import CheckoutMixin
8
 from . import CheckoutMixin
10
 
9
 
34
 
33
 
35
     def setUp(self):
34
     def setUp(self):
36
         super(TestShippingAddressView, self).setUp()
35
         super(TestShippingAddressView, self).setUp()
37
-        self.user_address = UserAddressFactory(
36
+        self.user_address = factories.UserAddressFactory(
38
             user=self.user, country=self.create_shipping_country())
37
             user=self.user, country=self.create_shipping_country())
39
 
38
 
40
     def test_requires_login(self):
39
     def test_requires_login(self):
65
         not_shipping_country = factories.CountryFactory(
64
         not_shipping_country = factories.CountryFactory(
66
             iso_3166_1_a2='US', name="UNITED STATES",
65
             iso_3166_1_a2='US', name="UNITED STATES",
67
             is_shipping_country=False)
66
             is_shipping_country=False)
68
-        not_shipping_address = UserAddressFactory(
67
+        not_shipping_address = factories.UserAddressFactory(
69
             user=self.user, country=not_shipping_country, line4='New York')
68
             user=self.user, country=not_shipping_country, line4='New York')
70
         self.add_product_to_basket()
69
         self.add_product_to_basket()
71
         page = self.get(reverse('checkout:shipping-address'))
70
         page = self.get(reverse('checkout:shipping-address'))
87
     def setUp(self):
86
     def setUp(self):
88
         country = self.create_shipping_country()
87
         country = self.create_shipping_country()
89
         super(TestUserAddressUpdateView, self).setUp()
88
         super(TestUserAddressUpdateView, self).setUp()
90
-        self.user_address = UserAddressFactory(user=self.user, country=country)
89
+        self.user_address = factories.UserAddressFactory(
90
+            user=self.user, country=country)
91
 
91
 
92
     def test_requires_login(self):
92
     def test_requires_login(self):
93
         response = self.get(
93
         response = self.get(
128
     def setUp(self):
128
     def setUp(self):
129
         super(TestDeleteUserAddressView, self).setUp()
129
         super(TestDeleteUserAddressView, self).setUp()
130
         self.country = self.create_shipping_country()
130
         self.country = self.create_shipping_country()
131
-        self.user_address = UserAddressFactory(
131
+        self.user_address = factories.UserAddressFactory(
132
             user=self.user, country=self.country)
132
             user=self.user, country=self.country)
133
 
133
 
134
     def test_requires_login(self):
134
     def test_requires_login(self):

+ 1
- 2
tests/integration/catalogue/reviews/form_tests.py 查看文件

1
 from django.test import TestCase
1
 from django.test import TestCase
2
 
2
 
3
 from oscar.apps.catalogue.reviews import forms
3
 from oscar.apps.catalogue.reviews import forms
4
-from oscar.test.factories import create_product
5
-from oscar.test.factories import UserFactory
4
+from oscar.test.factories import create_product, UserFactory
6
 
5
 
7
 
6
 
8
 class TestReviewForm(TestCase):
7
 class TestReviewForm(TestCase):

+ 5
- 4
tests/integration/offer/applicator_tests.py 查看文件

5
 
5
 
6
 from oscar.apps.offer import models
6
 from oscar.apps.offer import models
7
 from oscar.apps.offer.utils import Applicator
7
 from oscar.apps.offer.utils import Applicator
8
-from oscar.test import factories
9
-from oscar.test.basket import add_product
10
 from oscar.test.factories import (
8
 from oscar.test.factories import (
11
-    BenefitFactory, ConditionalOfferFactory, ConditionFactory, RangeFactory)
9
+    BasketFactory, RangeFactory, BenefitFactory, ConditionFactory,
10
+    ConditionalOfferFactory)
11
+
12
+from oscar.test.basket import add_product
12
 
13
 
13
 
14
 
14
 class TestOfferApplicator(TestCase):
15
 class TestOfferApplicator(TestCase):
15
 
16
 
16
     def setUp(self):
17
     def setUp(self):
17
         self.applicator = Applicator()
18
         self.applicator = Applicator()
18
-        self.basket = factories.create_basket(empty=True)
19
+        self.basket = BasketFactory()
19
         rng = RangeFactory(includes_all_products=True)
20
         rng = RangeFactory(includes_all_products=True)
20
         self.condition = ConditionFactory(
21
         self.condition = ConditionFactory(
21
             range=rng, type=ConditionFactory._meta.model.VALUE,
22
             range=rng, type=ConditionFactory._meta.model.VALUE,

+ 2
- 2
tests/integration/offer/availability_tests.py 查看文件

1
 from django.test import TestCase
1
 from django.test import TestCase
2
 
2
 
3
 from oscar.apps.offer import models
3
 from oscar.apps.offer import models
4
-from oscar.test.factories import create_order
5
-from oscar.test.factories import OrderDiscountFactory, UserFactory
4
+from oscar.test.factories import (
5
+    create_order, OrderDiscountFactory, UserFactory)
6
 
6
 
7
 
7
 
8
 class TestAPerUserConditionalOffer(TestCase):
8
 class TestAPerUserConditionalOffer(TestCase):

+ 1
- 2
tests/integration/order/model_tests.py 查看文件

13
     OrderNote, OrderDiscount)
13
     OrderNote, OrderDiscount)
14
 from oscar.test.basket import add_product
14
 from oscar.test.basket import add_product
15
 from oscar.test.factories import (
15
 from oscar.test.factories import (
16
-    create_order, create_offer, create_voucher, create_basket)
17
-from oscar.test.factories import (
16
+    create_order, create_offer, create_voucher, create_basket,
18
     OrderFactory, OrderLineFactory, ShippingAddressFactory,
17
     OrderFactory, OrderLineFactory, ShippingAddressFactory,
19
     ShippingEventFactory)
18
     ShippingEventFactory)
20
 
19
 

+ 1
- 2
tests/integration/payment/model_tests.py 查看文件

5
 
5
 
6
 from oscar.apps.payment.models import Bankcard
6
 from oscar.apps.payment.models import Bankcard
7
 from oscar.test import factories
7
 from oscar.test import factories
8
-from oscar.test.factories import SourceFactory
9
 
8
 
10
 
9
 
11
 class TestAPaymentSource(TestCase):
10
 class TestAPaymentSource(TestCase):
12
 
11
 
13
     def setUp(self):
12
     def setUp(self):
14
         order = factories.create_order()
13
         order = factories.create_order()
15
-        self.source = SourceFactory(order=order)
14
+        self.source = factories.SourceFactory(order=order)
16
 
15
 
17
     def test_allocation_doesnt_error(self):
16
     def test_allocation_doesnt_error(self):
18
         self.source.allocate(D('100.00'))
17
         self.source.allocate(D('100.00'))

Loading…
取消
儲存