Fix tax-related test issues

Should have checked this before pushing before...

oscar/apps/checkout/views.py

@@ -361,6 +361,7 @@ class PaymentDetailsView(OrderPlacementMixin, TemplateView):
     preview = False
 
     def dispatch(self, request, *args, **kwargs):
+        self.checkout_session = CheckoutSessionData(request)
         error_response = self.get_error_response()
         if error_response:
             return error_response

oscar/apps/partner/strategy.py

@@ -28,7 +28,7 @@ class Selector(object):
     def strategy(self, request=None, user=None, **kwargs):
         # Default to the backwards-compatible strategy of picking the first
         # stockrecord.
-        return US(request)
+        return Default(request)
 
 
 class Base(object):
@@ -173,5 +173,5 @@ class Default(UseFirstStockRecord, StockRequired, NoTax, Structured):
 
 class US(UseFirstStockRecord, StockRequired, DeferredTax, Structured):
     """
-    Default strategy for the USA
+    Default strategy for the USA (just for testing really)
     """

oscar/apps/shipping/repository.py

@@ -11,8 +11,7 @@ class Repository(object):
     Repository class responsible for returning ShippingMethod
     objects for a given user, basket etc
     """
-    methods = (methods.FixedPrice(D('5.00')),
-               methods.FixedPrice(D('10.00')))
+    methods = (methods.Free(),)
 
     def get_shipping_methods(self, user, basket, shipping_addr=None,
                              request=None, **kwargs):

tests/integration/offer/shipping_benefit_tests.py

@@ -41,7 +41,7 @@ class StubRepository(Repository):
     shipping discounts to be tested.
     """
     def get_shipping_methods(self, basket):
-        methods = [FixedPrice(D('10.00'))]
+        methods = [FixedPrice(D('10.00'), D('10.00'))]
         return self.prime_methods(basket, methods)
 
 

tests/integration/order/creator_tests.py

@@ -115,7 +115,7 @@ class TestPlacingOrderForDigitalGoods(TestCase):
 
 class StubRepository(Repository):
     """ Custom shipping methods """
-    methods = (FixedPrice(D('5.00')), Free())
+    methods = (FixedPrice(D('5.00'), D('5.00')), Free())
 
 
 class TestShippingOfferForOrder(TestCase):