Added a test runner and better tests / Updated admin options

README.md

@@ -50,7 +50,8 @@ There is a shortcut script for dropping all of oscar's apps and rerunning `syncd
     ./reset_oscar_tables.sh
     
 Run tests using:
-    ./manage.py test oscar
+    ./run_tests.sh
+This specifies a sqlite3 database to use for testing and filters out the useless output.
     
 You can also use the functionality from (django-test-extensions)[https://github.com/garethr/django-test-extensions/] which 
 is one of the installed app	

oscar/basket/abstract_models.py

@@ -8,7 +8,8 @@ class AbstractBasket(models.Model):
     """
     Basket object
     """
-    owner = models.ForeignKey(User, related_name='baskets')
+    # Baskets can be anonymously owned
+    owner = models.ForeignKey(User, related_name='baskets', null=True)
     OPEN, MERGED, SUBMITTED = ("Open", "Merged", "Submitted")
     STATUS_CHOICES = (
         (OPEN, _("Open - currently active")),
@@ -25,19 +26,31 @@ class AbstractBasket(models.Model):
     def is_empty(self):
         return self.get_num_lines() == 0
     
+    def add_product(self, item, quantity=1):
+        """
+        Convenience method for adding a line
+        """
+        self.lines.create(basket=self, product=item, quantity=quantity)
+    
     def get_num_lines(self):
         """
         Returns number of lines within this basket
         """
-        return len(self.lines.all())
+        return self.lines.all().count()
     
     def get_num_items(self):
-        return reduce(lambda num,line: num+line.quantity, self.lines)
+        """
+        Returns the number of items in the basket
+        """
+        return reduce(lambda num,line: num+line.quantity, self.lines.all(), 0)
     
     def __unicode__(self):
         return "%s basket (owner: %s)" % (self.status, self.owner)
     
 class AbstractLine(models.Model):
+    """
+    A line of a basket (product and a quantity)
+    """
     basket = models.ForeignKey('basket.Basket', related_name='lines')
     product = models.ForeignKey('product.Item')
     quantity = models.PositiveIntegerField(default=1)
@@ -53,10 +66,12 @@ class AbstractLine(models.Model):
         """
         attribute_string = "_".join([attribute.get_hash() for attributes in self.attributes])
         return zlib.crc32(attribute_string)
-        
     
     class Meta:
         abstract = True
+        
+    def __unicode__(self):
+        return "%s, Product '%s', quantity %d" % (self.basket, self.product, self.quantity)
     
 class AbstractLineAttribute(models.Model):
     line = models.ForeignKey('basket.Line', related_name='attributes')

oscar/basket/tests.py

@@ -1,16 +1,36 @@
 import unittest
 
-from django.test.utils import setup_test_environment
-setup_test_environment()
-
 from django.test import TestCase
 from oscar.basket.models import * 
+from oscar.product.models import Item, ItemClass
 
 class BasketTest(unittest.TestCase):
+    
+    def setUp(self):
+        self.basket = Basket.objects.create()
+        
+        # Create a dummy product
+        ic = ItemClass.objects.create(name='Dummy class')
+        self.dummy_product = Item.objects.create(title='Dummy product', item_class=ic)
+    
     def test_empty_baskets_have_zero_lines(self):
-        b = Basket()
-        self.assertTrue(b.get_num_lines() == 0)
-
+        self.assertTrue(Basket().get_num_lines() == 0)
+        
+    def test_new_baskets_are_empty(self):
+        self.assertTrue(Basket().is_empty())
+        
+    def test_basket_have_with_one_line(self):
+        line = Line.objects.create(basket=self.basket, product=self.dummy_product)
+        self.assertTrue(self.basket.get_num_lines() == 1)
+        
+    def test_add_product_creates_line(self):
+        self.basket.add_product(self.dummy_product)
+        self.assertTrue(self.basket.get_num_lines() == 1)
+        
+    def test_adding_multiproduct_line_returns_correct_number_of_items(self):
+        self.basket.add_product(self.dummy_product, 10)
+        self.assertEqual(self.basket.get_num_items(), 10)
+        
 if __name__ == '__main__':
     from django.test.utils import setup_test_environment
     setup_test_environment()

oscar/image/abstract_models.py

@@ -1,17 +1,18 @@
 """
-Abstract models for the product images app
+Abstract models for product images
 """
 
 from django.db import models
 from django.utils.translation import ugettext as _
 
-
 class AbstractImage(models.Model):
     """
     An image of a product  
     """
     product = models.ForeignKey('product.Item', related_name='images')
-    path = models.ImageField(upload_to='product-images/%Y/%m/')
+    # Namespacing path with app name to avoid clashes with other apps
+    path_to_original = models.ImageField(upload_to='product-images/%Y/%m/')
+    path_to_thumbnail = models.ImageField(upload_to='product-images/%Y/%m/')
     # Use display_order to determine which is the "primary" image
     display_order = models.PositiveIntegerField()
     date_created = models.DateTimeField(auto_now_add=True)

oscar/order/abstract_models.py

@@ -93,7 +93,7 @@ class AbstractBatchLineEvent(models.Model):
         verbose_name_plural = _("Batch line events")
         
     def __unicode__(self):
-        return "Order #%d, batch #%d, line %d: %d items %s" % (
+        return "Order #%d, batch #%d, line %s: %d items %s" % (
             self.line.batch.order.number, self.line.batch.id, self.line.line_id, self.quantity, self.event_type)
 
 class AbstractBatchLineEventType(models.Model):

oscar/product/abstract_models.py

@@ -10,6 +10,7 @@ class AbstractItemClass(models.Model):
     class Meta:
         abstract = True
         ordering = ['name']
+        verbose_name_plural = "Item classes"
 
     def __unicode__(self):
         return self.name
@@ -26,7 +27,10 @@ class AbstractItem(models.Model):
     # children would be "Green fleece - size L".
     #
     # No canonical product should have a stock record as they cannot be bought.
-    parent = models.ForeignKey('self', blank=True, null=True)
+    parent = models.ForeignKey('self', blank=True, null=True, 
+        help_text="""Only choose a parent product if this is a 'variant' of a canonical product.  For example 
+                     if this is a size 4 of a particular t-shirt.  Leave blank if there is only one version of this
+                     product""")
     title = models.CharField(_('name'), max_length=255)
     description = models.TextField(_('description'), blank=True, null=True)
     item_class = models.ForeignKey('product.ItemClass', verbose_name=_('item class'))

oscar/stock/abstract_models.py

@@ -30,7 +30,7 @@ class AbstractStockRecord(models.Model):
     price_incl_tax = models.DecimalField(decimal_places=2, max_digits=12)
     price_excl_tax = models.DecimalField(decimal_places=2, max_digits=12)
     num_in_stock = models.IntegerField()
-    num_allocated = models.IntegerField()
+    num_allocated = models.IntegerField(default=0)
     
     class Meta:
         abstract = True

oscar/stock/admin.py

@@ -1,5 +1,8 @@
 from django.contrib import admin
 from oscar.stock.models import *
 
+class StockRecordAdmin(admin.ModelAdmin):
+    exclude = ('num_allocated',)
+
 admin.site.register(Partner)
-admin.site.register(StockRecord)
+admin.site.register(StockRecord, StockRecordAdmin)

oscar/tests.py

@@ -1,23 +1,2 @@
-"""
-This file demonstrates two different styles of tests (one doctest and one
-unittest). These will both pass when you run "manage.py test".
-
-Replace these with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
-
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.failUnlessEqual(1 + 1, 2)
-
-__test__ = {"doctest": """
-Another way to test that 1 + 1 is equal to 2.
-
->>> 1 + 1 == 2
-True
-"""}
+from oscar.basket.tests import *
 

reset_oscar_tables.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 # For dropping and recreating all the oscar tables
 # @todo rewrite this a manage.py command
+echo "Dropping tables"
 ./manage.py sqlclear payment offer order basket stock image product | \
 	awk 'BEGIN {print "set foreign_key_checks=0;"} {print $0}' | \
     ./manage.py dbshell && \
-    ./manage.py syncdb
+    ./manage.py syncdb

run_tests.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# Test runnner script that specifies correct settings file
+# and filters out useless output
+time ./manage.py test oscar --settings=test_settings -v 1 --failfast | \
+	grep -v "^\(Installing\|Creating\)"

test_settings.py

@@ -0,0 +1,19 @@
+"""
+Special settings file for use when testing.  This specifies a SQLite 
+database to use when running tests.
+
+Just make sure you run the tests and specify this file:
+> ./manage.py test -settings=test_settings
+"""
+from settings import *
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'sqlite3', 
+        'NAME': ':memory:', 
+        'USER': '',                      # Not used with sqlite3.
+        'PASSWORD': '',                  # Not used with sqlite3.
+        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+    }
+}