Split offer tests into unit/integration folders

This might be futile.

oscar/apps/offer/models.py

@@ -660,6 +660,8 @@ def _included_product_ids(self):
         return self.__included_product_ids
 
     def _excluded_product_ids(self):
+        if not self.id:
+            return []
         if None == self.__excluded_product_ids:
             self.__excluded_product_ids = [row['id'] for row in self.excluded_products.values('id')]
         return self.__excluded_product_ids

tests/README.rst

@@ -13,4 +13,7 @@ Tests are split into 3 folders:
 
 * functional - These should be as close to "end-to-end" as possible.  Most of
   these tests should use WebTest to simulate the behaviour of a user browsing
-  the site.
+  the site.
+
+The 'integration' folder is relatively new and the process of migrating tests
+from 'unit' is in place.

tests/unit/offer/condition_tests.py → tests/integration/offer/condition_tests.py

@@ -12,8 +12,8 @@ class TestCountCondition(OfferTest):
 
     def setUp(self):
         super(TestCountCondition, self).setUp()
-        self.condition = models.CountCondition(range=self.range,
-                                          type="Count", value=2)
+        self.condition = models.CountCondition(
+            range=self.range, type="Count", value=2)
 
     def test_is_not_satified_by_empty_basket(self):
         self.assertFalse(self.condition.is_satisfied(self.basket))

tests/unit/offer/range_tests.py → tests/integration/offer/range_tests.py

@@ -1,5 +1,3 @@
-import datetime
-
 from django.conf import settings
 from django.test import TestCase
 
@@ -10,7 +8,7 @@
 class TestWholeSiteRangeWithGlobalBlacklist(TestCase):
 
     def setUp(self):
-        self.range = models.Range.objects.create(
+        self.range = models.Range(
             name="All products", includes_all_products=True)
 
     def tearDown(self):
@@ -22,20 +20,23 @@ def test_blacklisting_prevents_products_being_in_range(self):
         self.assertFalse(self.range.contains_product(prod))
 
     def test_blacklisting_can_use_product_class(self):
-        settings.OSCAR_OFFER_BLACKLIST_PRODUCT = lambda p: p.product_class.name == 'giftcard'
+        settings.OSCAR_OFFER_BLACKLIST_PRODUCT = (
+            lambda p: p.product_class.name == 'giftcard')
         prod = create_product(product_class="giftcard")
         self.assertFalse(self.range.contains_product(prod))
 
     def test_blacklisting_doesnt_exlude_everything(self):
-        settings.OSCAR_OFFER_BLACKLIST_PRODUCT = lambda p: p.product_class.name == 'giftcard'
+        settings.OSCAR_OFFER_BLACKLIST_PRODUCT = (
+            lambda p: p.product_class.name == 'giftcard')
         prod = create_product(product_class="book")
         self.assertTrue(self.range.contains_product(prod))
 
 
 class TestWholeSiteRange(TestCase):
 
     def setUp(self):
-        self.range = models.Range.objects.create(name="All products", includes_all_products=True)
+        self.range = models.Range.objects.create(
+            name="All products", includes_all_products=True)
         self.prod = create_product()
 
     def test_all_products_range(self):