Merge pull request #2510 from sasha0/feature/2163/offer-proxy

Fix condition/offer proxy class name property validation.

src/oscar/apps/offer/abstract_models.py

@@ -67,7 +67,7 @@ class BaseOfferMixin(models.Model):
         This is used in the dropdowns within the offer dashboard.
         """
         proxy_instance = self.proxy()
-        if self.proxy_class and self == proxy_instance:
+        if self.proxy_class and self.__class__ == proxy_instance.__class__:
             raise AssertionError('Name property is not defined on proxy class.')
         return proxy_instance.name
 

tests/_site/model_tests_app/models.py

@@ -57,6 +57,21 @@ class CustomBenefitModel(BaseOfferModel, Benefit):
         return self.name
 
 
+class CustomConditionModel(Condition):
+
+    name = 'Test condition'
+
+    class Meta:
+        proxy = True
+        app_label = 'tests'
+
+    def is_satisfied(self, offer, basket):
+        return True
+
+    def can_apply_condition(self, product):
+        return True
+
+
 class CustomBenefitWithoutName(Benefit):
     class Meta:
         proxy = True

tests/integration/offer/test_custom.py

@@ -1,23 +1,31 @@
 from django.test import TestCase
 
 from oscar.apps.offer import custom
-
-from tests._site.model_tests_app.models import CustomBenefitWithoutName, CustomConditionWithoutName
+from tests._site.model_tests_app.models import (
+    CustomBenefitModel, CustomBenefitWithoutName, CustomConditionModel, CustomConditionWithoutName)
 
 
 class TestCustomBenefit(TestCase):
     def setUp(self):
-        self.custom_benefit = custom.create_benefit(CustomBenefitWithoutName)
+        self.custom_benefits = [
+            custom.create_benefit(CustomBenefitModel), custom.create_benefit(CustomBenefitWithoutName)]
+
+    def test_name(self):
+        self.assertEquals(self.custom_benefits[0].name, 'Test benefit')
 
-    def test_benefit_raises_assert_on_missing_title(self):
+    def test_raises_assert_on_missing_name(self):
         with self.assertRaisesMessage(AssertionError, 'Name property is not defined on proxy class.'):
-            str(self.custom_benefit)
+            str(self.custom_benefits[1])
 
 
 class TestCustomCondition(TestCase):
     def setUp(self):
-        self.custom_condition = custom.create_condition(CustomConditionWithoutName)
+        self.custom_conditions = [
+            custom.create_condition(CustomConditionModel), custom.create_condition(CustomConditionWithoutName)]
+
+    def test_name(self):
+        self.assertEquals(self.custom_conditions[0].name, 'Test condition')
 
-    def test_benefit_raises_assert_on_missing_title(self):
+    def test_raises_assert_on_missing_name(self):
         with self.assertRaisesMessage(AssertionError, 'Name property is not defined on proxy class.'):
-            str(self.custom_condition)
+            str(self.custom_conditions[1])