Merge branch 'master' into features/category-management

Conflicts:
	requirements.txt

.travis.yml

@@ -6,4 +6,4 @@ install:
 script:
   - pip install -r requirements.txt
   - ./setup.py develop
-  - ./run_tests.py
+  - ./runtests.py

README.rst

@@ -10,12 +10,13 @@ core functionality can be customised to suit the needs of your project.  This
 allows it to handle a wide range of e-commerce requirements, from large-scale B2C
 sites to complex B2B sites rich in domain-specific business logic.
 
-This README is just a stub - see the following links for more details
-information:
+More information:
 
 * `Official homepage`_ 
-* `Demo site`_ (experimental) 
-* `Documentation`_ on `readthedocs.org`_
+* `Sandbox site`_ (an hourly build of the unstable master branch - it's
+  experimental but feel free to explore and get a feel for the base Oscar
+  install) 
+* `Documentation`_ on the excellent `readthedocs.org`_
 * `Google Group`_ - the mailing list is django-oscar@googlegroups.com
 * `Continuous integration homepage`_ on `travis-ci.org`_
 * `Twitter account for news and updates`_
@@ -24,7 +25,7 @@ information:
 .. image:: https://secure.travis-ci.org/tangentlabs/django-oscar.png
 
 .. _`Official homepage`: http://oscarcommerce.com
-.. _`Demo site`: http://sandbox.oscar.tangentlabs.co.uk
+.. _`Sandbox site`: http://sandbox.oscar.tangentlabs.co.uk
 .. _`Documentation`: http://django-oscar.readthedocs.org/en/latest/
 .. _`readthedocs.org`: http://readthedocs.org
 .. _`Continuous integration homepage`: http://travis-ci.org/#!/tangentlabs/django-oscar 
@@ -34,7 +35,8 @@ information:
 .. _`Google Group`: https://groups.google.com/forum/?fromgroups#!forum/django-oscar
 
 Oscar was written by `David Winterbottom`_ (`@codeinthehole`_) and is developed
-and maintained by `Tangent Labs`_, a London-based digital agency.
+and maintained by `Tangent Labs`_, a London-based digital agency, with help from
+`Mirumee`.
 
 Oscar is released under the permissive `New BSD license`_.
 
@@ -42,6 +44,7 @@ Oscar is released under the permissive `New BSD license`_.
 .. _`@codeinthehole`: https://twitter.com/codeinthehole
 .. _`Tangent Labs`: http://www.tangentlabs.co.uk
 .. _`New BSD license`: https://github.com/tangentlabs/django-oscar/blob/master/LICENSE
+.. _`Mirumee`: http://mirumee.com/
 
 Case studies
 ------------

create_migration.py

@@ -1,9 +1,11 @@
 #!/usr/bin/env python
-import sys
-import os
+"""
+Convenience script to create migrations
+"""
 from optparse import OptionParser
 
-import tests.config
+from tests.config import configure
+configure()
 
 
 def create_migration(app_label, **kwargs):
@@ -20,4 +22,3 @@ if __name__ == '__main__':
                       action='store_true', default=False)
     (options, args) = parser.parse_args()
     create_migration(args[0], initial=options.initial, auto=options.auto)
-

docs/source/conf.py

@@ -11,14 +11,16 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
-oscar_folder = os.path.realpath(os.path.join(os.path.dirname(__file__), '../..'))
-sys.path.append(oscar_folder)
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.insert(0, os.path.abspath('.'))
+import sys, os
+oscar_folder = os.path.realpath(os.path.join(os.path.dirname(__file__), '../..'))
+sys.path.append(oscar_folder)
+
+# Get django settings
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'sandbox.settings')
 
 # -- General configuration -----------------------------------------------------
 
@@ -43,7 +45,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'django-oscar'
-copyright = u'2011, David Winterbottom'
+copyright = u'Tangent Labs'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

docs/source/getting_started.rst

@@ -159,7 +159,7 @@ Install dependencies::
 
 Create database::
 
-    python manage.py syncdb -noinput
+    python manage.py syncdb --noinput
     python manage.py migrate
 
 And that should be it.

docs/source/index.rst

@@ -39,9 +39,25 @@ Features:
 
 * Extension libraries available for PayPal, GoCardless, DataCash and more
 
+Oscar is a good choice if your domain has non-trivial business logic.  Oscar's
+flexibility means it's straightforward to implement business rules that would be
+difficult to apply in other frameworks.  
+
+Example requirements that Oscar applications already handle:
+
+* Paying for an order with multiple payment sources (eg using a bankcard,
+  voucher, giftcard and business account).
+
+* Complex access control rules governing who can view and order what.
+
+* Supporting a hierarchy of customers, sales reps and sales directors - each
+  being able to "masquerade" as their subordinate users.
+
+* Multi-lingual products and categories
+
 Oscar is developed by `Tangent Labs`_, a London-based digital agency.  It is
 used in production in several applications to sell everything from beer mats to
-ipads.  The `source is on Github`_. 
+ipads.  The `source is on Github`_ - contributions welcome.
 
 .. _`Tangent Labs`: http://www.tangentlabs.co.uk
 .. _`source is on Github`: https://github.com/tangentlabs/django-oscar

docs/source/recipes/how_to_configure_stock_messaging.rst

@@ -1,3 +1,43 @@
 ================================
 How to configure stock messaging
 ================================
+
+Stock messaging is controlled on a per-partner basis.  A product's stockrecord
+has the following methods for messaging:
+
+.. autoclass:: oscar.apps.partner.abstract_models.AbstractStockRecord
+    :members: availability, availability_code
+
+Both these methods delegate to a "partner wrapper" instance.  These are defined
+in the ``OSCAR_PARTNER_WRAPPERS`` setting which is a dict mapping from partner
+name to a class path, for instance::
+
+    # settings.py
+    OSCAR_PARTNER_WRAPPERS = {
+        'Partner A': 'myproject.wrappers.PartnerAWrapper',
+    }
+
+The default wrapper is :class:`oscar.apps.partner.wrappers.DefaultWrapper`,
+which provides methods of the same name.
+
+.. autoclass:: oscar.apps.partner.wrappers.DefaultWrapper
+    :members: availability, availability_code
+
+Custom wrappers should subclass this class and override the appropriate methods.
+Here's an example wrapper that provides custom availability messaging::
+
+    # myproject/wrappers.py
+    from oscar.apps.partner import wrappers
+
+
+    class PartnerAWrapper(wrappers.DefaultWrapper):
+        
+        def availability(self, stockrecord):
+            if stockrecord.net_stock_level > 0:
+                return "Available to buy now!"
+            return "Sorry, not available"
+
+        def availability_code(self, stockrecord):
+            if stockrecord.net_stock_level > 0:
+                return "icon_tick"
+            return "icon_cross"

docs/source/recipes/how_to_disable_an_app.rst

@@ -1,6 +1,33 @@
-=====================
-How to disable an app
-=====================
+============================
+How to disable an app's URLs
+============================
 
-...
+Suppose you don't want to use Oscar's dashboard but use your own.  The way to do
+this is to modify the URLs config to exclude the URLs from the app in question.
 
+You need to use your own root 'application' instance which gives you control
+over the URLs structure.  So your root ``urls.py`` should have::
+
+    # urls.py
+    from myproject.app import application
+
+    urlpatterns = patterns('',
+        ...
+        (r'', include(application.urls)),
+    )
+
+where ``application`` is a subclass of ``oscar.app.Shop`` which overrides the 
+link to the dashboard app::
+
+    # myproject/app.py
+    from oscar.app import Shop
+    from oscar.core.application import Application
+
+    class MyShop(Shop):
+
+        # Override the core dashboard_app instance to use a blank application 
+        # instance.  This means no dashboard URLs are included.
+        dashboard_app = Application()
+
+The only remaining task is to ensure your templates don't reference any
+dashboard URLs. 

docs/source/reference/signals.rst

@@ -2,16 +2,112 @@
 Signals
 =======
 
-Oscar defined a number of custom signals that provide useful hook-points for
+Oscar implements a number of custom signals that provide useful hook-points for
 adding functionality.
 
+product_viewed
+--------------
+
+.. data:: oscar.apps.catalogue.signals.product_viewed
+    :class:
+
+Raised when a product detail page is viewed.  
+
+Arguments sent with this signal:
+
+``product``
+    The product being viewed
+
+``user``
+    The user in question
+
+``request``
+    The request instance
+
+``response``
+    The response instance
+
+product_search
+--------------
+
+.. data:: oscar.apps.catalogue.signals.product_search
+    :class:
+
+Raised when a search is performed.
+
+Arguments sent with this signal:
+
+``query``
+    The search term
+
+``user``
+    The user in question
+
+basket_addition
+---------------
+
+.. data:: oscar.apps.basket.signals.basket_addition
+    :class:
+
+Raised when a product is added to a basket
+
+Arguments sent with this signal:
+
+``product``
+    The product being added
+
+``user``
+    The user in question
+
+voucher_addition
+----------------
+
+.. data:: oscar.apps.basket.signals.voucher_addition
+    :class:
+
+Raised when a valid voucher is added to a basket
+
+Arguments sent with this signal:
+
+``basket``
+    The basket in question
+
+``voucher``
+    The voucher in question
+
+pre_payment
+-----------
+
+.. data:: oscar.apps.checkout.signals.pre_payment
+    :class:
+
+Raised immediately before attempting to take payment in the checkout.
+
+Arguments sent with this signal:
+
+``view``
+    The view class instance
+
+post_payment
+------------
+
+.. data:: oscar.apps.checkout.signals.post_payment
+    :class:
+
+Raised immediately after payment has been taken.
+
+Arguments sent with this signal:
+
+``view``
+    The view class instance
+
 order_placed
 ------------
 
-.. data:: oscar.apps.order.order_placed
+.. data:: oscar.apps.order.signals.order_placed
     :class:
 
-Raised by the :class:`oscar.apps.order.OrderCreator` class when creating an order.
+Raised by the :class:`oscar.apps.order.utils.OrderCreator` class when creating an order.
 
 Arguments sent with this signal:
 

oscar/__init__.py

@@ -4,7 +4,7 @@ import os
 # a full release
 
 VERSION = (0, 3, 0, 'alpha', 0)
-
+    
 def get_short_version():
     return '%s.%s' % (VERSION[0], VERSION[1])
 
@@ -66,12 +66,14 @@ def get_core_apps(overrides=None):
     """
     Return a list of oscar's apps amended with any passed overrides
     """
-    if overrides is None:
+    if not overrides:
         return OSCAR_CORE_APPS
     def get_app_label(app_label, overrides):
         pattern = app_label.replace('oscar.apps.', '')
         for override in overrides:
             if override.endswith(pattern):
+                if 'dashboard' in override and 'dashboard' not in pattern:
+                    continue
                 return override
         return app_label
 

oscar/app.py

@@ -46,5 +46,5 @@ class Shop(Application):
         )
         return urlpatterns
     
-
-shop = Shop()
+# 'shop' kept for legacy projects - 'application' is a better name
+shop = application = Shop()

oscar/apps/basket/abstract_models.py

@@ -129,7 +129,7 @@ class AbstractBasket(models.Model):
         self.discounts = []
         self._lines = None
 
-    def merge_line(self, line):
+    def merge_line(self, line, add_quantities=True):
         """
         For transferring a line from another basket to this one.
 
@@ -142,17 +142,23 @@ class AbstractBasket(models.Model):
             line.basket = self
             line.save()
         else:
-            # Line already exists - bump its quantity and delete the old
-            existing_line.quantity += line.quantity
+            # Line already exists - assume the max quantity is correct and delete the old
+            if add_quantities:
+                existing_line.quantity += line.quantity
+            else:
+                existing_line.quantity = max(existing_line.quantity, line.quantity)
             existing_line.save()
             line.delete()
 
-    def merge(self, basket):
+    def merge(self, basket, add_quantities=True):
         """
         Merges another basket with this one.
+
+        :basket: The basket to merge into this one
+        :add_quantities: Whether to add line quantities when they are merged.
         """
         for line_to_merge in basket.all_lines():
-            self.merge_line(line_to_merge)
+            self.merge_line(line_to_merge, add_quantities)
         basket.status = MERGED
         basket.date_merged = datetime.datetime.now()
         basket.save()
@@ -183,6 +189,16 @@ class AbstractBasket(models.Model):
         for line in self.all_lines():
             line.set_as_tax_exempt()
 
+    def is_shipping_required(self):
+        """
+        Test whether the basket contains physical products that require
+        shipping.
+        """
+        for line in self.all_lines():
+            if line.product.is_shipping_required:
+                return True
+        return False
+
     # =======
     # Helpers
     # =======

oscar/apps/basket/middleware.py

@@ -55,7 +55,7 @@ class BasketMiddleware(object):
         
         This is its own method to allow it to be overridden
         """
-        master.merge(slave)    
+        master.merge(slave, add_quantities=False)
         
     def process_response(self, request, response):
         # Delete any surplus cookies
@@ -76,9 +76,10 @@ class BasketMiddleware(object):
         return response
     
     def process_template_response(self, request, response):
-        if response.context_data is None:
-            response.context_data = {}
-        response.context_data['basket'] = request.basket
+        if hasattr(response, 'context_data'):
+            if response.context_data is None:
+                response.context_data = {}
+            response.context_data['basket'] = request.basket
         return response
     
     def get_cookie_basket(self, cookie_key, request, manager):

oscar/apps/basket/signals.py

@@ -1,4 +1,4 @@
 import django.dispatch
 
 basket_addition = django.dispatch.Signal(providing_args=["product", "user"])
-basket_voucher = django.dispatch.Signal(providing_args=["basket", "voucher"])
+voucher_addition = django.dispatch.Signal(providing_args=["basket", "voucher"])

oscar/apps/basket/views.py

@@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ObjectDoesNotExist
 
 from extra_views import ModelFormSetView
-from oscar.apps.basket.signals import basket_addition
+from oscar.apps.basket.signals import basket_addition, voucher_addition
 from oscar.core.loading import get_class, get_classes
 Applicator = get_class('offer.utils', 'Applicator')
 BasketLineForm, AddToBasketForm, BasketVoucherForm, \
@@ -169,6 +169,7 @@ class BasketAddView(FormView):
 class VoucherAddView(FormView):
     form_class = BasketVoucherForm
     voucher_model = get_model('voucher', 'voucher')
+    add_signal = voucher_addition
 
     def get(self, request, *args, **kwargs):
         return HttpResponseRedirect(reverse('basket:summary'))
@@ -185,6 +186,11 @@ class VoucherAddView(FormView):
 
         self.request.basket.vouchers.add(voucher)
 
+        # Raise signal
+        self.add_signal.send(sender=self, 
+                             basket=self.request.basket, 
+                             voucher=voucher)
+
         # Recalculate discounts to see if the voucher gives any
         discounts_before = self.request.basket.get_discounts()
         self.request.basket.remove_discounts()

oscar/apps/catalogue/abstract_models.py

@@ -18,12 +18,19 @@ BrowsableProductManager = get_class('catalogue.managers', 'BrowsableProductManag
 class AbstractProductClass(models.Model):
     """
     Defines the options and attributes for a group of products, e.g. Books, DVDs and Toys.
+
     Not necessarily equivalent to top-level categories but usually will be.
     """
     name = models.CharField(_('name'), max_length=128)
     slug = models.SlugField(max_length=128, unique=True)
+
+    # Some product type don't require shipping (eg digital products) - we use
+    # this field to take some shortcuts in the checkout.
+    requires_shipping = models.BooleanField(_("Requires shipping?"), default=True)
     
-    # These are the options (set by the user when they add to basket) for this item class
+    # These are the options (set by the user when they add to basket) for this
+    # item class.  For instance, a product class of "SMS message" would always
+    # require a message to be specified before it could be bought.
     options = models.ManyToManyField('catalogue.Option', blank=True)
 
     class Meta:
@@ -33,8 +40,8 @@ class AbstractProductClass(models.Model):
 
     def save(self, *args, **kwargs):
         if not self.slug:
-            self.slug= slugify(self.name)
-        super(AbstractProductClass, self).save(*args, **kwargs)
+            self.slug = slugify(self.name)
+        return super(AbstractProductClass, self).save(*args, **kwargs)
 
     def __unicode__(self):
         return self.name
@@ -42,7 +49,9 @@ class AbstractProductClass(models.Model):
 
 class AbstractCategory(MP_Node):
     """
-    Category hierarchy, top-level nodes represent departments. Uses django-treebeard.
+    A product category.
+    
+    Uses django-treebeard.
     """
     name = models.CharField(max_length=255, db_index=True)
     description = models.TextField(blank=True, null=True)
@@ -235,7 +244,7 @@ class AbstractProduct(models.Model):
         help_text="""Choose what type of product this is""")
     attributes = models.ManyToManyField('catalogue.ProductAttribute', through='ProductAttributeValue',
         help_text="""A product attribute is something that this product MUST have, such as a size, as specified by its class""")
-    product_options = models.ManyToManyField('catalogue.Option', blank=True, 
+    product_options = models.ManyToManyField('catalogue.Option', blank=True,
         help_text="""Options are values that can be associated with a item when it is added to 
                      a customer's basket.  This could be something like a personalised message to be
                      printed on a T-shirt.<br/>""")
@@ -347,9 +356,9 @@ class AbstractProduct(models.Model):
         return None
 
     def primary_image(self):
-        images = self.images.all().order_by('display_order')
+        images = self.images.all()
         if images.count():
-            return images[0]
+            return images.order_by('display_order')[0]
         return {
             'original': MissingProductImage(),
             'caption': '',
@@ -606,7 +615,7 @@ class AbstractProductAttributeValue(models.Model):
     product = models.ForeignKey('catalogue.Product', related_name='attribute_values')
     value_text = models.CharField(max_length=255, blank=True, null=True)
     value_integer = models.IntegerField(blank=True, null=True)
-    value_boolean = models.BooleanField(blank=True)
+    value_boolean = models.NullBooleanField(blank=True)
     value_float = models.FloatField(blank=True, null=True)
     value_richtext = models.TextField(blank=True, null=True)
     value_date = models.DateField(blank=True, null=True)

oscar/apps/catalogue/migrations/0004_auto__chg_field_productattributevalue_value_boolean.py

@@ -0,0 +1,161 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Changing field 'ProductAttributeValue.value_boolean'
+        db.alter_column('catalogue_productattributevalue', 'value_boolean', self.gf('django.db.models.fields.NullBooleanField')(null=True))
+
+
+    def backwards(self, orm):
+        
+        # Changing field 'ProductAttributeValue.value_boolean'
+        db.alter_column('catalogue_productattributevalue', 'value_boolean', self.gf('django.db.models.fields.BooleanField')())
+
+
+    models = {
+        'catalogue.attributeentity': {
+            'Meta': {'object_name': 'AttributeEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entities'", 'to': "orm['catalogue.AttributeEntityType']"})
+        },
+        'catalogue.attributeentitytype': {
+            'Meta': {'object_name': 'AttributeEntityType'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'})
+        },
+        'catalogue.attributeoption': {
+            'Meta': {'object_name': 'AttributeOption'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'options'", 'to': "orm['catalogue.AttributeOptionGroup']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'option': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'catalogue.attributeoptiongroup': {
+            'Meta': {'object_name': 'AttributeOptionGroup'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'catalogue.category': {
+            'Meta': {'ordering': "['full_name']", 'object_name': 'Category'},
+            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '1024', 'db_index': 'True'})
+        },
+        'catalogue.contributor': {
+            'Meta': {'object_name': 'Contributor'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'})
+        },
+        'catalogue.contributorrole': {
+            'Meta': {'object_name': 'ContributorRole'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'name_plural': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'})
+        },
+        'catalogue.option': {
+            'Meta': {'object_name': 'Option'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'Required'", 'max_length': '128'})
+        },
+        'catalogue.product': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Product'},
+            'attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.ProductAttribute']", 'through': "orm['catalogue.ProductAttributeValue']", 'symmetrical': 'False'}),
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Category']", 'through': "orm['catalogue.ProductCategory']", 'symmetrical': 'False'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'variants'", 'null': 'True', 'to': "orm['catalogue.Product']"}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductClass']", 'null': 'True'}),
+            'product_options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'recommended_products': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Product']", 'symmetrical': 'False', 'through': "orm['catalogue.ProductRecommendation']", 'blank': 'True'}),
+            'related_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'relations'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
+            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'upc': ('django.db.models.fields.CharField', [], {'max_length': '64', 'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'catalogue.productattribute': {
+            'Meta': {'ordering': "['code']", 'object_name': 'ProductAttribute'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
+            'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntityType']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'option_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOptionGroup']", 'null': 'True', 'blank': 'True'}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attributes'", 'null': 'True', 'to': "orm['catalogue.ProductClass']"}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'text'", 'max_length': '20'})
+        },
+        'catalogue.productattributevalue': {
+            'Meta': {'object_name': 'ProductAttributeValue'},
+            'attribute': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductAttribute']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attribute_values'", 'to': "orm['catalogue.Product']"}),
+            'value_boolean': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'value_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'value_entity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntity']", 'null': 'True', 'blank': 'True'}),
+            'value_float': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'value_integer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'value_option': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOption']", 'null': 'True', 'blank': 'True'}),
+            'value_richtext': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'catalogue.productcategory': {
+            'Meta': {'ordering': "['-is_canonical']", 'object_name': 'ProductCategory'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Category']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_canonical': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
+        },
+        'catalogue.productclass': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ProductClass'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'})
+        },
+        'catalogue.productcontributor': {
+            'Meta': {'object_name': 'ProductContributor'},
+            'contributor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Contributor']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
+            'role': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ContributorRole']", 'null': 'True', 'blank': 'True'})
+        },
+        'catalogue.productimage': {
+            'Meta': {'ordering': "['display_order']", 'unique_together': "(('product', 'display_order'),)", 'object_name': 'ProductImage'},
+            'caption': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display_order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'original': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': "orm['catalogue.Product']"})
+        },
+        'catalogue.productrecommendation': {
+            'Meta': {'object_name': 'ProductRecommendation'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'primary': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'primary_recommendations'", 'to': "orm['catalogue.Product']"}),
+            'ranking': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'recommendation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
+        }
+    }
+
+    complete_apps = ['catalogue']

oscar/apps/catalogue/signals.py

@@ -1,4 +1,6 @@
 import django.dispatch
 
 product_viewed = django.dispatch.Signal(providing_args=["product", "user", "request", "response"])
+
+# This needs to be moved into the search app when it is refactored
 product_search = django.dispatch.Signal(providing_args=["query", '"user'])

oscar/apps/catalogue/views.py

@@ -39,7 +39,7 @@ class ProductDetailView(DetailView):
 
         # Send signal to record the view of this product
         self.view_signal.send(sender=self, product=product, user=request.user, request=request, response=response)
-        return response;
+        return response
 
     def get_template_names(self):
         """

oscar/apps/checkout/forms.py

@@ -9,8 +9,9 @@ class ShippingAddressForm(forms.ModelForm):
         super(ShippingAddressForm,self ).__init__(*args, **kwargs)
         self.set_country_queryset() 
         
-    def set_country_queryset(self):    
-        self.fields['country'].queryset = get_model('address', 'country')._default_manager.filter(is_shipping_country=True)
+    def set_country_queryset(self):
+        self.fields['country'].queryset = get_model('address', 'country')._default_manager.filter(
+            is_shipping_country=True)
     
     class Meta:
         model = get_model('order', 'shippingaddress')

oscar/apps/checkout/signals.py

@@ -1,5 +1,4 @@
 from django.dispatch import Signal
 
 pre_payment = Signal(providing_args=["view"])
-post_payment = Signal(providing_args=["view"])
-order_placed = Signal(providing_args=["order"])
+post_payment = Signal(providing_args=["view"])

oscar/apps/checkout/utils.py

@@ -7,16 +7,16 @@ class CheckoutSessionData(object):
     Class responsible for marshalling all the checkout session data
     """
     SESSION_KEY = 'checkout_data'
-    
+
     def __init__(self, request):
         self.request = request
         if self.SESSION_KEY not in self.request.session:
             self.request.session[self.SESSION_KEY] = {}
-    
+
     def _check_namespace(self, namespace):
         if namespace not in self.request.session[self.SESSION_KEY]:
             self.request.session[self.SESSION_KEY][namespace] = {}
-          
+
     def _get(self, namespace, key, default=None):
         """
         Return session value or None
@@ -25,7 +25,7 @@ class CheckoutSessionData(object):
         if key in self.request.session[self.SESSION_KEY][namespace]:
             return self.request.session[self.SESSION_KEY][namespace][key]
         return default
-            
+
     def _set(self, namespace, key, value):
         """
         Set session value
@@ -33,7 +33,7 @@ class CheckoutSessionData(object):
         self._check_namespace(namespace)
         self.request.session[self.SESSION_KEY][namespace][key] = value
         self.request.session.modified = True
-        
+
     def _unset(self, namespace, key):
         """
         Unset session value
@@ -42,7 +42,11 @@ class CheckoutSessionData(object):
         if key in self.request.session[self.SESSION_KEY][namespace]:
             del self.request.session[self.SESSION_KEY][namespace][key]
             self.request.session.modified = True
-            
+
+    def _flush_namespace(self, namespace):
+        self.request.session[self.SESSION_KEY][namespace] = {}
+        self.request.session.modified = True
+
     def flush(self):
         """
         Delete session key
@@ -56,73 +60,73 @@ class CheckoutSessionData(object):
 
     def get_guest_email(self):
         return self._get('guest', 'email')
-        
-    # Shipping addresses    
+
+    # Shipping address
+    # ================
+    # Options:
+    # 1. No shipping required (eg digital products)
+    # 2. Ship to new address (entered in a form)
+    # 3. Ship to an addressbook address (address chosen from list)
 
     def reset_shipping_data(self):
-        self._unset('shipping', 'not_required')
-        self._unset('shipping', 'new_address_fields')
-        self._unset('shipping', 'user_address_id')
+        self._flush_namespace('shipping')
 
-    def no_shipping_required(self):
-        """
-        Record fact that basket doesn't require a shipping address or method
-        """
-        self.reset_shipping_data()
-        self._set('shipping', 'is_required', False)
-        
     def ship_to_user_address(self, address):
         """
         Set existing shipping address id to session and unset address fields from session
         """
         self.reset_shipping_data()
         self._set('shipping', 'user_address_id', address.id)
-        
+
     def ship_to_new_address(self, address_fields):
         """
         Set new shipping address details to session and unset shipping address id
         """
         self._unset('shipping', 'new_address_fields')
         self._set('shipping', 'new_address_fields', address_fields)
-        
+
     def new_shipping_address_fields(self):
         """
         Get shipping address fields from session
         """
         return self._get('shipping', 'new_address_fields')
-        
-    def user_address_id(self):
+
+    def shipping_user_address_id(self):
         """
         Get user address id from session
         """
         return self._get('shipping', 'user_address_id')
-
-    def is_shipping_required(self):
-        return self._get('shipping', 'is_required', True)
+    user_address_id = shipping_user_address_id
 
     def is_shipping_address_set(self):
+        """
+        Test whether a shipping address has been stored in the session.
+
+        This can be from a new address or re-using an existing address.
+        """
         new_fields = self.new_shipping_address_fields()
         has_new_address = new_fields is not None
         has_old_address = self.user_address_id() > 0
         return has_new_address or has_old_address
-    
-    # Shipping methods
-    
+
+    # Shipping method
+    # ===============
+
     def use_free_shipping(self):
         """
         Set "free shipping" code to session
         """
         self._set('shipping', 'method_code', '__free__')
-    
+
     def use_shipping_method(self, code):
         """
         Set shipping method code to session
         """
         self._set('shipping', 'method_code', code)
-        
+
     def shipping_method(self):
         """
-        Returns the shipping method model based on the 
+        Returns the shipping method model based on the
         data stored in the session.
         """
         code = self._get('shipping', 'method_code')
@@ -132,50 +136,77 @@ class CheckoutSessionData(object):
 
     def is_shipping_method_set(self):
         return bool(self._get('shipping', 'method_code'))
-    
+
     # Billing address fields
-    
+    # ======================
+    #
+    # There are 3 common options:
+    # 1. Billing address is entered manually through a form
+    # 2. Billing address is selected from address book
+    # 3. Billing address is the same as the shipping address
+
     def bill_to_new_address(self, address_fields):
         """
         Store address fields for a billing address.
         """
+        self._flush_namespace('billing')
         self._set('billing', 'new_address_fields', address_fields)
-    
-    def new_billing_address_fields(self):
+
+    def bill_to_user_address(self, address):
         """
-        Return fields for a billing address
+        Set an address from a user's address book as the billing address
+
+        :address: The address object
         """
-        return self._get('billing', 'new_address_fields')
-    
-    def billing_address_same_as_shipping(self):
+        self._flush_namespace('billing')
+        self._set('billing', 'user_address_id', address.id)
+
+    def bill_to_shipping_address(self):
         """
         Record fact that the billing address is to be the same as
         the shipping address.
         """
-        self._set('payment', 'billing_address_same_as_shipping', True)
-        
+        self._flush_namespace('billing')
+        self._set('billing', 'billing_address_same_as_shipping', True)
+
+    # Legacy method name
+    billing_address_same_as_shipping = bill_to_shipping_address
+
     def is_billing_address_same_as_shipping(self):
-        return self._get('payment', 'billing_address_same_as_shipping', False)
-    
+        return self._get('billing', 'billing_address_same_as_shipping', False)
+
+    def billing_user_address_id(self):
+        """
+        Return the ID of the user address being used for billing
+        """
+        return self._get('billing', 'user_address_id')
+
+    def new_billing_address_fields(self):
+        """
+        Return fields for a billing address
+        """
+        return self._get('billing', 'new_address_fields')
+
     # Payment methods
-    
+    # ===============
+
     def pay_by(self, method):
         self._set('payment', 'method', method)
-        
+
     def payment_method(self):
         return self._get('payment', 'method')
-    
+
     # Submission methods
-    
+
     def set_order_number(self, order_number):
         self._set('submission', 'order_number', order_number)
-        
+
     def get_order_number(self):
-        return self._get('submission', 'order_number')    
-    
+        return self._get('submission', 'order_number')
+
     def set_submitted_basket(self, basket):
         self._set('submission', 'basket_id', basket.id)
-        
+
     def get_submitted_basket_id(self):
         return self._get('submission', 'basket_id')
-        
+

oscar/apps/checkout/views.py

@@ -43,7 +43,7 @@ logger = logging.getLogger('oscar.checkout')
 class CheckoutSessionMixin(object):
     """
     Mixin to provide common functionality shared between checkout views.
-    """   
+    """
 
     def dispatch(self, request, *args, **kwargs):
         self.checkout_session = CheckoutSessionData(request)
@@ -52,9 +52,9 @@ class CheckoutSessionMixin(object):
     def get_shipping_address(self):
         """
         Return the current shipping address for this checkout session.
-        
+
         This could either be a ShippingAddress model which has been
-        pre-populated (not saved), or a UserAddress model which will 
+        pre-populated (not saved), or a UserAddress model which will
         need converting into a ShippingAddress model at submission
         """
         addr_data = self.checkout_session.new_shipping_address_fields()
@@ -70,7 +70,7 @@ class CheckoutSessionMixin(object):
                 # session data that refers to addresses that no longer exist
                 pass
         return None
-        
+
     def get_shipping_method(self, basket=None):
         method = self.checkout_session.shipping_method()
         if method:
@@ -81,7 +81,7 @@ class CheckoutSessionMixin(object):
             # We default to using free shipping
             method = Free()
         return method
-    
+
     def get_order_totals(self, basket=None, shipping_method=None, **kwargs):
         """
         Returns the total for the order with and without tax (as a tuple)
@@ -94,22 +94,22 @@ class CheckoutSessionMixin(object):
         total_incl_tax = calc.order_total_incl_tax(basket, shipping_method, **kwargs)
         total_excl_tax = calc.order_total_excl_tax(basket, shipping_method, **kwargs)
         return total_incl_tax, total_excl_tax
-    
+
     def get_context_data(self, **kwargs):
         """
         Assign common template variables to the context.
         """
         ctx = super(CheckoutSessionMixin, self).get_context_data(**kwargs)
         ctx['shipping_address'] = self.get_shipping_address()
-        
+
         method = self.get_shipping_method()
         if method:
             ctx['shipping_method'] = method
             ctx['shipping_total_excl_tax'] = method.basket_charge_excl_tax()
             ctx['shipping_total_incl_tax'] = method.basket_charge_incl_tax()
-            
+
         ctx['order_total_incl_tax'], ctx['order_total_excl_tax'] = self.get_order_totals()
-        
+
         return ctx
 
 
@@ -162,20 +162,25 @@ class IndexView(CheckoutSessionMixin, FormView):
 class ShippingAddressView(CheckoutSessionMixin, FormView):
     """
     Determine the shipping address for the order.
-    
+
     The default behaviour is to display a list of addresses from the users's
     address book, from which the user can choose one to be their shipping address.
     They can add/edit/delete these USER addresses.  This address will be
     automatically converted into a SHIPPING address when the user checks out.
-    
+
     Alternatively, the user can enter a SHIPPING address directly which will be
     saved in the session and saved as a model when the order is sucessfully submitted.
     """
-    
+
     template_name = 'checkout/shipping_address.html'
     form_class = ShippingAddressForm
-    
+
     def get(self, request, *args, **kwargs):
+        # Check that the user's basket is not empty
+        if request.basket.is_empty:
+            messages.error(request, _("You need to add some items to your basket to checkout"))
+            return HttpResponseRedirect(reverse('basket:summary'))
+
         # Check that guests have entered an email address
         if not request.user.is_authenticated() and not self.checkout_session.get_guest_email():
             messages.error(request, _("Please either sign in or enter your email address"))
@@ -183,35 +188,25 @@ class ShippingAddressView(CheckoutSessionMixin, FormView):
 
         # Check to see that a shipping address is actually required.  It may not be if
         # the basket is purely downloads
-        if not self.does_basket_require_shipping(request.basket):
+        if not request.basket.is_shipping_required():
             messages.info(request, _("Your basket does not require a shipping address to be submitted"))
-            self.checkout_session.no_shipping_required()
             return HttpResponseRedirect(self.get_success_url())
 
         return super(ShippingAddressView, self).get(request, *args, **kwargs)
 
-    def does_basket_require_shipping(self, basket):
-        """
-        Test whether the contents of the basket require shipping
-        """
-        for line in basket.all_lines():
-            if line.product.is_shipping_required:
-                return True
-        return False
-
     def get_initial(self):
         return self.checkout_session.new_shipping_address_fields()
-    
+
     def get_context_data(self, **kwargs):
         kwargs = super(ShippingAddressView, self).get_context_data(**kwargs)
         if self.request.user.is_authenticated():
             # Look up address book data
             kwargs['addresses'] = self.get_available_addresses()
         return kwargs
-    
+
     def get_available_addresses(self):
         return UserAddress._default_manager.filter(user=self.request.user).order_by('-is_default_for_shipping')
-    
+
     def post(self, request, *args, **kwargs):
         # Check if a shipping address was selected directly (eg no form was filled in)
         if self.request.user.is_authenticated and 'address_id' in self.request.POST:
@@ -228,15 +223,15 @@ class ShippingAddressView(CheckoutSessionMixin, FormView):
                 return HttpResponseBadRequest()
         else:
             return super(ShippingAddressView, self).post(request, *args, **kwargs)
-    
+
     def form_valid(self, form):
         # Store the address details in the session and redirect to next step
         self.checkout_session.ship_to_new_address(form.clean())
         return super(ShippingAddressView, self).form_valid(form)
-    
+
     def get_success_url(self):
         return reverse('checkout:shipping-method')
-    
+
 
 class UserAddressCreateView(CheckoutSessionMixin, CreateView):
     """
@@ -252,7 +247,7 @@ class UserAddressCreateView(CheckoutSessionMixin, CreateView):
         kwargs = super(UserAddressCreateView, self).get_context_data(**kwargs)
         kwargs['form_url'] = reverse('checkout:user-address-create')
         return kwargs
-    
+
     def form_valid(self, form):
         self.object = form.save(commit=False)
         self.object.user = self.request.user
@@ -263,15 +258,15 @@ class UserAddressCreateView(CheckoutSessionMixin, CreateView):
         messages.info(self.request, _("Address saved"))
         # We redirect back to the shipping address page
         return HttpResponseRedirect(reverse('checkout:shipping-address'))
-    
-    
+
+
 class UserAddressUpdateView(CheckoutSessionMixin, UpdateView):
     """
     Update a user address
     """
     template_name = 'checkout/user_address_form.html'
     form_class = UserAddressForm
-    
+
     def get_queryset(self):
         return UserAddress._default_manager.filter(user=self.request.user)
 
@@ -283,8 +278,8 @@ class UserAddressUpdateView(CheckoutSessionMixin, UpdateView):
     def get_success_url(self):
         messages.info(self.request, _("Address saved"))
         return reverse('checkout:shipping-address')
-    
-    
+
+
 class UserAddressDeleteView(CheckoutSessionMixin, DeleteView):
     """
     Delete an address from a user's addressbook.
@@ -293,34 +288,39 @@ class UserAddressDeleteView(CheckoutSessionMixin, DeleteView):
 
     def get_queryset(self):
         return UserAddress._default_manager.filter(user=self.request.user)
-    
+
     def get_success_url(self):
         messages.info(self.request, _("Address deleted"))
         return reverse('checkout:shipping-address')
-    
 
-# ===============    
+
+# ===============
 # Shipping method
-# ===============    
-    
+# ===============
+
 
 class ShippingMethodView(CheckoutSessionMixin, TemplateView):
     """
     View for allowing a user to choose a shipping method.
-    
+
     Shipping methods are largely domain-specific and so this view
     will commonly need to be subclassed and customised.
-    
+
     The default behaviour is to load all the available shipping methods
-    using the shipping Repository.  If there is only 1, then it is 
+    using the shipping Repository.  If there is only 1, then it is
     automatically selected.  Otherwise, a page is rendered where
     the user can choose the appropriate one.
     """
     template_name = 'checkout/shipping_methods.html';
-    
+
     def get(self, request, *args, **kwargs):
+        # Check that the user's basket is not empty
+        if request.basket.is_empty:
+            messages.error(request, _("You need to add some items to your basket to checkout"))
+            return HttpResponseRedirect(reverse('basket:summary'))
+
         # Check that shipping is required at all
-        if not self.checkout_session.is_shipping_required():
+        if not request.basket.is_shipping_required():
             self.checkout_session.use_shipping_method(NoShippingRequired().code)
             return self.get_success_response()
 
@@ -354,13 +354,13 @@ class ShippingMethodView(CheckoutSessionMixin, TemplateView):
         """
         Returns all applicable shipping method objects
         for a given basket.
-        """ 
+        """
         # Shipping methods can depend on the user, the contents of the basket
         # and the shipping address.  I haven't come across a scenario that doesn't
         # fit this system.
-        return Repository().get_shipping_methods(self.request.user, self.request.basket, 
+        return Repository().get_shipping_methods(self.request.user, self.request.basket,
                                                  self.get_shipping_address())
-    
+
     def post(self, request, *args, **kwargs):
         # Need to check that this code is valid for this user
         method_code = request.POST.get('method_code', None)
@@ -376,7 +376,7 @@ class ShippingMethodView(CheckoutSessionMixin, TemplateView):
         # and continue to the next step.
         self.checkout_session.use_shipping_method(method_code)
         return self.get_success_response()
-        
+
     def get_success_response(self):
         return HttpResponseRedirect(reverse('checkout:payment-method'))
 
@@ -389,23 +389,29 @@ class ShippingMethodView(CheckoutSessionMixin, TemplateView):
 class PaymentMethodView(CheckoutSessionMixin, TemplateView):
     """
     View for a user to choose which payment method(s) they want to use.
-    
+
     This would include setting allocations if payment is to be split
     between multiple sources.
     """
-    
+
     def get(self, request, *args, **kwargs):
+        # Check that the user's basket is not empty
+        if request.basket.is_empty:
+            messages.error(request, _("You need to add some items to your basket to checkout"))
+            return HttpResponseRedirect(reverse('basket:summary'))
+
         # Check that shipping address has been completed
-        if self.checkout_session.is_shipping_required() and not self.checkout_session.is_shipping_address_set():
+        if request.basket.is_shipping_required() and not self.checkout_session.is_shipping_address_set():
             messages.error(request, _("Please choose a shipping address"))
             return HttpResponseRedirect(reverse('checkout:shipping-address'))
+
         # Check that shipping method has been set
         if not self.checkout_session.is_shipping_method_set():
             messages.error(request, _("Please choose a shipping method"))
             return HttpResponseRedirect(reverse('checkout:shipping-method'))
 
         return self.get_success_response()
-    
+
     def get_success_response(self):
         return HttpResponseRedirect(reverse('checkout:payment-details'))
 
@@ -427,24 +433,24 @@ class OrderPlacementMixin(CheckoutSessionMixin):
     _payment_events = None
 
     # Default code for the email to send after successful checkout
-    communication_type_code = 'ORDER_PLACED' 
-    
-    def handle_order_placement(self, order_number, basket, total_incl_tax, total_excl_tax, **kwargs): 
+    communication_type_code = 'ORDER_PLACED'
+
+    def handle_order_placement(self, order_number, basket, total_incl_tax, total_excl_tax, **kwargs):
         """
         Write out the order models and return the appropriate HTTP response
-        
+
         We deliberately pass the basket in here as the one tied to the request
         isn't necessarily the correct one to use in placing the order.  This can
         happen when a basket gets frozen.
-        """   
+        """
         order = self.place_order(order_number, basket, total_incl_tax, total_excl_tax, **kwargs)
         basket.set_as_submitted()
         return self.handle_successful_order(order)
-        
+
     def add_payment_source(self, source):
         if self._payment_sources is None:
             self._payment_sources = []
-        self._payment_sources.append(source)  
+        self._payment_sources.append(source)
 
     def add_payment_event(self, event_type_name, amount):
         event_type, n = PaymentEventType.objects.get_or_create(name=event_type_name)
@@ -452,25 +458,25 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             self._payment_events = []
         event = PaymentEvent(event_type=event_type, amount=amount)
         self._payment_events.append(event)
-        
-    def handle_successful_order(self, order):  
+
+    def handle_successful_order(self, order):
         """
         Handle the various steps required after an order has been successfully placed.
 
         Override this view if you want to perform custom actions when an
         order is submitted.
-        """  
+        """
         # Send confirmation message (normally an email)
         self.send_confirmation_message(order)
-        
+
         # Flush all session data
         self.checkout_session.flush()
-        
+
         # Save order id in session so thank-you page can load it
         self.request.session['checkout_order_id'] = order.id
 
         return HttpResponseRedirect(reverse('checkout:thank-you'))
-    
+
     def place_order(self, order_number, basket, total_incl_tax, total_excl_tax, **kwargs):
         """
         Writes the order out to the DB including the payment models
@@ -501,20 +507,20 @@ class OrderPlacementMixin(CheckoutSessionMixin):
                                            **kwargs)
         self.save_payment_details(order)
         return order
-    
+
     def create_shipping_address(self):
         """
         Create and returns the shipping address for the current order.
-        
+
         If the shipping address was entered manually, then we simply
         write out a ShippingAddress model with the appropriate form data.  If
         the user is authenticated, then we create a UserAddress from this data
-        too so it can be re-used in the future. 
-        
+        too so it can be re-used in the future.
+
         If the shipping address was selected from the user's address book,
         then we convert the UserAddress to a ShippingAddress.
         """
-        if not self.checkout_session.is_shipping_required():
+        if not self.request.basket.is_shipping_required():
             return None
 
         addr_data = self.checkout_session.new_shipping_address_fields()
@@ -527,16 +533,16 @@ class OrderPlacementMixin(CheckoutSessionMixin):
         else:
             raise AttributeError("No shipping address data found")
         return addr
-    
+
     def create_shipping_address_from_form_fields(self, addr_data):
         """Creates a shipping address model from the saved form fields"""
         shipping_addr = ShippingAddress(**addr_data)
-        shipping_addr.save() 
+        shipping_addr.save()
         return shipping_addr
-    
+
     def create_user_address(self, addr_data):
         """
-        For signed-in users, we create a user address model which will go 
+        For signed-in users, we create a user address model which will go
         into their address book.
         """
         if self.request.user.is_authenticated():
@@ -548,19 +554,19 @@ class OrderPlacementMixin(CheckoutSessionMixin):
                 UserAddress._default_manager.get(hash=user_addr.generate_hash())
             except ObjectDoesNotExist:
                 user_addr.save()
-    
+
     def create_shipping_address_from_user_address(self, addr_id):
         """Creates a shipping address from a user address"""
         address = UserAddress._default_manager.get(pk=addr_id)
-        # Increment the number of orders to help determine popularity of orders 
+        # Increment the number of orders to help determine popularity of orders
         address.num_orders += 1
         address.save()
-        
+
         shipping_addr = ShippingAddress()
         address.populate_alternative_model(shipping_addr)
         shipping_addr.save()
         return shipping_addr
-    
+
     def create_billing_address(self, shipping_address=None):
         """
         Saves any relevant billing data (eg a billing address).
@@ -569,12 +575,12 @@ class OrderPlacementMixin(CheckoutSessionMixin):
 
     def save_payment_details(self, order):
         """
-        Saves all payment-related details. This could include a billing 
+        Saves all payment-related details. This could include a billing
         address, payment sources and any order payment events.
         """
         self.save_payment_events(order)
         self.save_payment_sources(order)
-    
+
     def save_payment_events(self, order):
         """
         Saves any relevant payment events for this order
@@ -588,8 +594,8 @@ class OrderPlacementMixin(CheckoutSessionMixin):
     def save_payment_sources(self, order):
         """
         Saves any payment sources used in this order.
-        
-        When the payment sources are created, the order model does not exist and 
+
+        When the payment sources are created, the order model does not exist and
         so they need to have it set before saving.
         """
         if not self._payment_sources:
@@ -597,14 +603,14 @@ class OrderPlacementMixin(CheckoutSessionMixin):
         for source in self._payment_sources:
             source.order = order
             source.save()
-    
+
     def get_initial_order_status(self, basket):
         return None
-        
+
     def get_submitted_basket(self):
         basket_id = self.checkout_session.get_submitted_basket_id()
         return Basket._default_manager.get(pk=basket_id)
-    
+
     def restore_frozen_basket(self):
         """
         Restores a frozen basket as the sole OPEN basket.  Note that this also merges
@@ -645,8 +651,8 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             CommunicationEvent._default_manager.create(order=order, event_type=event_type)
             messages = event_type.get_messages(ctx)
 
-        if messages and messages['body']:      
-            logger.info("Order #%s - sending %s messages", order.number, code)  
+        if messages and messages['body']:
+            logger.info("Order #%s - sending %s messages", order.number, code)
             dispatcher = Dispatcher(logger)
             dispatcher.dispatch_order_messages(order, messages, event_type, **kwargs)
         else:
@@ -656,11 +662,11 @@ class OrderPlacementMixin(CheckoutSessionMixin):
 class PaymentDetailsView(OrderPlacementMixin, TemplateView):
     """
     For taking the details of payment and creating the order
-    
+
     The class is deliberately split into fine-grained methods, responsible for only one
     thing.  This is to make it easier to subclass and override just one component of
     functionality.
-    
+
     Almost all projects will need to subclass and customise this class.
     """
     template_name = 'checkout/payment_details.html'
@@ -671,8 +677,12 @@ class PaymentDetailsView(OrderPlacementMixin, TemplateView):
         return [self.template_name_preview] if self.preview else [self.template_name]
 
     def get_error_response(self):
+        # Check that the user's basket is not empty
+        if self.request.basket.is_empty:
+            messages.error(self.request, _("You need to add some items to your basket to checkout"))
+            return HttpResponseRedirect(reverse('basket:summary'))
         # Check that shipping address has been completed
-        if self.checkout_session.is_shipping_required() and not self.checkout_session.is_shipping_address_set():
+        if self.request.basket.is_shipping_required() and not self.checkout_session.is_shipping_address_set():
             messages.error(self.request, _("Please choose a shipping address"))
             return HttpResponseRedirect(reverse('checkout:shipping-address'))
         # Check that shipping method has been set
@@ -685,7 +695,7 @@ class PaymentDetailsView(OrderPlacementMixin, TemplateView):
         if error_response:
             return error_response
         return super(PaymentDetailsView, self).get(request, *args, **kwargs)
-    
+
     def post(self, request, *args, **kwargs):
         """
         This method is designed to be overridden by subclasses which will
@@ -693,6 +703,7 @@ class PaymentDetailsView(OrderPlacementMixin, TemplateView):
         then the method can call submit()
         """
         error_response = self.get_error_response()
+        
         if error_response:
             return error_response
         if self.preview:
@@ -745,7 +756,7 @@ class PaymentDetailsView(OrderPlacementMixin, TemplateView):
     def submit(self, basket, payment_kwargs=None, order_kwargs=None):
         """
         Submit a basket for order placement.
-        
+
         The process runs as follows:
          * Generate an order number
          * Freeze the basket so it cannot be modified any more.
@@ -762,7 +773,7 @@ class PaymentDetailsView(OrderPlacementMixin, TemplateView):
         # Next, check that basket isn't empty
         if basket.is_empty:
             messages.error(self.request, _("This order cannot be submitted as the basket is empty"))
-            url = self.request.META.get('HTTP_REFERER', reverse('checkout:shipping-address'))
+            url = self.request.META.get('HTTP_REFERER', reverse('basket:summary'))
             return HttpResponseRedirect(url)
 
         # Domain-specific checks on the basket
@@ -772,17 +783,17 @@ class PaymentDetailsView(OrderPlacementMixin, TemplateView):
             return HttpResponseRedirect(url)
 
         # We generate the order number first as this will be used
-        # in payment requests (ie before the order model has been 
+        # in payment requests (ie before the order model has been
         # created).  We also save it in the session for multi-stage
         # checkouts (eg where we redirect to a 3rd party site and place
         # the order on a different request).
         order_number = self.generate_order_number(basket)
         logger.info("Order #%s: beginning submission process for basket %d", order_number, basket.id)
-        
+
         self.freeze_basket(basket)
         self.checkout_session.set_submitted_basket(basket)
-        
-        # Handle payment.  Any payment problems should be handled by the 
+
+        # Handle payment.  Any payment problems should be handled by the
         # handle_payment method raise an exception, which should be caught
         # within handle_POST and the appropriate forms redisplayed.
         try:
@@ -821,7 +832,7 @@ class PaymentDetailsView(OrderPlacementMixin, TemplateView):
             msg = unicode(e)
             self.restore_frozen_basket()
             return self.render_to_response(self.get_context_data(error=msg))
-    
+
     def generate_order_number(self, basket):
         generator = OrderNumberGenerator()
         order_number = generator.order_number(basket)
@@ -834,11 +845,11 @@ class PaymentDetailsView(OrderPlacementMixin, TemplateView):
         # need to be "unfrozen".  We also store the basket ID in the session
         # so the it can be retrieved by multistage checkout processes.
         basket.freeze()
-    
+
     def handle_payment(self, order_number, total, **kwargs):
         """
-        Handle any payment processing.  
-        
+        Handle any payment processing.
+
         This method is designed to be overridden within your project.  The
         default is to do nothing.
         """
@@ -862,7 +873,7 @@ class ThankYouView(DetailView):
     """
     template_name = 'checkout/thank_you.html'
     context_object_name = 'order'
-    
+
     def get_object(self):
         # We allow superusers to force an order thankyou page for testing
         order = None
@@ -871,11 +882,11 @@ class ThankYouView(DetailView):
                 order = Order._default_manager.get(number=self.request.GET['order_number'])
             elif 'order_id' in self.request.GET:
                 order = Order._default_manager.get(id=self.request.GET['orderid'])
-        
+
         if not order:
             if 'checkout_order_id' in self.request.session:
                 order = Order._default_manager.get(pk=self.request.session['checkout_order_id'])
             else:
                 raise Http404(_("No order found"))
-        
+
         return order

oscar/apps/customer/utils.py

@@ -8,8 +8,7 @@ CommunicationEvent = get_model('order', 'CommunicationEvent')
 Email = get_model('customer', 'Email')
 
 
-class Dispatcher(object):
-
+class Dispatcher(object): 
     def __init__(self, logger=None):
         if not logger:
             logger = logging.getLogger(__name__)
@@ -24,7 +23,7 @@ class Dispatcher(object):
         if messages['subject'] and messages['body']:
             self.send_email_messages(recipient, messages)
     
-    def dispatch_order_messages(self, order, messages, event_type, **kwargs):
+    def dispatch_order_messages(self, order, messages, event_type=None, **kwargs):
         """
         Dispatch order-related messages to the customer
         """

oscar/apps/dashboard/catalogue/forms.py

@@ -70,8 +70,65 @@ class StockRecordForm(forms.ModelForm):
         exclude = ('product', 'num_allocated', 'price_currency')
 
 
+def _attr_text_field(attribute):
+    return forms.CharField(label=attribute.name,
+                           required=attribute.required)
+
+def _attr_integer_field(attribute):
+    return forms.IntegerField(label=attribute.name,
+                              required=attribute.required)
+
+def _attr_boolean_field(attribute):
+    return forms.BooleanField(label=attribute.name,
+                              required=attribute.required)
+
+def _attr_float_field(attribute):
+    return forms.FloatField(label=attribute.name,
+                            required=attribute.required)
+
+def _attr_date_field(attribute):
+    return forms.DateField(label=attribute.name,
+                           required=attribute.required,
+                           widget=forms.widgets.DateInput)
+
+def _attr_option_field(attribute):
+    return forms.ModelChoiceField(
+        label=attribute.name,
+        required=attribute.required,
+        queryset=attribute.option_group.options.all())
+
+def _attr_multi_option_field(attribute):
+    return forms.ModelMultipleChoiceField(
+        label=attribute.name,
+        required=attribute.required,
+        queryset=attribute.option_group.options.all())
+
+def _attr_entity_field(attribute):
+    return forms.ModelChoiceField(
+        label=attribute.name,
+        required=attribute.required,
+        queryset=attribute.entity_type.entities.all())
+
+def _attr_numeric_field(attribute):
+    return forms.FloatField(label=attribute.name,
+                            required=attribute.required)
+
+
 class ProductForm(forms.ModelForm):
 
+    FIELD_FACTORIES = {
+        "text": _attr_text_field,
+        "richtext": _attr_text_field,
+        "integer": _attr_integer_field,
+        "boolean": _attr_boolean_field,
+        "float": _attr_float_field,
+        "date": _attr_date_field,
+        "option": _attr_option_field,
+        "multi_option" : _attr_multi_option_field,
+        "entity": _attr_entity_field,
+        "numeric" : _attr_numeric_field,
+    }
+
     def __init__(self, product_class, *args, **kwargs):
         self.product_class = product_class
         self.set_initial_attribute_values(kwargs)
@@ -91,68 +148,13 @@ class ProductForm(forms.ModelForm):
             else:
                 kwargs['initial']['attr_%s' % attribute.code] = value
 
-    def _attr_text_field(self, attribute):
-        return forms.CharField(label=attribute.name,
-                               required=attribute.required)
-
-    def _attr_integer_field(self, attribute):
-        return forms.IntegerField(label=attribute.name,
-                                  required=attribute.required)
-
-    def _attr_boolean_field(self, attribute):
-        return forms.BooleanField(label=attribute.name,
-                                  required=attribute.required)
-
-    def _attr_float_field(self, attribute):
-        return forms.FloatField(label=attribute.name,
-                                required=attribute.required)
-
-    def _attr_date_field(self, attribute):
-        return forms.DateField(label=attribute.name,
-                               required=attribute.required,
-                               widget=forms.widgets.SelectDateWidget)
-
-    def _attr_option_field(self, attribute):
-        return forms.ModelChoiceField(
-            label=attribute.name,
-            required=attribute.required,
-            queryset=attribute.option_group.options.all())
-
-    def _attr_multi_option_field(self, attribute):
-        return forms.ModelMultipleChoiceField(
-            label=attribute.name,
-            required=attribute.required,
-            queryset=attribute.option_group.options.all())
-
-    def _attr_entity_field(self, attribute):
-        return forms.ModelChoiceField(
-            label=attribute.name,
-            required=attribute.required,
-            queryset=attribute.entity_type.entities.all())
-
-    def _attr_numeric_field(self, attribute):
-        return forms.FloatField(label=attribute.name,
-                                required=attribute.required)
-
-    FIELD_FACTORIES = {
-        "text": _attr_text_field,
-        "integer": _attr_integer_field,
-        "boolean": _attr_boolean_field,
-        "float": _attr_float_field,
-        "date": _attr_date_field,
-        "option": _attr_option_field,
-        "multi_option" : _attr_multi_option_field,
-        "entity": _attr_entity_field,
-        "numeric" : _attr_numeric_field,
-    }
-
     def add_attribute_fields(self):
         for attribute in self.product_class.attributes.all():
             self.fields['attr_%s' % attribute.code] = \
                     self.get_attribute_field(attribute)
 
     def get_attribute_field(self, attribute):
-        return self.FIELD_FACTORIES[attribute.type](self, attribute)
+        return self.FIELD_FACTORIES[attribute.type](attribute)
 
     class Meta:
         model = Product

oscar/apps/dashboard/catalogue/views.py

@@ -120,7 +120,7 @@ class ProductCreateView(generic.CreateView):
         image_formset = ProductImageFormSet(self.request.POST,
                                             self.request.FILES,
                                             instance=product)
-        if stockrecord_form.is_valid() and category_formset.is_valid() and image_formset.is_valid():
+        if all([stockrecord_form.is_valid(), category_formset.is_valid(), image_formset.is_valid()]):
             # Save product
             product.save()
             # Save stock record
@@ -194,7 +194,7 @@ class ProductUpdateView(generic.UpdateView):
         image_formset = ProductImageFormSet(self.request.POST,
                                             self.request.FILES,
                                             instance=self.object)
-        if stockrecord_form.is_valid() and category_formset.is_valid() and image_formset.is_valid():
+        if all([stockrecord_form.is_valid(), category_formset.is_valid(), image_formset.is_valid()]):
             form.save()
             stockrecord_form.save()
             category_formset.save()

oscar/apps/partner/abstract_models.py

@@ -191,22 +191,27 @@ class AbstractStockRecord(models.Model):
     @property
     def availability_code(self):
         """
-        Return an item's availability as a code for use in CSS
+        Return an product's availability as a code for use in CSS to add icons
+        to the overall availability mark-up.  For example, "instock",
+        "unavailable".
         """
         return get_partner_wrapper(self.partner.name).availability_code(self)
     
     @property
     def availability(self):
         """
-        Return an item's availability as a string
+        Return a product's availability as a string that can be displayed to the
+        user.  For example, "In stock", "Unavailabl".
         """
         return get_partner_wrapper(self.partner.name).availability(self)
 
-    def max_purchase_quantity(self, user):
+    def max_purchase_quantity(self, user=None):
         """
         Return an item's availability as a string
+
+        :param user: (optional) The user who wants to purchase
         """
-        return get_partner_wrapper(self.partner.name).availability(self)
+        return get_partner_wrapper(self.partner.name).max_purchase_quantity(self, user)
     
     @property
     def dispatch_date(self):

oscar/apps/partner/tests/__init__.py

@@ -1,4 +0,0 @@
-from oscar.apps.partner.tests.models import *
-from oscar.apps.partner.tests.imports import *
-from oscar.apps.partner.tests.checkout import *
-from oscar.apps.partner.tests.wrappers import *

oscar/apps/partner/wrappers.py

@@ -47,6 +47,8 @@ class DefaultWrapper(object):
         Return a code for the availability of this product.
 
         This is normally used within CSS to add icons to stock messages
+
+        :param oscar.apps.partner.models.StockRecord stockrecord: stockrecord instance
         """
         if stockrecord.net_stock_level > 0:
             return 'instock'
@@ -55,6 +57,11 @@ class DefaultWrapper(object):
         return 'outofstock'
     
     def availability(self, stockrecord):
+        """
+        Return an availability message for the passed stockrecord.
+
+        :param oscar.apps.partner.models.StockRecord stockrecord: stockrecord instance
+        """
         if stockrecord.net_stock_level > 0:
             return _("In stock (%d available)" % stockrecord.net_stock_level)
         if self.is_available_to_buy(stockrecord):

oscar/apps/payment/tests/__init__.py

@@ -1,2 +0,0 @@
-from oscar.apps.payment.tests.main import *
-

oscar/apps/promotions/context_processors.py

@@ -25,6 +25,7 @@ def get_request_promotions(request):
     Return promotions relevant to this request
     """
     promotions = PagePromotion._default_manager.select_related() \
+                                               .prefetch_related('content_object') \
                                                .filter(page_url=request.path) \
                                                .order_by('display_order')
 

oscar/apps/promotions/models.py

@@ -247,8 +247,14 @@ class AutomaticProductList(AbstractProductList):
 
     def get_queryset(self):
         if self.method == self.BESTSELLING:
-            return Product.browsable.all().order_by('-score')
-        return Product.browsable.all().order_by('-date_created')
+            return (Product.browsable.all()
+                    .select_related('stockrecord__partner')
+                    .prefetch_related('variants', 'images')
+                    .order_by('-score'))
+        return (Product.browsable.all()
+                .select_related('stockrecord__partner')
+                .prefetch_related('variants', 'images')
+                .order_by('-date_created'))
 
     def get_products(self):
         return self.get_queryset()[:self.num_products]

oscar/apps/promotions/tests.py

@@ -1,61 +0,0 @@
-import httplib
-
-from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.core.urlresolvers import resolve
-from django.test import Client
-
-from oscar.apps.promotions.models import * 
-
-
-class PromotionTest(TestCase):
-
-    def test_default_template_name(self):
-        promotion = Image.objects.create(name="dummy banner")
-        self.assertEqual('promotions/image.html', promotion.template_name())
-
-
-
-
-
-#class PagePromotionTest(unittest.TestCase):
-#    
-#    def setUp(self):
-#        self.promotion = Promotion.objects.create(name='Dummy', link_url='http://www.example.com')
-#        self.page_prom = PagePromotion.objects.create(promotion=self.promotion,
-#                                                      position=RAW_HTML,
-#                                                      page_url='/')
-#    
-#    def test_clicks_start_at_zero(self):
-#        self.assertEquals(0, self.page_prom.clicks)
-#    
-#    def test_click_is_recorded(self):
-#        self.page_prom.record_click()
-#        self.assertEquals(1, self.page_prom.clicks)
-#
-#    def test_get_link(self):
-#        link = self.page_prom.get_link()
-#        match = resolve(link)
-#        self.assertEquals('page-click', match.url_name)
-#
-#
-#class KeywordPromotionTest(unittest.TestCase):
-#    
-#    def setUp(self):
-#        self.promotion = Promotion.objects.create(name='Dummy', link_url='http://www.example.com')
-#        self.kw_prom = KeywordPromotion.objects.create(promotion=self.promotion,
-#                                                       position=RAW_HTML,
-#                                                       keyword='cheese')
-#    
-#    def test_clicks_start_at_zero(self):
-#        self.assertEquals(0, self.kw_prom.clicks)
-#    
-#    def test_click_is_recorded(self):
-#        self.kw_prom.record_click()
-#        self.assertEquals(1, self.kw_prom.clicks)
-#        
-#    def test_get_link(self):
-#        link = self.kw_prom.get_link()
-#        match = resolve(link)
-#        self.assertEquals('keyword-click', match.url_name)
-        

oscar/apps/search/tests.py

@@ -1,42 +0,0 @@
-from django.test import TestCase, Client
-from django.core.urlresolvers import reverse
-
-from django.core import management
-from haystack import backend
-
-
-class SuggestViewTest(TestCase):
-    fixtures = ['sample-products']
-
-    def setUp(self):
-        #clear out existing index without prompting user and ensure that
-        #fixtures are indexed
-        self.client = Client()
-        sb = backend.SearchBackend()
-        sb.clear()
-        management.call_command('update_index', verbosity=0) #silenced
-
-    def test_term_in_fixtures_found(self):
-        url = reverse('oscar-search-suggest')
-        response = self.client.get(url, {'query_term': 'Pint'})
-        self.assertEquals(200, response.status_code)
-        self.assertTrue('Pint' in response.content) #ensuring we actually find a result in the response
-
-class MultiFacetedSearchViewTest(TestCase):
-    fixtures = ['sample-products']
-
-    def setUp(self):
-        #clear out existing index without prompting user and ensure that
-        #fixtures are indexed
-        self.client = Client()
-        sb = backend.SearchBackend()
-        sb.clear()
-        management.call_command('update_index', verbosity=0) #silenced
-
-    def test_with_query(self):
-        url = reverse('oscar-search')
-        response = self.client.get(url, {'q': 'Pint'})
-        self.assertEquals(200, response.status_code)
-        self.assertTrue('value="Pint"' in response.content) #ensuring query field is set
-    
-        

oscar/apps/shipping/repository.py

@@ -7,16 +7,16 @@ class Repository(object):
     Repository class responsible for returning ShippingMethod
     objects for a given user, basket etc
     """
-    
+
     def get_shipping_methods(self, user, basket, shipping_addr=None, **kwargs):
         """
         Return a list of all applicable shipping method objects
         for a given basket.
-        
+
         We default to returning the Method models that have been defined but
         this behaviour can easily be overridden by subclassing this class
         and overriding this method.
-        """ 
+        """
         methods = [Free()]
         return self.add_basket_to_methods(basket, methods)
 
@@ -24,7 +24,7 @@ class Repository(object):
         methods = self.get_shipping_methods(user, basket, shipping_addr, **kwargs)
         if len(methods) == 0:
             raise ImproperlyConfigured("You need to define some shipping methods")
-        return methods[0]
+        return min(methods, key=lambda method: method.basket_charge_incl_tax())
 
     def add_basket_to_methods(self, basket, methods):
         for method in methods:

oscar/apps/voucher/abstract_models.py

@@ -90,7 +90,10 @@ class AbstractVoucher(models.Model):
         """
         Records a usage of this voucher in an order.
         """
-        self.applications.create(voucher=self, order=order, user=user)
+        if user.is_authenticated():
+            self.applications.create(voucher=self, order=order, user=user)
+        else:
+            self.applications.create(voucher=self, order=order)
 
     @property
     def benefit(self):
@@ -102,6 +105,7 @@ class AbstractVoucherApplication(models.Model):
     For tracking how often a voucher has been used
     """
     voucher = models.ForeignKey('voucher.Voucher', related_name="applications")
+
     # It is possible for an anonymous user to apply a voucher so we need to allow
     # the user to be nullable
     user = models.ForeignKey('auth.User', blank=True, null=True)

oscar/core/loading.py

@@ -20,14 +20,14 @@ def get_class(module_label, classname):
 def get_classes(module_label, classnames):
     """
     For dynamically importing classes from a module.
-    
+
     Eg. calling get_classes('catalogue.models', ['Product']) will search
     INSTALLED_APPS for the relevant product app (default is
     'oscar.apps.catalogue') and then import the classes from there.  If the
     class can't be found in the overriding module, then we attempt to import it
-    from within oscar.  
-    
-    This is very similar to django.db.models.get_model although that is only 
+    from within oscar.
+
+    This is very similar to django.db.models.get_model although that is only
     for loading models while this method will load any class.
     """
     app_module_path = _get_app_module_path(module_label)
@@ -44,7 +44,7 @@ def get_classes(module_label, classnames):
     # App must be local - check if module is in local app (it could be in
     # oscar's)
     app_label = module_label.split('.')[0]
-    base_package = app_module_path.replace('.'+app_label, '')
+    base_package = app_module_path.rsplit('.'+app_label, 1)[0]
     local_app = "%s.%s" % (base_package, module_label)
     try:
         imported_local_module = __import__(local_app, fromlist=classnames)
@@ -74,7 +74,7 @@ def _pluck_classes(modules, classnames):
 
 
 def _get_app_module_path(module_label):
-    app_name = module_label.rsplit(".", 1)[0] 
+    app_name = module_label.rsplit(".", 1)[0]
     for installed_app in settings.INSTALLED_APPS:
         if installed_app.endswith(app_name):
             return installed_app
@@ -90,7 +90,7 @@ def import_module(module_label, classes, namespace=None):
         for classname, klass in zip(classes, klasses):
             namespace[classname] = klass
     else:
-        module = new_module("oscar.apps.%s" % module_label)   
+        module = new_module("oscar.apps.%s" % module_label)
         for classname, klass in zip(classes, klasses):
             setattr(module, classname, klass)
         return module

oscar/defaults.py

@@ -53,5 +53,7 @@ OSCAR_OFFER_BLACKLIST_PRODUCT = None
 # Max total number of items in basket
 OSCAR_MAX_BASKET_QUANTITY_THRESHOLD = None
 
-#Cookies
-OSCAR_COOKIES_DELETE_ON_LOGOUT = ['oscar_recently_viewed_products', ]
+# Cookies
+OSCAR_COOKIES_DELETE_ON_LOGOUT = ['oscar_recently_viewed_products', ]
+
+OSCAR_SETTINGS = dict([(k, v) for k, v in locals().items() if k.startswith('OSCAR_')])

oscar/static/oscar/js/oscar/checkout.js

@@ -27,11 +27,11 @@ oscar.basket = {
         }
     },
     showVoucherForm: function() {
-        $('#voucher_form_container').show(); 
+        $('#voucher_form_container').show();
         $('#voucher_form_link').hide();
     },
     hideVoucherForm: function() {
-        $('#voucher_form_container').hide(); 
+        $('#voucher_form_container').hide();
         $('#voucher_form_link').show();
     },
     checkAndSubmit: function($ele, formPrefix, idSuffix) {
@@ -48,8 +48,8 @@ oscar.basket = {
 oscar.checkout = {
     init: function() {
         // Disable 'place order' button when it is clicked.
-        $('#place-order').click(function(e) {
-            var $btn = $(this);
+        $('#place-order-form').submit(function() {
+            var $btn = $('button#place-order', this);
             $btn.attr('disabled', 'disabled')
                 .html('Submitting...')
                 .removeClass('btn-primary')

oscar/static/oscar/js/oscar/ui.js

@@ -193,4 +193,3 @@ $(document).ready(function()
     }
  
 });
-    

oscar/templates/basket/basket.html

@@ -64,7 +64,7 @@ Basket | {{ block.super }}
     	    <div class="span5">
     		    <div class="checkout-quantity">
     		        {{ form.quantity }} 
-    		        <button class="btn">Update</button>
+    		        <button class="btn" type="submit">Update</button>
     			    <a href="#" data-id="{{ forloop.counter0 }}" data-behaviours="remove" class="inline">Remove</a>
 					{% if request.user.is_authenticated %}
 					| <a href="#" data-id="{{ forloop.counter0 }}" data-behaviours="save" class="inline">Save for later</a>
@@ -97,7 +97,7 @@ Basket | {{ block.super }}
 	        		{% csrf_token %}
 	        		{% include "partials/form_fields.html" with form=voucher_form %}
 	        		<div class="form-actions">
-	        			<button class="btn btn-info">Add voucher</button>
+	        			<button type="submit" class="btn btn-info">Add voucher</button>
 	        			or <a href="#" id="voucher_form_cancel">cancel</a>
 	        		</div>
 	        	</form>

oscar/templates/checkout/preview.html

@@ -10,7 +10,7 @@ Order preview | {{ block.super }}
 
 {% block place_order %}
 <h3>Please review the information above, then click "Place Order"</h3>
-<form method="post" action="{% url checkout:preview %}">
+<form method="post" action="{% url checkout:preview %}" id="place-order-form">
 	<input type="hidden" name="action" value="place_order" />
 	{% csrf_token %}
     <div class="form-actions">

oscar/templates/customer/anon-order.html

@@ -8,8 +8,12 @@
 </div>
 {% endblock header %}
 
-
 {% block content %}
+<div class="sub-header">
+    <h3>Status</h3>
+</div>
+<p>{{ order.status }}</p>
+
 <div class="sub-header">
     <h3>Shipping address</h3>
 </div>

oscar/templates/dashboard/catalogue/product_update.html

@@ -50,6 +50,11 @@ Update product | {{ block.super }}
                 					<li>{{ error|escape }}</li>
                 				</ul>
                 			{% endfor %}
+                        {% if field.help_text %}
+                            <span class='help-block'>
+                                {{ field.help_text|safe }}
+                            </span>
+                        {% endif %}
                 	{% endif %}
             	</div>
             {% else %}
@@ -76,8 +81,8 @@ Update product | {{ block.super }}
             {% endif %}
         {% endfor %}
     </div>
-		
-	<div class="well form-inline">	
+
+	<div class="well form-inline">
 		<div class="sub-header">
 			<h3 class="app-ico ico_home icon">Category information</h3>
 		</div>
@@ -87,7 +92,7 @@ Update product | {{ block.super }}
     		<hr/>
     	{% endfor %}
 	</div>
-	
+
 	<div class="well form-inline">
     	<div class="sub-header">
     	   <h3 class="app-ico ico_favourite icon">Images</h3>
@@ -98,7 +103,7 @@ Update product | {{ block.super }}
     		<hr/>
     	{% endfor %}
 	</div>
-	
+
 	<div class="well fields-full">
 		<div class="sub-header">
 		    <h3 class="app-ico ico_shop_bag icon">Stock and price information</h3>
@@ -132,7 +137,7 @@ Update product | {{ block.super }}
 		{% endblock %}
 	</div>
 	<div class="form-actions">
-        <button class="btn btn-primary btn-large" type="submit">Save Product</button> or 
+        <button class="btn btn-primary btn-large" type="submit">Save Product</button> or
             <a href="{% url dashboard:catalogue-product-list %}">cancel</a>
             {% if product %}
                 <a class="btn btn-success btn-large pull-right" href="{{ product.get_absolute_url }}">View on site</a>

oscar/templates/dashboard/orders/order_detail.html

@@ -31,7 +31,7 @@ Order {{ order.number }} | {{ block.super }}
 
     <h3>Customer Information</h3>
 	{% if order.user %}
-	
+
     <div class="row-fluid">
         <div class="span4">
             <div class="well well-info">
@@ -85,12 +85,14 @@ Order {{ order.number }} | {{ block.super }}
 
 <div class="tabbable dashboard">
 	<ul class="nav nav-tabs">
+	{% block nav_tabs %}
 		<li class="active"><a href="#lines" data-toggle="tab">Order contents</a></li>
 		<li><a href="#shipping" data-toggle="tab">Shipping</a></li>
 		<li><a href="#payment" data-toggle="tab">Payment</a></li>
 		<li><a href="#discounts" data-toggle="tab">Discounts</a></li>
 		<li><a href="#emails" data-toggle="tab">Emails</a></li>
 		<li><a href="#notes" data-toggle="tab">Notes</a></li>
+	{% endblock nav_tabs %}
 	</ul>
 
 	<div class="tab-content">
@@ -207,7 +209,7 @@ Order {{ order.number }} | {{ block.super }}
 							</select>
 						</label>
 						<label class="radio inline">
-							with amount <input type="text" name="amount" value="" /> 
+							with amount <input type="text" name="amount" value="" />
 						</label>
 					</div>
 				</div>
@@ -338,16 +340,16 @@ Order {{ order.number }} | {{ block.super }}
 				<h3 class="app-ico ico_mapmarker icon">Payment sources</h3>
 			</div>
 			{% if sources %}
-				<table class="table table-striped table-bordered">    
-					<thead>  
+				<table class="table table-striped table-bordered">
+					<thead>
 						<tr>
 							<th>Source</th>
 							<th>Allocation</th>
 							<th>Amount debited</th>
 							<th>Amount refunded</th>
-						</tr>  
-					</thead>	
-					<tbody> 
+						</tr>
+					</thead>
+					<tbody>
 						{% for source in sources %}
 						<tr>
 							<td>{{ source.source_type }}</td>
@@ -356,7 +358,7 @@ Order {{ order.number }} | {{ block.super }}
 							<td>{{ source.amount_refunded|currency }}</td>
 						</tr>
 						{% endfor %}
-					</tbody>	
+					</tbody>
 				</table>
 			{% else %}
 				<p>No payment sources</p>
@@ -463,6 +465,8 @@ Order {{ order.number }} | {{ block.super }}
 			</form>
 			{% endblock %}
 		</div>
+
+		{% block extra_tabs %}{% endblock %}
 	</div>
 </div>
 

oscar/templates/dashboard/reviews/review_list.html

@@ -50,10 +50,18 @@ Reviews | {{ block.super }}
         <tr>
             <td><input type="checkbox" name="selected_review" class="selected_review" value="{{ review.id }}"/>
                 <td>
-                    <a href="{% url catalogue:reviews-detail review.product.slug review.product.id review.id %}">{{ review.title }}</a>
+					{% if review.product %}
+						<a href="{% url catalogue:reviews-detail review.product.slug review.product.id review.id %}">{{ review.title }}</a>
+					{% else %}
+						{{ review.title }}
+					{% endif %}
                 </td>
             <td>
-                <a href='{% url catalogue:detail review.product.slug review.product.id %}'>{{ review.product.title }}</a> </td>
+				{% if review.product %}
+					<a href='{% url catalogue:detail review.product.slug review.product.id %}'>{{ review.product.title }}</a> </td>
+				{% else %}
+					[Product deleted]
+				{% endif %}
             <td>
 				{% if review.user %}
                 <a href="{% url dashboard:user-detail review.user.id %}">{{ review.get_reviewer_name }}</a>

oscar/templates/dashboard/vouchers/voucher_delete.html

@@ -43,7 +43,7 @@ Delete voucher '{{ voucher.name }}'? | Vouchers | {{ block.super }}
 		{% csrf_token %}
 		<div class="form-actions">
 			<button class="btn btn-danger btn-large" type="submit">Delete</button> or
-			<a href="{% url dashboard:range-list %}">cancel</a>
+			<a href="{% url dashboard:voucher-list %}">cancel</a>
 		</div>
 	</form>
 

oscar/test/__init__.py

@@ -4,6 +4,7 @@ from contextlib import contextmanager
 from django.test import TestCase
 from django.test.client import Client
 from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
 from purl import URL
 
 
@@ -51,7 +52,10 @@ class ClientTestCase(TestCase):
             location = URL.from_string(response['Location'])
             self.assertEqual(expected_url, location.path())
 
-
+    def assertRedirectUrlName(self, response, name):
+        self.assertIsRedirect(response)
+        location = response['Location'].replace('http://testserver', '')
+        self.assertEqual(location, reverse(name))
 
     def assertIsOk(self, response):
         self.assertEqual(httplib.OK, response.status_code)

oscar/test/helpers.py

@@ -1,11 +1,6 @@
-from StringIO import StringIO
 from decimal import Decimal as D
 import random
-
-from django.test import TestCase
-from django.core.servers.basehttp import AdminMediaHandler
-from django.core.handlers.wsgi import WSGIHandler
-from django.core.urlresolvers import reverse
+import datetime
 
 from oscar.apps.basket.models import Basket
 from oscar.apps.catalogue.models import ProductClass, Product, ProductAttribute, ProductAttributeValue
@@ -14,9 +9,10 @@ from oscar.apps.order.utils import OrderCreator
 from oscar.apps.partner.models import Partner, StockRecord
 from oscar.apps.shipping.methods import Free
 from oscar.apps.offer.models import Range, ConditionalOffer, Condition, Benefit
+from oscar.apps.voucher.models import Voucher
 
 
-def create_product(price=None, title="Dummy title", product_class="Dummy item class", 
+def create_product(price=None, title="Dummy title", product_class="Dummy item class",
         partner="Dummy partner", partner_sku=None, upc=None, num_in_stock=10, attributes=None):
     """
     Helper method for creating products that are used in tests.
@@ -72,6 +68,9 @@ def create_order(number=None, basket=None, user=None, shipping_address=None, shi
 
 
 def create_offer():
+    """
+    Helper method for creating an offer
+    """
     range = Range.objects.create(name="All products range", includes_all_products=True)
     condition = Condition.objects.create(range=range,
                                          type=Condition.COUNT,
@@ -79,7 +78,7 @@ def create_offer():
     benefit = Benefit.objects.create(range=range,
                                      type=Benefit.PERCENTAGE,
                                      value=20)
-    offer= ConditionalOffer.objects.create(
+    offer = ConditionalOffer.objects.create(
         name='Dummy offer',
         offer_type='Site',
         condition=condition,
@@ -88,53 +87,15 @@ def create_offer():
     return offer
 
 
-
-
-class TwillTestCase(TestCase):
+def create_voucher():
     """
-    Simple wrapper around Twill to make writing TestCases easier.
-
-    Commands availabel through self.command are:
-    - go        -> visit a URL
-    - back      -> back to previous URL
-    - reload    -> reload URL
-    - follow    -> follow a given link
-    - code      -> assert the HTTP response code
-    - find      -> assert page contains some string
-    - notfind   -> assert page does not contain
-    - title     -> assert page title
+    Helper method for creating a voucher
     """
-
-    HOST = '127.0.0.1'
-    PORT = 8080
-
-    def setUp(self):
-        app = AdminMediaHandler(WSGIHandler())
-        twill.add_wsgi_intercept(self.HOST, self.PORT, lambda: app)
-        twill.set_output(StringIO())
-        self.command = twill.commands
-
-    def tearDown(self):
-        twill.remove_wsgi_intercept(self.HOST, self.PORT)
-
-    def reverse(self, url_name, *args, **kwargs):
-        """
-        Custom 'reverse' function that includes the protocol and host
-        """
-        return 'http://%s:%d%s' % (self.HOST, self.PORT, reverse(url_name, *args, **kwargs))
-
-    def visit(self, url_name, *args,**kwargs):
-        self.command.go(self.reverse(url_name, *args, **kwargs))
-
-    def assertResponseCodeIs(self, code):
-        self.command.code(code)
-
-    def assertPageContains(self, regexp):
-        self.command.find(regexp)
-
-    def assertPageDoesNotContain(self, regexp):
-        self.command.notfind(regexp)
-
-    def assertPageTitleMatches(self, regexp):
-        self.command.title(regexp)
-
+    voucher = Voucher.objects.create(
+        name="Test voucher",
+        code="test",
+        start_date=datetime.date.today(),
+        end_date=datetime.date.today() + datetime.timedelta(days=12)
+    )
+    voucher.offers.add(create_offer())
+    return voucher

oscar/tests.py

@@ -1,38 +0,0 @@
-from django.test import TestCase
-
-from oscar.apps.address.tests import *
-from oscar.apps.basket.tests import *
-from oscar.apps.order.tests import *
-from oscar.apps.catalogue.tests import *
-from oscar.apps.partner.tests import *
-from oscar.apps.checkout.tests import *
-from oscar.apps.payment.tests import *
-from oscar.apps.offer.tests import *
-from oscar.apps.shipping.tests import *
-from oscar.apps.customer.tests import *
-from oscar.apps.promotions.tests import *
-from oscar.apps.catalogue.reviews.tests import *
-from oscar.apps.voucher.tests import *
-from oscar.apps.partner.tests import *
-from oscar.apps.dashboard.tests import *
-
-from oscar.core.tests import *
-from oscar.core.logging.tests import *
-
-import oscar
-
-
-class OscarTests(TestCase):
-
-    def test_app_list_exists(self):
-        core_apps = oscar.OSCAR_CORE_APPS
-        self.assertTrue('oscar' in core_apps)
-
-    def test_app_list_can_be_accessed_through_fn(self):
-        core_apps = oscar.get_core_apps()
-        self.assertTrue('oscar' in core_apps)
-
-    def test_app_list_can_be_accessed_with_overrides(self):
-        apps = oscar.get_core_apps(overrides=['apps.shipping'])
-        self.assertTrue('apps.shipping' in apps)
-        self.assertTrue('oscar.apps.shipping' not in apps)

pre-commit.sh

@@ -4,7 +4,7 @@ git stash --keep-index -q
 
 source ~/.virtualenvs/oscar/bin/activate
 
-./run_tests.py
+./runtests.py
 TEST_RESULT=$?
 
 jshint oscar/static/oscar/js/oscar

requirements.txt

@@ -3,7 +3,7 @@ Werkzeug==0.6.2
 coverage==3.5.1
 django-debug-toolbar==0.9.4
 django-dynamic-fixture==1.4.2
-django-extensions==0.8
+django-extensions==0.9
 docutils==0.8.1
 flake8==0.8
 ipdb==0.2
@@ -14,3 +14,6 @@ PyHamcrest==1.6
 South==0.7.3
 purl==0.3.2
 django-sorting==0.1
+pinocchio==0.3.1
+nose-progressive==1.3
+django-nose==1.1

run_tests.py → runtests.py

@@ -4,21 +4,24 @@ import logging
 from optparse import OptionParser
 from coverage import coverage
 
-import tests.config
+# This configures the settings
+from tests.config import configure
+configure()
 
-from django.test.simple import DjangoTestSuiteRunner
+from django_nose import NoseTestSuiteRunner
 
 logging.disable(logging.CRITICAL)
 
 
 def run_tests(verbosity, *test_args):
-    test_runner = DjangoTestSuiteRunner(verbosity=verbosity)
+    test_runner = NoseTestSuiteRunner(verbosity=verbosity)
     if not test_args:
-        test_args = ['oscar']
+        test_args = ['tests']
     num_failures = test_runner.run_tests(test_args)
     if num_failures:
         sys.exit(num_failures)
 
+
 if __name__ == '__main__':
     parser = OptionParser()
     parser.add_option('-c', '--coverage', dest='use_coverage', default=False,
@@ -36,5 +39,4 @@ if __name__ == '__main__':
         print 'Generate HTML reports'
         c.html_report()
     else:
-        print 'Running tests'
         run_tests(options.verbosity, *args)

tests/config.py

@@ -4,14 +4,14 @@ from django.conf import settings, global_settings
 from oscar import OSCAR_CORE_APPS
 
 
-if not settings.configured:
-    from oscar.defaults import *
-    oscar_settings = dict([(k, v) for k, v in locals().items() if k.startswith('OSCAR_')])
+def configure():
+    if not settings.configured:
+        from oscar.defaults import OSCAR_SETTINGS
 
-    # Helper function to extract absolute path
-    location = lambda x: os.path.join(os.path.dirname(os.path.realpath(__file__)), x)
+        # Helper function to extract absolute path
+        location = lambda x: os.path.join(os.path.dirname(os.path.realpath(__file__)), x)
 
-    settings.configure(
+        settings.configure(
             DATABASES={
                 'default': {
                     'ENGINE': 'django.db.backends.sqlite3',
@@ -49,12 +49,13 @@ if not settings.configured:
                 'oscar.apps.customer.auth_backends.Emailbackend',
                 'django.contrib.auth.backends.ModelBackend',
                 ),
-            ROOT_URLCONF='tests.urls',
+            ROOT_URLCONF='tests.site.urls',
             LOGIN_REDIRECT_URL='/accounts/',
             DEBUG=False,
             SITE_ID=1,
             HAYSTACK_SEARCH_ENGINE='dummy',
             HAYSTACK_SITECONF = 'oscar.search_sites',
             APPEND_SLASH=True,
-            **oscar_settings
+            NOSE_ARGS=['-s', '-x', '--with-spec'],
+            **OSCAR_SETTINGS
         )

oscar/apps/basket/tests.py → tests/functional/basket_tests.py

@@ -2,41 +2,35 @@ from decimal import Decimal as D
 import httplib
 import datetime
 
-from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.conf import settings
 from django.test import TestCase, Client
-from django.http import HttpResponse
+from django.core.urlresolvers import reverse
 
-from oscar.apps.basket.models import Basket, Line
 from oscar.test.helpers import create_product
-from oscar.apps.basket.reports import (
-    OpenBasketReportGenerator, SubmittedBasketReportGenerator)
+from oscar.apps.basket.models import Basket
+from oscar.apps.basket import reports
 
 
-class BasketModelTest(TestCase):
+class BasketMergingTests(TestCase):
 
     def setUp(self):
-        self.basket = Basket.objects.create()
-        self.dummy_product = create_product()
+        self.product = create_product()
+        self.user_basket = Basket()
+        self.user_basket.add_product(self.product)
+        self.cookie_basket = Basket()
+        self.cookie_basket.add_product(self.product, 2)
+        self.user_basket.merge(self.cookie_basket, add_quantities=False)
 
-    def test_empty_baskets_have_zero_lines(self):
-        self.assertTrue(Basket().num_lines == 0)
+    def test_cookie_basket_has_status_set(self):
+        self.assertEqual('Merged', self.cookie_basket.status)
 
-    def test_new_baskets_are_empty(self):
-        self.assertTrue(Basket().is_empty)
+    def test_lines_are_moved_across(self):
+        self.assertEqual(1, self.user_basket.lines.all().count())
 
-    def test_basket_have_with_one_line(self):
-        Line.objects.create(basket=self.basket, product=self.dummy_product)
-        self.assertTrue(self.basket.num_lines == 1)
-
-    def test_add_product_creates_line(self):
-        self.basket.add_product(self.dummy_product)
-        self.assertTrue(self.basket.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.num_items, 10)
+    def test_merge_line_takes_max_quantity(self):
+        line = self.user_basket.lines.get(product=self.product)
+        self.assertEqual(2, line.quantity)
 
 
 class AnonAddToBasketViewTests(TestCase):
@@ -47,6 +41,7 @@ class AnonAddToBasketViewTests(TestCase):
         post_params = {'product_id': self.product.id,
                        'action': 'add',
                        'quantity': 1}
+        self.client = Client()
         self.response = self.client.post(url, post_params)
 
     def test_cookie_is_created(self):
@@ -109,6 +104,7 @@ class BasketThresholdTest(TestCase):
         self.assertTrue('Your basket currently has 2 items.' in
                         response.cookies['messages'].value)
 
+
 class BasketReportTests(TestCase):
 
     def test_open_report_doesnt_error(self):
@@ -117,7 +113,7 @@ class BasketReportTests(TestCase):
             'end_date': datetime.date(2012, 5, 17),
             'formatter': 'CSV'
         }
-        generator = OpenBasketReportGenerator(**data)
+        generator = reports.OpenBasketReportGenerator(**data)
         generator.generate()
 
     def test_submitted_report_doesnt_error(self):
@@ -126,11 +122,12 @@ class BasketReportTests(TestCase):
             'end_date': datetime.date(2012, 5, 17),
             'formatter': 'CSV'
         }
-        generator = SubmittedBasketReportGenerator(**data)
+        generator = reports.SubmittedBasketReportGenerator(**data)
         generator.generate()
 
 
 class SavedBasketTests(TestCase):
+
     def test_moving_from_saved_basket(self):
         user = User.objects.create_user(username='test', password='pass',
                                         email='test@example.com')

tests/functional/catalogue_tests.py

@@ -0,0 +1,21 @@
+import httplib
+
+from django.test import TestCase
+from django.test.client import Client
+from django.core.urlresolvers import reverse
+
+from oscar.test.helpers import create_product
+
+
+class SingleProductViewTest(TestCase):
+    
+    def setUp(self):
+        self.client = Client()
+        
+    def test_canonical_urls_are_enforced(self):
+        p = create_product()
+        args = {'product_slug': 'wrong-slug',
+                'pk': p.id}
+        wrong_url = reverse('catalogue:detail', kwargs=args)
+        response = self.client.get(wrong_url)
+        self.assertEquals(httplib.MOVED_PERMANENTLY, response.status_code)

oscar/apps/checkout/tests.py → tests/functional/checkout_tests.py

@@ -5,14 +5,24 @@ from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.utils.importlib import import_module
 
-from oscar.test.helpers import create_product
+from oscar.test.helpers import create_product, create_voucher
 from oscar.test import ClientTestCase, patch_settings
 from oscar.apps.basket.models import Basket
 from oscar.apps.order.models import Order
+from oscar.apps.address.models import Country
 
 
 class CheckoutMixin(object):
-    fixtures = ['countries.json']
+
+    def add_product_to_basket(self):
+        product = create_product(price=D('12.00'))
+        self.client.post(reverse('basket:add'), {'product_id': product.id,
+                                                 'quantity': 1})
+
+    def add_voucher_to_basket(self):
+        voucher = create_voucher()
+        self.client.post(reverse('basket:vouchers-add'),
+                         {'code': voucher.code})
 
     def complete_guest_email_form(self, email='test@example.com'):
         response = self.client.post(reverse('checkout:index'),
@@ -21,6 +31,10 @@ class CheckoutMixin(object):
         self.assertIsRedirect(response)
 
     def complete_shipping_address(self):
+        Country.objects.get_or_create(
+            iso_3166_1_a2='GB',
+            is_shipping_country=True
+        )
         response = self.client.post(reverse('checkout:shipping-address'),
                                      {'last_name': 'Doe',
                                       'line1': '1 Egg Street',
@@ -32,9 +46,8 @@ class CheckoutMixin(object):
     def complete_shipping_method(self):
         self.client.get(reverse('checkout:shipping-method'))
 
-    def assertRedirectUrlName(self, response, name):
-        location = response['Location'].replace('http://testserver', '')
-        self.assertEqual(location, reverse(name))
+    def submit(self):
+        return self.client.post(reverse('checkout:preview'), {'action': 'place_order'})
 
 
 class DisabledAnonymousCheckoutViewsTests(ClientTestCase):
@@ -96,8 +109,13 @@ class EnabledAnonymousCheckoutViewsTests(ClientTestCase, CheckoutMixin):
             self.assertEqual('barry@example.com', order.guest_email)
 
 
-class ShippingAddressViewTests(ClientTestCase):
+class TestShippingAddressView(ClientTestCase, CheckoutMixin):
     fixtures = ['countries.json']
+
+    def test_pages_returns_200(self):
+        self.add_product_to_basket()
+        response = self.client.get(reverse('checkout:shipping-address'))
+        self.assertIsOk(response)
     
     def test_anon_checkout_disabled_by_default(self):
         self.assertFalse(settings.OSCAR_ALLOW_ANON_CHECKOUT)
@@ -115,49 +133,72 @@ class ShippingAddressViewTests(ClientTestCase):
         self.assertEqual('1 Egg Street', session_address['line1'])
         self.assertEqual('N1 9RT', session_address['postcode'])
 
+    def test_user_must_have_a_nonempty_basket(self):
+        response = self.client.get(reverse('checkout:shipping-address'))
+        self.assertRedirectUrlName(response, 'basket:summary')
 
-class ShippingMethodViewTests(ClientTestCase, CheckoutMixin):
+
+class TestShippingMethodView(ClientTestCase, CheckoutMixin):
     fixtures = ['countries.json']
 
     def test_shipping_method_view_redirects_if_no_shipping_address(self):
+        self.add_product_to_basket()
         response = self.client.get(reverse('checkout:shipping-method'))
         self.assertIsRedirect(response)
         self.assertRedirectUrlName(response, 'checkout:shipping-address')
 
     def test_redirects_by_default(self):
+        self.add_product_to_basket()
         self.complete_shipping_address()
         response = self.client.get(reverse('checkout:shipping-method'))
         self.assertRedirectUrlName(response, 'checkout:payment-method')
 
+    def test_user_must_have_a_nonempty_basket(self):
+        response = self.client.get(reverse('checkout:shipping-method'))
+        self.assertRedirectUrlName(response, 'basket:summary')
 
-class PaymentMethodViewTests(ClientTestCase, CheckoutMixin):
+
+class TestPaymentMethodView(ClientTestCase, CheckoutMixin):
 
     def test_view_redirects_if_no_shipping_address(self):
+        self.add_product_to_basket() 
         response = self.client.get(reverse('checkout:payment-method'))
         self.assertIsRedirect(response)
         self.assertRedirectUrlName(response, 'checkout:shipping-address')
 
     def test_view_redirects_if_no_shipping_method(self):
+        self.add_product_to_basket() 
         self.complete_shipping_address()
         response = self.client.get(reverse('checkout:payment-method'))
         self.assertIsRedirect(response)
         self.assertRedirectUrlName(response, 'checkout:shipping-method')
 
+    def test_user_must_have_a_nonempty_basket(self):
+        response = self.client.get(reverse('checkout:payment-method'))
+        self.assertRedirectUrlName(response, 'basket:summary')
+
 
-class PreviewViewTests(ClientTestCase, CheckoutMixin):
+class TestPreviewView(ClientTestCase, CheckoutMixin):
+
+    def test_user_must_have_a_nonempty_basket(self):
+        response = self.client.get(reverse('checkout:preview'))
+        self.assertRedirectUrlName(response, 'basket:summary')
 
     def test_view_redirects_if_no_shipping_address(self):
+        self.add_product_to_basket()
         response = self.client.get(reverse('checkout:preview'))
         self.assertIsRedirect(response)
         self.assertRedirectUrlName(response, 'checkout:shipping-address')
 
     def test_view_redirects_if_no_shipping_method(self):
+        self.add_product_to_basket()
         self.complete_shipping_address()
         response = self.client.get(reverse('checkout:preview'))
         self.assertIsRedirect(response)
         self.assertRedirectUrlName(response, 'checkout:shipping-method')
 
     def test_ok_response_if_previous_steps_complete(self):
+        self.add_product_to_basket()
         self.complete_shipping_address()
         self.complete_shipping_method()
         response = self.client.get(reverse('checkout:preview'))
@@ -166,23 +207,27 @@ class PreviewViewTests(ClientTestCase, CheckoutMixin):
 
 class PaymentDetailsViewTests(ClientTestCase, CheckoutMixin):
 
+    def test_user_must_have_a_nonempty_basket(self):
+        response = self.client.get(reverse('checkout:payment-details'))
+        self.assertRedirectUrlName(response, 'basket:summary')
+
     def test_view_redirects_if_no_shipping_address(self):
+        self.add_product_to_basket()
         response = self.client.post(reverse('checkout:payment-details'))
         self.assertIsRedirect(response)
         self.assertRedirectUrlName(response, 'checkout:shipping-address')
 
     def test_view_redirects_if_no_shipping_method(self):
+        self.add_product_to_basket()
         self.complete_shipping_address()
         response = self.client.post(reverse('checkout:payment-details'))
         self.assertIsRedirect(response)
         self.assertRedirectUrlName(response, 'checkout:shipping-method')
 
     def test_placing_order_with_empty_basket_redirects(self):
-        self.complete_shipping_address()
-        self.complete_shipping_method()
         response = self.client.post(reverse('checkout:preview'), {'action': 'place_order'})
         self.assertIsRedirect(response)
-        self.assertRedirectUrlName(response, 'checkout:shipping-address')
+        self.assertRedirectUrlName(response, 'basket:summary')
 
 
 class OrderPlacementTests(ClientTestCase, CheckoutMixin):
@@ -206,3 +251,21 @@ class OrderPlacementTests(ClientTestCase, CheckoutMixin):
         self.assertIsRedirect(self.response)
         orders = Order.objects.all()
         self.assertEqual(1, len(orders))
+        
+
+class TestAnonUserOrderPlacementScenarios(ClientTestCase, CheckoutMixin):
+
+    def test_basic_submission_gets_redirect_to_thankyou(self):
+        self.add_product_to_basket()
+        self.complete_shipping_address()
+        self.complete_shipping_method()
+        response = self.submit()
+        self.assertRedirectUrlName(response, 'checkout:thank-you')
+
+    def test_submission_using_voucher(self):
+        self.add_product_to_basket()
+        self.add_voucher_to_basket()
+        self.complete_shipping_address()
+        self.complete_shipping_method()
+        response = self.submit()
+        self.assertRedirectUrlName(response, 'checkout:thank-you')

oscar/apps/customer/tests.py → tests/functional/customer_tests.py

@@ -1,12 +1,11 @@
 import httplib
 
 from django.test.client import Client
+from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.http import HttpRequest
-from django.core.urlresolvers import reverse
-from django.contrib.auth.models import User
 
-from oscar.apps.customer.models import CommunicationEventType
 from oscar.apps.customer.history_helpers import get_recently_viewed_product_ids
 from oscar.test.helpers import create_product, create_order
 
@@ -28,22 +27,6 @@ class HistoryHelpersTest(TestCase):
         self.assertTrue(self.product.id in get_recently_viewed_product_ids(request))
 
 
-class CommunicationTypeTest(TestCase):
-    keys = ('body', 'html', 'sms', 'subject')
-
-    def test_no_templates_returns_empty_string(self):
-        et = CommunicationEventType()
-        messages = et.get_messages()
-        for key in self.keys:
-            self.assertEqual('', messages[key])
-
-    def test_field_template_render(self):
-        et = CommunicationEventType(email_subject_template='Hello {{ name }}')
-        ctx = {'name': 'world'}
-        messages = et.get_messages(ctx)
-        self.assertEqual('Hello world', messages['subject'])
-
-
 class AnonOrderDetail(TestCase):
 
     def setUp(self):

oscar/apps/dashboard/tests.py → tests/functional/dashboard_tests.py

@@ -2,16 +2,6 @@ from decimal import Decimal as D
 
 from django.core.urlresolvers import reverse
 
-from oscar.apps.dashboard.orders.tests import *
-from oscar.apps.dashboard.reports.tests import *
-from oscar.apps.dashboard.users.tests import *
-from oscar.apps.dashboard.promotions.tests import *
-from oscar.apps.dashboard.catalogue.tests import *
-from oscar.apps.dashboard.pages.tests import *
-from oscar.apps.dashboard.offers.tests import *
-from oscar.apps.dashboard.ranges.tests import *
-from oscar.apps.dashboard.reviews.tests import *
-
 from oscar.apps.dashboard.views import IndexView
 from oscar.test import ClientTestCase
 from oscar.test.helpers import create_order

oscar/apps/address/tests.py → tests/unit/address_tests.py

@@ -8,17 +8,16 @@ from oscar.apps.order.models import ShippingAddress
 
 
 class UserAddressTest(TestCase):
-    fixtures = ['countries.json']
     
     def setUp(self):
         self.user = User.objects.create(username='dummy_user')
-        self.country = Country.objects.get(iso_3166_1_a2='GB')
+        self.country = Country(iso_3166_1_a2='GB', name="UNITED KINGDOM")
     
     def tearDown(self):
         self.user.delete()
     
     def test_titleless_salutation_is_stripped(self):
-        a = UserAddress.objects.create(last_name='Barrington', line1="75 Smith Road", postcode="N4 8TY", 
+        a = UserAddress(last_name='Barrington', line1="75 Smith Road", postcode="N4 8TY", 
                                        country=self.country, user=self.user)
         self.assertEquals("Barrington", a.salutation())
     
@@ -67,10 +66,9 @@ class UserAddressTest(TestCase):
     def test_hashing_with_utf8(self):
         a = UserAddress(first_name=u"\u0141ukasz Smith", last_name=u'Smith', line1=u"75 Smith Road", postcode=u"n4 8ty", 
                         country=self.country, user=self.user)
-        hash = a.active_address_fields()
+        a.active_address_fields()
         
     def test_city_is_alias_of_line4(self):
-        a = UserAddress.objects.create(last_name='Barrington', line1="75 Smith Road", line4="London", postcode="n4 8ty", 
+        a = UserAddress(last_name='Barrington', line1="75 Smith Road", line4="London", postcode="n4 8ty", 
                                        country=self.country, user=self.user)
         self.assertEqual('London', a.city)
-           

tests/unit/basket_tests.py

@@ -0,0 +1,54 @@
+import datetime
+
+from django.test import TestCase
+
+from oscar.apps.basket.models import Basket, Line
+from oscar.test.helpers import create_product
+from oscar.apps.basket.reports import (
+    OpenBasketReportGenerator, SubmittedBasketReportGenerator)
+
+
+class BasketModelTest(TestCase):
+
+    def setUp(self):
+        self.basket = Basket.objects.create()
+        self.dummy_product = create_product()
+
+    def test_empty_baskets_have_zero_lines(self):
+        self.assertTrue(Basket().num_lines == 0)
+
+    def test_new_baskets_are_empty(self):
+        self.assertTrue(Basket().is_empty)
+
+    def test_basket_have_with_one_line(self):
+        Line.objects.create(basket=self.basket, product=self.dummy_product)
+        self.assertTrue(self.basket.num_lines == 1)
+
+    def test_add_product_creates_line(self):
+        self.basket.add_product(self.dummy_product)
+        self.assertTrue(self.basket.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.num_items, 10)
+
+
+class BasketReportTests(TestCase):
+
+    def test_open_report_doesnt_error(self):
+        data = {
+            'start_date': datetime.date(2012, 5, 1),
+            'end_date': datetime.date(2012, 5, 17),
+            'formatter': 'CSV'
+        }
+        generator = OpenBasketReportGenerator(**data)
+        generator.generate()
+
+    def test_submitted_report_doesnt_error(self):
+        data = {
+            'start_date': datetime.date(2012, 5, 1),
+            'end_date': datetime.date(2012, 5, 17),
+            'formatter': 'CSV'
+        }
+        generator = SubmittedBasketReportGenerator(**data)
+        generator.generate()

oscar/apps/catalogue/tests.py → tests/unit/catalogue_tests.py

@@ -1,26 +1,40 @@
-from django.test import TestCase, Client
+from django.test import TestCase
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
-from django.conf import settings
 
 from oscar.apps.catalogue.models import Product, ProductClass, Category, \
         ProductAttribute
 from oscar.apps.catalogue.categories import create_from_breadcrumbs
 
 
-class CategoryTests(TestCase):
+class TestProductClassModel(TestCase):
+
+    def test_slug_is_auto_created(self):
+        books = ProductClass.objects.create(
+            name="Book",
+        )
+        self.assertEqual('book', books.slug)
+
+    def test_has_attribute_for_whether_shipping_is_required(self):
+        ""
+        ProductClass.objects.create(
+            name="Download",
+            requires_shipping=False
+        )
+
+
+class TestCategoryFactory(TestCase):
 
     def setUp(self):
         Category.objects.all().delete()
     
-    def test_creating_category_root(self):
+    def test_can_create_single_level_category(self):
         trail = 'Books'
         category = create_from_breadcrumbs(trail)
         self.assertIsNotNone(category)
         self.assertEquals(category.name, 'Books')
         self.assertEquals(category.slug, 'books')      
     
-    def test_creating_parent_and_child_categories(self):
+    def test_can_create_parent_and_child_categories(self):
         trail = 'Books > Science-Fiction'
         category = create_from_breadcrumbs(trail)
         
@@ -31,20 +45,20 @@ class CategoryTests(TestCase):
         self.assertEquals(2, Category.objects.count())
         self.assertEquals(category.slug, 'books/science-fiction')
         
-    def test_creating_multiple_categories(self):
+    def test_can_create_multiple_categories(self):
         trail = 'Books > Science-Fiction > Star Trek'
         create_from_breadcrumbs(trail)
         trail = 'Books > Factual > Popular Science'
-        category = create_from_breadcrumbs(trail)        
+        category = create_from_breadcrumbs(trail)
         
         self.assertIsNotNone(category)
         self.assertEquals(category.name, 'Popular Science')
         self.assertEquals(category.get_depth(), 3)
-        self.assertEquals(category.get_parent().name, 'Factual')        
+        self.assertEquals(category.get_parent().name, 'Factual')
         self.assertEquals(5, Category.objects.count())
         self.assertEquals(category.slug, 'books/factual/popular-science', )        
 
-    def test_alternative_separator_can_be_used(self):
+    def test_can_use_alternative_separator(self):
         trail = 'Food|Cheese|Blue'
         create_from_breadcrumbs(trail, separator='|')
         self.assertEquals(3, len(Category.objects.all()))
@@ -141,11 +155,11 @@ class VariantProductTests(ProductTests):
         self.parent = Product.objects.create(title="Parent product", product_class=self.product_class)
     
     def test_variant_products_dont_need_titles(self):
-        p = Product.objects.create(parent=self.parent, product_class=self.product_class)
+        Product.objects.create(parent=self.parent, product_class=self.product_class)
         
     def test_variant_products_dont_need_a_product_class(self):
-        p = Product.objects.create(parent=self.parent)
-        
+        Product.objects.create(parent=self.parent)
+       
     def test_variant_products_inherit_parent_titles(self):
         p = Product.objects.create(parent=self.parent, product_class=self.product_class)
         self.assertEquals("Parent product", p.get_title())
@@ -153,18 +167,3 @@ class VariantProductTests(ProductTests):
     def test_variant_products_inherit_product_class(self):
         p = Product.objects.create(parent=self.parent)
         self.assertEquals("Clothing", p.get_product_class().name)
-
-
-class SingleProductViewTest(TestCase):
-    fixtures = ['sample-products']
-    
-    def setUp(self):
-        self.client = Client()
-        
-    def test_canonical_urls_are_enforced(self):
-        p = Product.objects.get(id=1)
-        args = {'product_slug': 'wrong-slug',
-                'pk': p.id}
-        wrong_url = reverse('catalogue:detail', kwargs=args)
-        response = self.client.get(wrong_url)
-        self.assertEquals(301, response.status_code)

tests/unit/checkout_tests.py

@@ -0,0 +1,43 @@
+from django.test import TestCase
+from django.test.client import RequestFactory
+from django.contrib.sessions.middleware import SessionMiddleware
+import mock
+
+from oscar.apps.checkout.utils import CheckoutSessionData
+
+
+class TestCheckoutSession(TestCase):
+    """
+    oscar.apps.checkout.utils.CheckoutSessionData
+    """
+
+    def setUp(self):
+        request = RequestFactory().get('/')
+        SessionMiddleware().process_request(request)
+        self.session_data = CheckoutSessionData(request)
+
+    def test_allows_data_to_be_written_and_read_out(self):
+        self.session_data._set('namespace', 'key', 'value')
+        self.assertEqual('value', self.session_data._get('namespace', 'key'))
+
+    def test_allows_set_data_can_be_unset(self):
+        self.session_data._set('namespace', 'key', 'value')
+        self.session_data._unset('namespace', 'key')
+        self.assertIsNone(self.session_data._get('namespace', 'key'))
+
+    def test_stores_guest_email(self):
+        self.session_data.set_guest_email('a@a.com')
+        self.assertEquals('a@a.com', self.session_data.get_guest_email())
+
+    def test_allows_a_namespace_to_be_flushed(self):
+        self.session_data._set('ns', 'a', 1)
+        self.session_data._set('ns', 'b', 2)
+        self.session_data._flush_namespace('ns')
+        self.assertIsNone(self.session_data._get('ns', 'a'))
+        self.assertIsNone(self.session_data._get('ns', 'b'))
+
+    def test_allows_bill_to_user_address(self):
+        address = mock.Mock()
+        address.id = 1
+        self.session_data.bill_to_user_address(address)
+        self.assertEqual(1, self.session_data.billing_user_address_id())

oscar/core/tests.py → tests/unit/core_tests.py

@@ -4,6 +4,7 @@ from django.conf import settings
 
 from django.contrib.flatpages.models import FlatPage
 
+import oscar
 from oscar.core.loading import import_module, AppNotFoundError, \
         get_classes, get_class, ClassNotFoundError
 from oscar.core.validators import ExtendedURLValidator
@@ -11,36 +12,42 @@ from oscar.core.validators import URLDoesNotExistValidator
 from oscar.test import patch_settings
 
 
-class ImportAppTests(TestCase):
+class TestImportModule(TestCase):
+    """
+    oscar.core.loading.import_module
+    """
 
-    def test_a_specified_class_is_imported_correctly(self):
+    def test_imports_a_class_correctly(self):
         module = import_module('analytics.models', ['ProductRecord'])
         self.assertEqual('oscar.apps.analytics.models', module.__name__)
 
-    def test_unknown_apps_raise_exception(self):
+    def test_raises_exception_for_unknown_app(self):
         self.assertRaises(AppNotFoundError, import_module, 'banana', ['skin'])
 
 
-class ClassLoadingTests(TestCase):
+class TestClassLoading(TestCase):
+    """
+    Oscar's class loading utilities
+    """
 
-    def test_loading_oscar_classes(self):
+    def test_load_oscar_classes_correctly(self):
         Product, Category = get_classes('catalogue.models', ('Product', 'Category'))
         self.assertEqual('oscar.apps.catalogue.models', Product.__module__)
         self.assertEqual('oscar.apps.catalogue.models', Category.__module__)
 
-    def test_loading_oscar_class(self):
+    def test_load_oscar_class_correctly(self):
         Product = get_class('catalogue.models', 'Product')
         self.assertEqual('oscar.apps.catalogue.models', Product.__module__)
 
-    def test_loading_oscar_class_from_dashboard_subapp(self):
+    def test_load_oscar_class_from_dashboard_subapp(self):
         ReportForm = get_class('dashboard.reports.forms', 'ReportForm')
         self.assertEqual('oscar.apps.dashboard.reports.forms', ReportForm.__module__)
 
-    def test_bad_appname_raises_exception(self):
+    def test_raise_exception_when_bad_appname_used(self):
         with self.assertRaises(AppNotFoundError):
             get_classes('fridge.models', ('Product', 'Category'))
 
-    def test_bad_classname_raises_exception(self):
+    def test_raise_exception_when_bad_classname_used(self):
         with self.assertRaises(ClassNotFoundError):
             get_class('catalogue.models', 'Monkey')
 
@@ -49,12 +56,12 @@ class ClassLoadingWithLocalOverrideTests(TestCase):
 
     def setUp(self):
         self.installed_apps = list(settings.INSTALLED_APPS)
-        self.installed_apps[self.installed_apps.index('oscar.apps.shipping')] = 'tests.shipping'
+        self.installed_apps[self.installed_apps.index('oscar.apps.shipping')] = 'tests.site.shipping'
 
     def test_loading_class_defined_in_local_module(self):
         with patch_settings(INSTALLED_APPS=self.installed_apps):
             (Free,) = get_classes('shipping.methods', ('Free',))
-            self.assertEqual('tests.shipping.methods', Free.__module__)
+            self.assertEqual('tests.site.shipping.methods', Free.__module__)
 
     def test_loading_class_which_is_not_defined_in_local_module(self):
         with patch_settings(INSTALLED_APPS=self.installed_apps):
@@ -69,13 +76,16 @@ class ClassLoadingWithLocalOverrideTests(TestCase):
     def test_loading_classes_defined_in_both_local_and_oscar_modules(self):
         with patch_settings(INSTALLED_APPS=self.installed_apps):
             (Free, FixedPrice) = get_classes('shipping.methods', ('Free', 'FixedPrice'))
-            self.assertEqual('tests.shipping.methods', Free.__module__)
+            self.assertEqual('tests.site.shipping.methods', Free.__module__)
             self.assertEqual('oscar.apps.shipping.methods', FixedPrice.__module__)
 
 
-class ValidatorTests(TestCase):
+class TestExtendedURLValidator(TestCase):
+    """
+    ExtendedURLValidator
+    """
 
-    def test_validate_local_url(self):
+    def test_validates_local_url(self):
         v = ExtendedURLValidator(verify_exists=True)
 
         try:
@@ -112,7 +122,7 @@ class ValidatorTests(TestCase):
             self.fail('ExtendedURLValidator raises ValidationError'
                       'unexpectedly!')
 
-    def test_validate_url_does_not_exist(self):
+    def test_raises_exception_for_missing_url(self):
         validator = URLDoesNotExistValidator()
         self.assertRaises(ValidationError, validator, '/')
         try:
@@ -125,13 +135,35 @@ class ValidatorTests(TestCase):
         self.assertRaises(ValidationError, validator, '/test/page/')
 
 
-class ClassLoadingWithLocalOverrideWith3SegmentsTests(TestCase):
+class ClassLoadingWithLocalOverrideWithMultipleSegmentsTests(TestCase):
 
     def setUp(self):
         self.installed_apps = list(settings.INSTALLED_APPS)
-        self.installed_apps[self.installed_apps.index('oscar.apps.shipping')] = 'tests.apps.shipping'
+        self.installed_apps[self.installed_apps.index('oscar.apps.shipping')] = 'tests.site.apps.shipping'
 
     def test_loading_class_defined_in_local_module(self):
         with patch_settings(INSTALLED_APPS=self.installed_apps):
             (Free,) = get_classes('shipping.methods', ('Free',))
-            self.assertEqual('tests.apps.shipping.methods', Free.__module__)
+            self.assertEqual('tests.site.apps.shipping.methods', Free.__module__)
+
+
+class TestGetCoreAppsFunction(TestCase):
+    """
+    oscar.get_core_apps function
+    """
+
+    def test_returns_core_apps_when_no_overrides_specified(self):
+        apps = oscar.get_core_apps()
+        self.assertEqual(oscar.OSCAR_CORE_APPS, apps)
+
+    def test_uses_non_dashboard_override_when_specified(self):
+        apps = oscar.get_core_apps(overrides=['apps.shipping'])
+        self.assertTrue('apps.shipping' in apps)
+        self.assertTrue('oscar.apps.shipping' not in apps)
+
+    def test_uses_dashboard_override_when_specified(self):
+        apps = oscar.get_core_apps(overrides=['apps.dashboard.catalogue'])
+        self.assertTrue('apps.dashboard.catalogue' in apps)
+        self.assertTrue('oscar.apps.dashboard.catalogue' not in apps)
+        self.assertTrue('oscar.apps.catalogue' in apps)
+

tests/unit/customer_tests.py

@@ -0,0 +1,19 @@
+from django.test import TestCase
+
+from oscar.apps.customer.models import CommunicationEventType
+
+
+class CommunicationTypeTest(TestCase):
+    keys = ('body', 'html', 'sms', 'subject')
+
+    def test_no_templates_returns_empty_string(self):
+        et = CommunicationEventType()
+        messages = et.get_messages()
+        for key in self.keys:
+            self.assertEqual('', messages[key])
+
+    def test_field_template_render(self):
+        et = CommunicationEventType(email_subject_template='Hello {{ name }}')
+        ctx = {'name': 'world'}
+        messages = et.get_messages(ctx)
+        self.assertEqual('Hello world', messages['subject'])

oscar/apps/order/tests.py → tests/unit/order_tests.py

@@ -10,12 +10,11 @@ from oscar.apps.address.models import Country
 from oscar.apps.basket.models import Basket
 from oscar.apps.order.models import ShippingAddress, Order, Line, \
         ShippingEvent, ShippingEventType, ShippingEventQuantity, OrderNote, \
-        ShippingEventType, OrderDiscount
+        OrderDiscount
 from oscar.apps.order.exceptions import (InvalidOrderStatus, InvalidLineStatus,
                                          InvalidShippingEvent)
 from oscar.test.helpers import create_order, create_product, create_offer
 from oscar.apps.order.utils import OrderCreator
-from oscar.apps.shipping.methods import Free
 from oscar.apps.order.processing import EventHandler
 from oscar.test import patch_settings
 

oscar/apps/partner/tests/models.py → tests/unit/partner/model_tests.py

@@ -58,6 +58,9 @@ class StockRecordTests(TestCase):
         self.assertEqual(0, self.stockrecord.num_allocated)
         self.assertEqual(10, self.stockrecord.num_in_stock)
 
+    def test_max_purchase_quantity(self):
+        self.assertEqual(10, self.stockrecord.max_purchase_quantity())
+
 
 class DefaultWrapperTests(TestCase):