浏览代码

Fix issues in tests

master
Maik Hoepfel 12 年前
父节点
当前提交
a4f3a45f73
共有 2 个文件被更改,包括 8 次插入5 次删除
  1. 6
    4
      tests/functional/dashboard/catalogue_tests.py
  2. 2
    1
      tests/functional/dashboard/order_tests.py

+ 6
- 4
tests/functional/dashboard/catalogue_tests.py 查看文件

@@ -56,8 +56,10 @@ class TestAStaffUser(WebTestCase):
56 56
         form['upc'] = '123456'
57 57
         form['title'] = 'new product'
58 58
         form['productcategory_set-0-category'] = category.id
59
-        form['partner'] = self.partner.id
60
-        form['partner_sku'] = '14'
59
+        form['stockrecords-0-partner'] = self.partner.id
60
+        form['stockrecords-0-partner_sku'] = '14'
61
+        form['stockrecords-0-num_in_stock'] = '555'
62
+        form['stockrecords-0-price_excl_tax'] = '13.99'
61 63
         page = form.submit('action', index=0)
62 64
 
63 65
         self.assertEquals(Product.objects.count(), 1)
@@ -163,8 +165,8 @@ class TestANonStaffUser(TestAStaffUser):
163 165
         self.partner.users.add(self.user)
164 166
 
165 167
     def test_can_list_her_products(self):
166
-        product1 = create_product(partner_users=[self.user, ])
167
-        product2 = create_product(partner="sneaky", partner_users=[])
168
+        product1 = create_product(partner="A", partner_users=[self.user, ])
169
+        product2 = create_product(partner="B", partner_users=[])
168 170
         page = self.get(reverse('dashboard:catalogue-product-list'))
169 171
         assert product1 in page.context['object_list']
170 172
         assert product2 not in page.context['object_list']

+ 2
- 1
tests/functional/dashboard/order_tests.py 查看文件

@@ -8,7 +8,7 @@ from django_dynamic_fixture import get, G
8 8
 
9 9
 from oscar.test.testcases import ClientTestCase, WebTestCase
10 10
 from oscar.test.factories import create_order, create_product
11
-from oscar.apps.order.models import Order, OrderNote, ShippingAddress
11
+from oscar.apps.order.models import Order, OrderNote
12 12
 from oscar.core.compat import get_user_model
13 13
 
14 14
 
@@ -17,6 +17,7 @@ Basket = get_model('basket', 'Basket')
17 17
 Partner = get_model('partner', 'Partner')
18 18
 ShippingAddress = get_model('order', 'ShippingAddress')
19 19
 
20
+
20 21
 class TestOrderListDashboard(WebTestCase):
21 22
     is_staff = True
22 23
 

正在加载...
取消
保存