Merge pull request django-cms#2214 from ojii/tests-cleanup

Tests cleanup

Author: digi604

.travis.yml

@@ -4,25 +4,25 @@ python:
     - 2.7
     - 3.3
 env:
-    - DJANGO=1.4 DB='sqlite://localhost/:memory:'
-    - DJANGO=1.4 DB='mysql://[email protected]/djangocms_test'
-    - DJANGO=1.4 DB='postgres://[email protected]/djangocms_test'
-    - DJANGO=1.5 DB='sqlite://localhost/:memory:'
-    - DJANGO=1.5 DB='mysql://[email protected]/djangocms_test'
-    - DJANGO=1.5 DB='postgres://[email protected]/djangocms_test'
+    - DJANGO=1.4 DATABASE_URL='sqlite://localhost/:memory:'
+    - DJANGO=1.4 DATABASE_URL='mysql://[email protected]/djangocms_test'
+    - DJANGO=1.4 DATABASE_URL='postgres://[email protected]/djangocms_test'
+    - DJANGO=1.5 DATABASE_URL='sqlite://localhost/:memory:'
+    - DJANGO=1.5 DATABASE_URL='mysql://[email protected]/djangocms_test'
+    - DJANGO=1.5 DATABASE_URL='postgres://[email protected]/djangocms_test'
 
 before_script:
-  - sh -c "if [ '$DB' = 'postgres://[email protected]/djangocms_test' ]; then psql -c 'DROP DATABASE IF EXISTS djangocms_test;' -U postgres; fi"
-  - sh -c "if [ '$DB' = 'postgres://[email protected]/djangocms_test' ]; then psql -c 'create database djangocms_test;' -U postgres; fi"
-  - sh -c "if [ '$DB' = 'mysql://[email protected]/djangocms_test' ]; then mysql -e 'create database IF NOT EXISTS djangocms_test CHARACTER SET utf8 COLLATE utf8_general_ci;'; fi"
+  - sh -c "if [ '$DATABASE_URL' = 'postgres://[email protected]/djangocms_test' ]; then psql -c 'DROP DATABASE IF EXISTS djangocms_test;' -U postgres; fi"
+  - sh -c "if [ '$DATABASE_URL' = 'postgres://[email protected]/djangocms_test' ]; then psql -c 'create database djangocms_test;' -U postgres; fi"
+  - sh -c "if [ '$DATABASE_URL' = 'mysql://[email protected]/djangocms_test' ]; then mysql -e 'create database IF NOT EXISTS djangocms_test CHARACTER SET utf8 COLLATE utf8_general_ci;'; fi"
 
 install:
     - export DISPLAY=:99.0
     - sh -e /etc/init.d/xvfb start
     - pip install -q -r "test_requirements/django-$DJANGO.txt" --use-mirrors
-    - if [ $DB == 'mysql://[email protected]/djangocms_test' ]; then pip install -q mysql-python --use-mirrors; fi
+    - if [ $DATABASE_URL == 'mysql://[email protected]/djangocms_test' ]; then pip install -q mysql-python --use-mirrors; fi
 script:
-    python runtests.py --db $DB
+    python develop.py test --migrate
 notifications:
     email:
         recipients:
@@ -37,11 +37,10 @@ notifications:
 matrix:
   exclude:
     - python: 3.3
-      env: DJANGO=1.4 DB='sqlite://localhost/:memory:'
+      env: DJANGO=1.4 DATABASE_URL='sqlite://localhost/:memory:'
     - python: 3.3
-      env: DJANGO=1.4 DB='mysql://[email protected]/djangocms_test'
+      env: DJANGO=1.4 DATABASE_URL='mysql://[email protected]/djangocms_test'
     - python: 3.3
-      env: DJANGO=1.4 DB='postgres://[email protected]/djangocms_test'
+      env: DJANGO=1.4 DATABASE_URL='postgres://[email protected]/djangocms_test'
     - python: 3.3
-      env: DJANGO=1.5 DB='mysql://[email protected]/djangocms_test'
-
+      env: DJANGO=1.5 DATABASE_URL='mysql://[email protected]/djangocms_test'

cms/middleware/page.py

@@ -1,21 +1,21 @@
 # -*- coding: utf-8 -*-
 from cms.appresolver import applications_page_check
+from django.utils.functional import SimpleLazyObject
 
 
-class LazyPage(object):
-    def __get__(self, request, obj_type=None):
-        from cms.utils.page_resolver import get_page_from_request
+def get_page(request):
+    from cms.utils.page_resolver import get_page_from_request
 
-        if not hasattr(request, '_current_page_cache'):
-            request._current_page_cache = get_page_from_request(request)
-            if not request._current_page_cache:
-                # if this is in a apphook
-                # find the page the apphook is attached to
-                request._current_page_cache = applications_page_check(request)
-        return request._current_page_cache
+    if not hasattr(request, '_current_page_cache'):
+        request._current_page_cache = get_page_from_request(request)
+        if not request._current_page_cache:
+            # if this is in a apphook
+            # find the page the apphook is attached to
+            request._current_page_cache = applications_page_check(request)
+    return request._current_page_cache
 
 
 class CurrentPageMiddleware(object):
     def process_request(self, request):
-        request.__class__.current_page = LazyPage()
+        request.current_page = SimpleLazyObject(lambda: get_page(request))
         return None

cms/models/managers.py

@@ -327,20 +327,27 @@ def for_page(self, page):
         """
         # permissions should be managed on the draft page only
         page = page.get_draft_object()
-        from cms.models import ACCESS_DESCENDANTS, ACCESS_CHILDREN, \
-            ACCESS_PAGE_AND_CHILDREN, ACCESS_PAGE_AND_DESCENDANTS, ACCESS_PAGE
+        from cms.models import (ACCESS_DESCENDANTS, ACCESS_CHILDREN,
+            ACCESS_PAGE_AND_CHILDREN, ACCESS_PAGE_AND_DESCENDANTS, ACCESS_PAGE)
 
-        parents = Q(page__tree_id=page.tree_id, page__lft__lte=page.lft, page__rght__gte=page.rght) & (
+        if page.level is None or page.lft is None or page.rght is None:
+            raise ValueError("Cannot use unsaved page for permission lookup, missing MPTT attributes.")
+
+        parents = Q(page__tree_id=page.tree_id) & (
             Q(grant_on=ACCESS_DESCENDANTS) | Q(grant_on=ACCESS_PAGE_AND_DESCENDANTS))
         direct_parents = Q(
             page__tree_id=page.tree_id,
-            page__lft__lte=page.lft,
-            page__rght__gte=page.rght,
-            page__level=page.level - 1) & \
-            (Q(grant_on=ACCESS_CHILDREN) | Q(grant_on=ACCESS_PAGE_AND_CHILDREN))
+            page__level=page.level - 1) & (
+                Q(grant_on=ACCESS_CHILDREN) | Q(grant_on=ACCESS_PAGE_AND_CHILDREN)
+            )
         page_qs = Q(page=page) & (
             Q(grant_on=ACCESS_PAGE_AND_DESCENDANTS) | Q(grant_on=ACCESS_PAGE_AND_CHILDREN) | Q(grant_on=ACCESS_PAGE))
 
+        parents = parents & Q(page__lft__lte=page.lft)
+        direct_parents = direct_parents & Q(page__lft__lte=page.lft)
+        parents = parents & Q(page__rght__gte=page.rght)
+        direct_parents = direct_parents & Q(page__rght__gte=page.rght)
+
         query = (parents | direct_parents | page_qs)
         return self.filter(query).order_by('page__level')
 

cms/plugins/file/migrations/0001_initial.py

@@ -7,6 +7,10 @@
 
 class Migration(SchemaMigration):
 
+    depends_on = (
+        ("cms", "0048_auto__add_field_page_application_namespace__add_unique_page_publisher_"),
+    )
+
     def forwards(self, orm):
         # Adding model 'File'
         db.create_table('cmsplugin_file', (

cms/plugins/flash/migrations/0001_initial.py

@@ -7,6 +7,10 @@
 
 class Migration(SchemaMigration):
 
+    depends_on = (
+        ("cms", "0048_auto__add_field_page_application_namespace__add_unique_page_publisher_"),
+    )
+
     def forwards(self, orm):
         # Adding model 'Flash'
         db.create_table('cmsplugin_flash', (

cms/plugins/googlemap/migrations/0001_initial.py

@@ -7,6 +7,10 @@
 
 class Migration(SchemaMigration):
 
+    depends_on = (
+        ("cms", "0048_auto__add_field_page_application_namespace__add_unique_page_publisher_"),
+    )
+
     def forwards(self, orm):
         # Adding model 'GoogleMap'
         db.create_table('cmsplugin_googlemap', (