Merge remote-tracking branch 'awesto/master' into atomic-customer-creation

# Conflicts:
#	shop/models/customer.py

Author: jrief

docs/authors.rst

@@ -13,9 +13,10 @@ CONTRIBUTORS
 * Aleš Kocjančič
 * Anders Petersson
 * Andrés Reyes Monge
+* Arturo Fernandez
 * Audrey Roy
-* Ben Lopatin
 * Benjamin Wohlwend
+* Ben Lopatin
 * Bojan Mihelac
 * Chris Morgan
 * Dino Perovic
@@ -29,9 +30,12 @@ CONTRIBUTORS
 * Justin Steward
 * Kristian Øllegaard
 * maltitco
+* Maltsev Artyom
 * Martin Ogden
 * Mike Yumatov
+* Mikhail Kolesnik
 * Pavel Zhukov
+* Pedro Gracia
 * Per Rosengren
 * Raúl Cumplido
 * Roberth Solís
@@ -42,14 +46,6 @@ CONTRIBUTORS
 * Stephen Muss
 * Thomas Woolford
 
-TRANSLATORS
-===========
-
-* Mikhail Kolesnik (Russian)
-* Pavel Zhukov (Russian)
-* Pedro Gracia (Spanish)
-* Arturo Fernandez (Spanish)
-
 RETIRED CORE DEVELOPERS
 =======================
 

example/tests/test_customer.py

@@ -173,6 +173,26 @@ def test_authenticated_visiting_customer(self):
         self.assertEqual(customer.last_name, 'Simpson')
         self.assertEqual(customer.email, '[email protected]')
 
+    def test_get_or_create_authenticated_customer_idempotent(self):
+        lisa = get_user_model().objects.get(username='lisa')
+        self.assertTrue(lisa.is_authenticated())
+        request = self.factory.get('/', follow=True)
+        request.user = lisa
+        request.session = SessionStore()
+        request.session.create()
+        customer1 = Customer.objects.get_or_create_from_request(request)
+        customer2 = Customer.objects.get_or_create_from_request(request)
+        self.assertEqual(customer1, customer2)
+
+    def test_get_or_create_unauthenticated_customer_idempotent(self):
+        request = self.factory.get('/', follow=True)
+        request.user = AnonymousUser()
+        request.session = SessionStore()
+        request.session.create()
+        customer1 = Customer.objects.get_or_create_from_request(request)
+        customer2 = Customer.objects.get_or_create_from_request(request)
+        self.assertEqual(customer1, customer2)
+
     def test_select_related(self):
         """
         Check that all queries on model Customer do an INNER JOIN on table `auth_user`.

example/tests/test_rest/__init__.py

@@ -0,0 +1,70 @@
+import mock
+import cms.api
+from cms.models import Page
+from django.core.exceptions import ImproperlyConfigured
+from django.test import RequestFactory, TestCase
+
+from shop.rest.filters import RecursiveCMSPagesFilterBackend
+from myshop.models.polymorphic.product import Product, ProductPage
+from myshop.models.manufacturer import Manufacturer
+
+
+def create_page(name):
+    page = cms.api.create_page(name, "INHERIT", "en")
+    page.site_id = 1
+    page.save()
+    page.publish("en")
+    page = page.get_public_object()
+    return page
+
+
+class RecursiveCMSPagesFilterBackendTest(TestCase):
+
+    def setUp(self):
+        self.manufacturer = Manufacturer.objects.create(name='Testmanufacturer')
+        self.root = create_page("root")
+        self.sibling = create_page("sibling")
+        self.child = create_page("child")
+        self.grandchild = create_page("grandchild")
+        self.grandchild.move(target=self.child, pos="first-child")
+        self.child.move(target=self.root, pos="first-child")
+
+    def _create_product(self, slug):
+        return Product.objects.create(product_name=slug, slug=slug, order=1, manufacturer=self.manufacturer)
+
+    def test_products_on_child_and_grandchild(self):
+        product = self._create_product("testproduct")
+        product2 = self._create_product("testproduct2")
+        ProductPage.objects.create(product=product, page=self.child)
+        ProductPage.objects.create(product=product2, page=self.grandchild)
+
+        request = RequestFactory().get('/')
+        request.current_page = Page.objects.get(title_set__title="root", publisher_is_draft=False)
+        view = mock.Mock(cms_pages_fields=['cms_pages'])
+
+        queryset = Product.objects.all()
+        backend = RecursiveCMSPagesFilterBackend()
+
+        self.assertEqual(backend.filter_queryset(request, queryset, view).count(), 2)
+
+    def test_product_on_sibling(self):
+        product = self._create_product("testproduct")
+        ProductPage.objects.create(product=product, page=self.sibling)
+
+        request = RequestFactory().get('/')
+        request.current_page = self.root
+        view = mock.Mock(cms_pages_fields=['cms_pages'])
+
+        queryset = Product.objects.all()
+        backend = RecursiveCMSPagesFilterBackend()
+
+        self.assertEqual(backend.filter_queryset(request, queryset, view).count(), 0)
+
+    def test_checks_cms_pages_fields(self):
+        request = RequestFactory().get('/')
+        view = mock.Mock(cms_pages_fields='not-a-list-or-tuple')
+        queryset = Product.objects.all()
+
+        backend = RecursiveCMSPagesFilterBackend()
+        self.assertRaises(ImproperlyConfigured,
+                          lambda: backend.filter_queryset(request, queryset, view))