Skip to content

Commit 7311dbd

Browse files
paru-odoomsh-odoo
authored andcommitted
[IMP] website_sale_loyalty: Adapt tours
adapt shop_sale_loyalty tour adapt shop_sale_gift_card tour adapt shop_sale_ewallet tour adapt apply_discount_code_program_multi_rewards tour adapt shop_sale_loyalty_delivery tour adapt check_shipping_discount tour adapt update_shipping_after_discount tour
1 parent e044604 commit 7311dbd

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

addons/website_sale_loyalty/tests/test_shop_sale_coupon.py

-8
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ def setUpClass(cls):
3636
cls.env.ref('website.default_website').company_id = cls.env.company
3737
cls.public_category = cls.env['product.public.category'].create({'name': 'Public Category'})
3838

39-
# TODO master-mysterious-egg fix error
40-
@unittest.skip("prepare mysterious-egg for merging")
4139
def test_01_admin_shop_sale_loyalty_tour(self):
4240
if self.env['ir.module.module']._get('payment_custom').state != 'installed':
4341
self.skipTest("Transfer provider is not installed")
@@ -142,8 +140,6 @@ def test_01_admin_shop_sale_loyalty_tour(self):
142140
self.env.ref("website_sale.reduction_code").write({"active": True})
143141
self.start_tour("/", 'shop_sale_loyalty', login="admin")
144142

145-
# TODO master-mysterious-egg fix error
146-
@unittest.skip("prepare mysterious-egg for merging")
147143
def test_02_admin_shop_gift_card_tour(self):
148144
gift_card = self.env['product.product'].create({
149145
'name': 'TEST - Gift Card',
@@ -216,8 +212,6 @@ def test_02_admin_shop_gift_card_tour(self):
216212
self.assertEqual(len(gift_card_program.coupon_ids), 2, 'There should be two coupons, one with points, one without')
217213
self.assertEqual(len(gift_card_program.coupon_ids.filtered('points')), 1, 'There should be two coupons, one with points, one without')
218214

219-
# TODO master-mysterious-egg fix error
220-
@unittest.skip("prepare mysterious-egg for merging")
221215
def test_03_admin_shop_ewallet_tour(self):
222216
self.env['product.product'].create({
223217
'name': "TEST - Gift Card",
@@ -332,8 +326,6 @@ def test_01_gc_coupon(self):
332326

333327
self.assertEqual(len(order.applied_coupon_ids), 0, "The coupon should've been removed from the order as more than 4 days")
334328

335-
# TODO master-mysterious-egg fix error
336-
@unittest.skip("prepare mysterious-egg for merging")
337329
def test_02_apply_discount_code_program_multi_rewards(self):
338330
"""
339331
Check the triggering of a promotion program based on a promo code with multiple rewards

addons/website_sale_loyalty/tests/test_website_sale_loyalty_delivery.py

-6
Original file line numberDiff line numberDiff line change
@@ -132,16 +132,12 @@ def setUpClass(cls):
132132
'product_id': delivery_product2.id,
133133
}])
134134

135-
# TODO master-mysterious-egg fix error
136-
@unittest.skip("prepare mysterious-egg for merging")
137135
def test_shop_sale_gift_card_keep_delivery(self):
138136
# Get admin user and set his preferred shipping method to normal delivery
139137
# This test also tests that we can indeed pay delivery fees with gift cards/ewallet
140138
self.partner_admin.property_delivery_carrier_id = self.normal_delivery
141139
self.start_tour("/", 'shop_sale_loyalty_delivery', login='admin')
142140

143-
# TODO master-mysterious-egg fix error
144-
@unittest.skip("prepare mysterious-egg for merging")
145141
def test_shipping_discount(self):
146142
"""
147143
Check display of shipping discount promotion on checkout,
@@ -162,8 +158,6 @@ def test_shipping_discount(self):
162158
})
163159
self.start_tour("/", 'check_shipping_discount', login="admin")
164160

165-
# TODO master-mysterious-egg fix error
166-
@unittest.skip("prepare mysterious-egg for merging")
167161
def test_update_shipping_after_discount(self):
168162
"""
169163
Verify that after applying a discount code, any `free_over` shipping gets recalculated.

0 commit comments

Comments
 (0)