Changeset - 2f77f5bb23ee
Parent rev.
Child rev.
[Not reviewed]
0 6 0
Christopher Neugebauer - 8 years ago 2016-04-06 07:24:25
chrisjrn@gmail.com
Replaces .active = False; .save() pattern in tests with a test controller method
6 files changed with 55 insertions and 51 deletions:
registrasion/tests/cart_controller_helper.py
4
registrasion/tests/test_cart.py
14
14
registrasion/tests/test_ceilings.py
9
9
registrasion/tests/test_discount.py
14
14
registrasion/tests/test_enabling_condition.py
10
10
registrasion/tests/test_voucher.py
4
4
0 comments (0 inline, 0 general)
registrasion/tests/cart_controller_helper.py
➞
Show inline comments
...
 
@@ -23,4 +23,8 @@ class TestingCartController(CartController):
 
            old_quantity = product_item.quantity
 
        except ObjectDoesNotExist:
 
            old_quantity = 0
 
        self.set_quantity(product, old_quantity + quantity)
 

			




	
	
	
		
 
    def next_cart(self):


			




	
	
	
		
 
        self.cart.active = False


			




	
	
	
		
 
        self.cart.save()


			




        

    


    
    

    

        

                

                    registrasion/tests/test_cart.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -73,14 +73,14 @@ class RegistrationCartTestCase(SetTimeMixin, TestCase):


			




	
	
	
		
 
        cls.PROD_4.save()


			




	
	
	
		
 

			




	
	
	
		
 
        # Burn through some carts -- this made some past EC tests fail


			




	
	
	
		
 
        current_cart = TestingCartController.for_user(cls.USER_1)


			




	
	
	
		
 
        current_cart.cart.active = False


			




	
	
	
		
 
        current_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart = TestingCartController.for_user(cls.USER_2)


			




	
	
	
		
 
        current_cart.cart.active = False


			




	
	
	
		
 
        current_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod


			




	
	
	
		
 
    def make_ceiling(cls, name, limit=None, start_time=None, end_time=None):


			




	
	
	
		
 
        limit_ceiling = rego.TimeOrStockLimitEnablingCondition.objects.create(


			




	...
	
		
 
@@ -141,10 +141,10 @@ class BasicCartTests(RegistrationCartTestCase):


			




	
	
	
		
 

			




	
	
	
		
 
    def test_get_cart(self):


			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.cart.active = False


			




	
	
	
		
 
        current_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        old_cart = current_cart


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	...
	
		
 
@@ -213,10 +213,10 @@ class BasicCartTests(RegistrationCartTestCase):


			




	
	
	
		
 
        # because they have a limit of 10.


			




	
	
	
		
 
        with self.assertRaises(ValidationError):


			




	
	
	
		
 
            current_cart.add_to_cart(self.PROD_1, 10)


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.cart.active = False


			




	
	
	
		
 
        current_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        # User should not be able to add 10 of PROD_1 to the current cart now,


			




	
	
	
		
 
        # even though it's a new cart.


			




	...
	
		
 
@@ -271,10 +271,10 @@ class BasicCartTests(RegistrationCartTestCase):


			




	
	
	
		
 
        # Cannot add to cart if category limit is filled by two products


			




	
	
	
		
 
        with self.assertRaises(ValidationError):


			




	
	
	
		
 
            current_cart.add_to_cart(self.PROD_3, 1)


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.cart.active = False


			




	
	
	
		
 
        current_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        # The category limit should extend across carts


			




	
	
	
		
 
        with self.assertRaises(ValidationError):


			




	...
	
		
 
@@ -297,10 +297,10 @@ class BasicCartTests(RegistrationCartTestCase):


			




	
	
	
		
 
            # There's only 6 allowed of PROD_4


			




	
	
	
		
 
            current_cart.add_to_cart(self.PROD_4, 1)


			




	
	
	
		
 

			




	
	
	
		
 
        # The limits should extend across carts...


			




	
	
	
		
 
        current_cart.cart.active = False


			




	
	
	
		
 
        current_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        current_cart.set_quantity(self.PROD_3, 4)


			




	
	
	
		
 

			




	...
	
		
 
@@ -324,10 +324,10 @@ class BasicCartTests(RegistrationCartTestCase):


			




	
	
	
		
 
        self.assertTrue(item in prods)


			




	
	
	
		
 
        current_cart.add_to_cart(item, quantity)


			




	
	
	
		
 
        self.assertTrue(item in prods)


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.cart.active = False


			




	
	
	
		
 
        current_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 

			




	
	
	
		
 
        prods = get_prods()


			




        

    


    
    

    

        

                

                    registrasion/tests/test_ceilings.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -90,10 +90,10 @@ class CeilingsTestCases(RegistrationCartTestCase):


			




	
	
	
		
 
        self.add_timedelta(self.RESERVATION + datetime.timedelta(seconds=1))


			




	
	
	
		
 
        second_cart.add_to_cart(self.PROD_1, 1)


			




	
	
	
		
 

			




	
	
	
		
 
        # User 2 pays for their cart


			




	
	
	
		
 
        second_cart.cart.active = False


			




	
	
	
		
 
        second_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        second_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        # User 1 should not be able to add item to their cart


			




	
	
	
		
 
        # because user 2 has paid for their reserved item, exhausting


			




	
	
	
		
 
        # the ceiling, regardless of the reservation time.


			




	...
	
		
 
@@ -127,10 +127,10 @@ class CeilingsTestCases(RegistrationCartTestCase):


			




	
	
	
		
 
        with self.assertRaises(ValidationError):


			




	
	
	
		
 
            first_cart.validate_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        # Paid cart outside the reservation window


			




	
	
	
		
 
        second_cart.cart.active = False


			




	
	
	
		
 
        second_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        second_cart.next_cart()


			




	
	
	
		
 
        self.add_timedelta(self.RESERVATION + datetime.timedelta(seconds=1))


			




	
	
	
		
 
        with self.assertRaises(ValidationError):


			




	
	
	
		
 
            first_cart.validate_cart()


			




	
	
	
		
 

			




	...
	
		
 
@@ -139,17 +139,17 @@ class CeilingsTestCases(RegistrationCartTestCase):


			




	
	
	
		
 

			




	
	
	
		
 
        first_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        first_cart.add_to_cart(self.PROD_1, 1)


			




	
	
	
		
 

			




	
	
	
		
 
        first_cart.cart.active = False


			




	
	
	
		
 
        first_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        first_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        second_cart = TestingCartController.for_user(self.USER_2)


			




	
	
	
		
 
        with self.assertRaises(ValidationError):


			




	
	
	
		
 
            second_cart.add_to_cart(self.PROD_1, 1)


			




	
	
	
		
 

			




	
	
	
		
 
        first_cart.cart.released = True


			




	
	
	
		
 
        first_cart.cart.save()


			




	
	
	
		
 
        first_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        second_cart.add_to_cart(self.PROD_1, 1)


			




	
	
	
		
 

			




	
	
	
		
 
    def test_discount_ceiling_only_counts_items_covered_by_ceiling(self):


			




	...
	
		
 
@@ -175,10 +175,10 @@ class CeilingsTestCases(RegistrationCartTestCase):


			




	
	
	
		
 
        cart.apply_voucher("VOUCHER")


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_1, 1)


			




	
	
	
		
 
        self.assertEqual(1, len(cart.cart.discountitem_set.all()))


			




	
	
	
		
 

			




	
	
	
		
 
        cart.cart.active = False


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        # The second cart has no voucher attached, so should apply the


			




	
	
	
		
 
        # ceiling discount


			




	
	
	
		
 
        cart = TestingCartController.for_user(self.USER_1)


			




        

    


    
    

    

        

                

                    registrasion/tests/test_discount.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -167,19 +167,19 @@ class DiscountTestCase(RegistrationCartTestCase):


			




	
	
	
		
 

			




	
	
	
		
 
        # Enable the discount during the first cart.


			




	
	
	
		
 
        cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_1, 1)


			




	
	
	
		
 
        cart.cart.active = False


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        # Use the discount in the second cart


			




	
	
	
		
 
        cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_2, 1)


			




	
	
	
		
 

			




	
	
	
		
 
        # The discount should be applied.


			




	
	
	
		
 
        self.assertEqual(1, len(cart.cart.discountitem_set.all()))


			




	
	
	
		
 
        cart.cart.active = False


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        # The discount should respect the total quantity across all


			




	
	
	
		
 
        # of the user's carts.


			




	
	
	
		
 
        cart = TestingCartController.for_user(self.USER_1)


			




	...
	
		
 
@@ -196,10 +196,10 @@ class DiscountTestCase(RegistrationCartTestCase):


			




	
	
	
		
 
        cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_1, 1)


			




	
	
	
		
 
        # This would exhaust discount if present


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_2, 2)


			




	
	
	
		
 
        cart.cart.active = False


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        self.add_discount_prod_1_includes_prod_2()


			




	
	
	
		
 
        cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_2, 2)


			




	...
	
		
 
@@ -345,10 +345,10 @@ class DiscountTestCase(RegistrationCartTestCase):


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_3, 1)  # Exhaust the quantity


			




	
	
	
		
 

			




	
	
	
		
 
        discounts = discount.available_discounts(self.USER_1, [self.CAT_2], [])


			




	
	
	
		
 
        self.assertEqual(2, discounts[0].quantity)


			




	
	
	
		
 
        cart.cart.active = False


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
    def test_discount_quantity_is_correct_after_first_purchase(self):


			




	
	
	
		
 
        self.test_discount_quantity_is_correct_before_first_purchase()


			




	
	
	
		
 

			




	...
	
		
 
@@ -356,10 +356,10 @@ class DiscountTestCase(RegistrationCartTestCase):


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_3, 1)  # Exhaust the quantity


			




	
	
	
		
 

			




	
	
	
		
 
        discounts = discount.available_discounts(self.USER_1, [self.CAT_2], [])


			




	
	
	
		
 
        self.assertEqual(1, discounts[0].quantity)


			




	
	
	
		
 
        cart.cart.active = False


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
    def test_discount_is_gone_after_quantity_exhausted(self):


			




	
	
	
		
 
        self.test_discount_quantity_is_correct_after_first_purchase()


			




	
	
	
		
 
        discounts = discount.available_discounts(self.USER_1, [self.CAT_2], [])


			




	...
	
		
 
@@ -387,14 +387,14 @@ class DiscountTestCase(RegistrationCartTestCase):


			




	
	
	
		
 
        )


			




	
	
	
		
 
        self.assertEqual(1, len(discounts))


			




	
	
	
		
 

			




	
	
	
		
 
        cart.cart.active = False  # Keep discount enabled


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_2, 2)  # The discount will be exhausted


			




	
	
	
		
 
        cart.cart.active = False


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        discounts = discount.available_discounts(


			




	
	
	
		
 
            self.USER_1,


			




	
	
	
		
 
            [],


			




	...
	
		
 
@@ -402,9 +402,9 @@ class DiscountTestCase(RegistrationCartTestCase):


			




	
	
	
		
 
        )


			




	
	
	
		
 
        self.assertEqual(0, len(discounts))


			




	
	
	
		
 

			




	
	
	
		
 
        cart.cart.released = True


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        discounts = discount.available_discounts(


			




	
	
	
		
 
            self.USER_1,


			




	
	
	
		
 
            [],


			




        

    


    
    

    

        

                

                    registrasion/tests/test_enabling_condition.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -67,10 +67,10 @@ class EnablingConditionTestCases(RegistrationCartTestCase):


			




	
	
	
		
 
        self.add_product_enabling_condition()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        current_cart.add_to_cart(self.PROD_2, 1)


			




	
	
	
		
 
        current_cart.cart.active = False


			




	
	
	
		
 
        current_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        # Create new cart and try to add PROD_1


			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        current_cart.add_to_cart(self.PROD_1, 1)


			




	...
	
		
 
@@ -102,10 +102,10 @@ class EnablingConditionTestCases(RegistrationCartTestCase):


			




	
	
	
		
 
        self.add_category_enabling_condition()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        current_cart.add_to_cart(self.PROD_3, 1)


			




	
	
	
		
 
        current_cart.cart.active = False


			




	
	
	
		
 
        current_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        # Create new cart and try to add PROD_1


			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        current_cart.add_to_cart(self.PROD_1, 1)


			




	...
	
		
 
@@ -240,17 +240,17 @@ class EnablingConditionTestCases(RegistrationCartTestCase):


			




	
	
	
		
 

			




	
	
	
		
 
        cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_3, 1)


			




	
	
	
		
 

			




	
	
	
		
 
        cart.cart.active = False


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        cart_2 = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        cart_2.add_to_cart(self.PROD_1, 1)


			




	
	
	
		
 
        cart_2.set_quantity(self.PROD_1, 0)


			




	
	
	
		
 

			




	
	
	
		
 
        cart.cart.released = True


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        with self.assertRaises(ValidationError):


			




	
	
	
		
 
            cart_2.set_quantity(self.PROD_1, 1)


			




	
	
	
		
 

			




	...
	
		
 
@@ -259,17 +259,17 @@ class EnablingConditionTestCases(RegistrationCartTestCase):


			




	
	
	
		
 

			




	
	
	
		
 
        cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_2, 1)


			




	
	
	
		
 

			




	
	
	
		
 
        cart.cart.active = False


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        cart_2 = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        cart_2.add_to_cart(self.PROD_1, 1)


			




	
	
	
		
 
        cart_2.set_quantity(self.PROD_1, 0)


			




	
	
	
		
 

			




	
	
	
		
 
        cart.cart.released = True


			




	
	
	
		
 
        cart.cart.save()


			




	
	
	
		
 
        cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        with self.assertRaises(ValidationError):


			




	
	
	
		
 
            cart_2.set_quantity(self.PROD_1, 1)


			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    registrasion/tests/test_voucher.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -33,10 +33,10 @@ class VoucherTestCases(RegistrationCartTestCase):


			




	
	
	
		
 
        # After the reservation duration


			




	
	
	
		
 
        # user 2 should be able to apply voucher


			




	
	
	
		
 
        self.add_timedelta(rego.Voucher.RESERVATION_DURATION * 2)


			




	
	
	
		
 
        cart_2.apply_voucher(voucher.code)


			




	
	
	
		
 
        cart_2.cart.active = False


			




	
	
	
		
 
        cart_2.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        cart_2.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        # After the reservation duration, even though the voucher has applied,


			




	
	
	
		
 
        # it exceeds the number of vouchers available.


			




	
	
	
		
 
        self.add_timedelta(rego.Voucher.RESERVATION_DURATION * 2)


			




	...
	
		
 
@@ -124,10 +124,10 @@ class VoucherTestCases(RegistrationCartTestCase):


			




	
	
	
		
 
        voucher = self.new_voucher(limit=2)


			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 
        current_cart.apply_voucher(voucher.code)


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.cart.active = False


			




	
	
	
		
 
        current_cart.cart.save()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart.next_cart()


			




	
	
	
		
 

			




	
	
	
		
 
        current_cart = TestingCartController.for_user(self.USER_1)


			




	
	
	
		
 

			




	
	
	
		
 
        with self.assertRaises(ValidationError):


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








    
        Server instance: kapok.sfconservancy.org-20228
    
    
        This site is powered by
            Kallithea 0.6.3,
        which is
        © 2010–2020 by various authors & licensed under GPLv3.
            – Support
        – Privacy Policy