django-cms · yakky · Aug 17, 2015 · Dec 26, 2014 · Dec 26, 2014 · Dec 28, 2014
diff --git a/.travis.yml b/.travis.yml
@@ -39,7 +39,7 @@ install:
   - if [ $DATABASE_URL == 'mysql://root@127.0.0.1/djangocms_test' ]; then pip install
     -q mysql-python ; fi
 
-script: coverage run --rcfile=.coverage.rc develop.py test --migrate
+script: coverage run --rcfile=.coverage.rc manage.py test
 
 after_success: coveralls --config_file=.coverage.rc --coveralls_yaml=.coveralls.yml
 

diff --git a/cms/api.py b/cms/api.py
@@ -15,7 +15,6 @@
 from django.template.defaultfilters import slugify
 from django.template.loader import get_template
 from django.utils import six
-from cms.admin.forms import save_permissions
 from cms.app_base import CMSApp
 from cms.apphook_pool import apphook_pool
 from cms.constants import TEMPLATE_INHERITANCE_MAGIC
@@ -368,6 +367,7 @@ def create_page_user(created_by, user,
 
     See docs/extending_cms/api_reference.rst for more info
     """
+    from cms.admin.forms import save_permissions
     if grant_all:
         # just be lazy
         return create_page_user(created_by, user, True, True, True, True,

diff --git a/cms/tests/__init__.py b/cms/tests/__init__.py
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from cms.tests.static_analysis import *  # nopyflakes
-from cms.tests.alias import *  # nopyflakes
-from cms.tests.admin import *  # nopyflakes
-from cms.tests.api import *  # nopyflakes
-from cms.tests.apphooks import *  # nopyflakes
-from cms.tests.django_load import *  # nopyflakes
-from cms.tests.docs import *  # nopyflakes
-from cms.tests.extensions import *  # nopyflakes
-from cms.tests.forms import *  # nopyflakes
-from cms.tests.i18n import *  # nopyflakes
-from cms.tests.mail import *  # nopyflakes
-from cms.tests.menu import *  # nopyflakes
-from cms.tests.menu_utils import *  # nopyflakes
-from cms.tests.multilingual import *  # nopyflakes
-from cms.tests.navextender import *  # nopyflakes
-from cms.tests.nonroot import *  # nopyflakes
-from cms.tests.page import *  # nopyflakes
-from cms.tests.permissions import *  # nopyflakes
-from cms.tests.permmod import *  # nopyflakes
-from cms.tests.placeholder import *  # nopyflakes
-from cms.tests.plugins import *  # nopyflakes
-from cms.tests.po import *  # nopyflakes
-from cms.tests.publisher import *  # nopyflakes
-from cms.tests.rendering import *  # nopyflakes
-from cms.tests.reversion_tests import *  # nopyflakes
-from cms.tests.security import *  # nopyflakes
-from cms.tests.settings import *  # nopyflakes
-from cms.tests.site import *  # nopyflakes
-from cms.tests.sitemap import *  # nopyflakes
-from cms.tests.static_placeholder import *  # nopyflakes
-from cms.tests.staticfiles import *  # nopyflakes
-from cms.tests.templatetags import *  # nopyflakes
-from cms.tests.templates import *  # nopyflakes
-from cms.tests.toolbar import *  # nopyflakes
-from cms.tests.toolbar_pool import *  # nopyflakes
-from cms.tests.urlutils import *  # nopyflakes
-from cms.tests.views import *  # nopyflakes
-from cms.tests.management import *  # nopyflakes
-from cms.tests.fixture_loading import *  # nopyflakes
-from cms.tests.menu_page_viewperm import *  # nopyflakes
-from cms.tests.menu_page_viewperm_staff import *  # nopyflakes
-from cms.tests.nested_plugins import *  # nopyflakes
-from cms.tests.check import *  # nopyflakes
-from cms.tests.frontend import *  # nopyflakes
-from cms.tests.signals import *  # nopyflakes
-from cms.tests.no_i18n import *  # nopyflakes
-from cms.tests.cache import *  # nopyflakes
-from cms.tests.widgets import *  # nopyflakes

diff --git a/cms/tests/admin.py → cms/tests/test_admin.py b/cms/tests/admin.py → cms/tests/test_admin.py
@@ -46,9 +46,9 @@ def admin_class(self):
         return site._registry[Page]
 
     def _get_guys(self, admin_only=False, use_global_permissions=True):
-        admiN_user = self.get_superuser()
+        admin_user = self.get_superuser()
         if admin_only:
-            return admiN_user
+            return admin_user
         USERNAME = 'test'
 
         if get_user_model().USERNAME_FIELD == 'email':
@@ -73,7 +73,7 @@ def _get_guys(self, admin_only=False, use_global_permissions=True):
                 can_move_page=True,
             )
             gpp.sites = Site.objects.all()
-        return admiN_user, normal_guy
+        return admin_user, normal_guy
 
 
 class AdminTestCase(AdminTestsBase):

diff --git a/cms/tests/alias.py → cms/tests/test_alias.py b/cms/tests/alias.py → cms/tests/test_alias.py
diff --git a/cms/tests/api.py → cms/tests/test_api.py b/cms/tests/api.py → cms/tests/test_api.py
@@ -18,7 +18,7 @@
 from cms.test_utils.util.context_managers import SettingsOverride
 from cms.test_utils.util.menu_extender import TestMenu
 from cms.test_utils.util.mock import AttributeObject
-from cms.tests.apphooks import APP_MODULE, APP_NAME
+from cms.tests.test_apphooks import APP_MODULE, APP_NAME
 from cms.utils.compat.dj import get_user_model
 
 

diff --git a/cms/tests/apphooks.py → cms/tests/test_apphooks.py b/cms/tests/apphooks.py → cms/tests/test_apphooks.py
@@ -15,7 +15,7 @@
 from cms.test_utils.project.placeholderapp.models import Example1
 from cms.test_utils.testcases import CMSTestCase, SettingsOverrideTestCase
 from cms.test_utils.util.context_managers import SettingsOverride
-from cms.tests.menu_utils import DumbPageLanguageUrl
+from cms.tests.test_menu_utils import DumbPageLanguageUrl
 from cms.toolbar.toolbar import CMSToolbar
 from cms.utils.compat.dj import get_user_model
 from cms.utils.conf import get_cms_setting

diff --git a/cms/tests/cache.py → cms/tests/test_cache.py b/cms/tests/cache.py → cms/tests/test_cache.py
diff --git a/cms/tests/check.py → cms/tests/test_check.py b/cms/tests/check.py → cms/tests/test_check.py
diff --git a/cms/tests/django_load.py → cms/tests/test_django_load.py b/cms/tests/django_load.py → cms/tests/test_django_load.py
diff --git a/cms/tests/docs.py → cms/tests/test_docs.py b/cms/tests/docs.py → cms/tests/test_docs.py
diff --git a/cms/tests/extensions.py → cms/tests/test_extensions.py b/cms/tests/extensions.py → cms/tests/test_extensions.py
@@ -14,7 +14,7 @@
 from cms.test_utils.project.extensionapp.models import (MyPageExtension,
                                                         MyTitleExtension)
 from cms.test_utils.testcases import SettingsOverrideTestCase as TestCase
-from cms.tests import AdminTestsBase
+from cms.tests.test_admin import AdminTestsBase
 from cms.utils.compat.dj import get_user_model
 
 

diff --git a/cms/tests/fixture_loading.py → cms/tests/test_fixture_loading.py b/cms/tests/fixture_loading.py → cms/tests/test_fixture_loading.py
diff --git a/cms/tests/forms.py → cms/tests/test_forms.py b/cms/tests/forms.py → cms/tests/test_forms.py
diff --git a/cms/tests/frontend.py → cms/tests/test_frontend.py b/cms/tests/frontend.py → cms/tests/test_frontend.py
diff --git a/cms/tests/i18n.py → cms/tests/test_i18n.py b/cms/tests/i18n.py → cms/tests/test_i18n.py
diff --git a/cms/tests/mail.py → cms/tests/test_mail.py b/cms/tests/mail.py → cms/tests/test_mail.py
diff --git a/cms/tests/management.py → cms/tests/test_management.py b/cms/tests/management.py → cms/tests/test_management.py
diff --git a/cms/tests/menu.py → cms/tests/test_menu.py b/cms/tests/menu.py → cms/tests/test_menu.py
diff --git a/cms/tests/menu_page_viewperm.py → cms/tests/test_menu_page_viewperm.py b/cms/tests/menu_page_viewperm.py → cms/tests/test_menu_page_viewperm.py
diff --git a/cms/tests/menu_page_viewperm_staff.py → cms/tests/test_menu_page_viewperm_staff.py b/cms/tests/menu_page_viewperm_staff.py → cms/tests/test_menu_page_viewperm_staff.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 
-from cms.tests.menu_page_viewperm import ViewPermissionTests
+from cms.tests.test_menu_page_viewperm import ViewPermissionTests
 from cms.utils.compat.dj import get_user_model
 
 __all__ = [

diff --git a/cms/tests/menu_utils.py → cms/tests/test_menu_utils.py b/cms/tests/menu_utils.py → cms/tests/test_menu_utils.py
diff --git a/cms/tests/multilingual.py → cms/tests/test_multilingual.py b/cms/tests/multilingual.py → cms/tests/test_multilingual.py
diff --git a/cms/tests/navextender.py → cms/tests/test_navextender.py b/cms/tests/navextender.py → cms/tests/test_navextender.py
diff --git a/cms/tests/nested_plugins.py → cms/tests/test_nested_plugins.py b/cms/tests/nested_plugins.py → cms/tests/test_nested_plugins.py
@@ -9,7 +9,7 @@
 from cms.models import Page
 from cms.models.placeholdermodel import Placeholder
 from cms.models.pluginmodel import CMSPlugin
-from cms.tests.plugins import PluginsTestBaseCase
+from cms.tests.test_plugins import PluginsTestBaseCase
 from cms.test_utils.util.context_managers import SettingsOverride
 from cms.utils.copy_plugins import copy_plugins_to
 from cms.utils.compat.tests import UnittestCompatMixin

diff --git a/cms/tests/no_i18n.py → cms/tests/test_no_i18n.py b/cms/tests/no_i18n.py → cms/tests/test_no_i18n.py
diff --git a/cms/tests/nonroot.py → cms/tests/test_nonroot.py b/cms/tests/nonroot.py → cms/tests/test_nonroot.py
diff --git a/cms/tests/page.py → cms/tests/test_page.py b/cms/tests/page.py → cms/tests/test_page.py
diff --git a/cms/tests/permissions.py → cms/tests/test_permissions.py b/cms/tests/permissions.py → cms/tests/test_permissions.py
diff --git a/cms/tests/permmod.py → cms/tests/test_permmod.py b/cms/tests/permmod.py → cms/tests/test_permmod.py
diff --git a/cms/tests/placeholder.py → cms/tests/test_placeholder.py b/cms/tests/placeholder.py → cms/tests/test_placeholder.py
diff --git a/cms/tests/plugins.py → cms/tests/test_plugins.py b/cms/tests/plugins.py → cms/tests/test_plugins.py
diff --git a/cms/tests/po.py → cms/tests/test_po.py b/cms/tests/po.py → cms/tests/test_po.py
diff --git a/cms/tests/publisher.py → cms/tests/test_publisher.py b/cms/tests/publisher.py → cms/tests/test_publisher.py
diff --git a/cms/tests/rendering.py → cms/tests/test_rendering.py b/cms/tests/rendering.py → cms/tests/test_rendering.py
@@ -160,8 +160,8 @@ def test_processors(self):
         can be defined in settings and are working and that extra plugin context processors can be passed to PluginContext.
         """
         with SettingsOverride(
-                CMS_PLUGIN_PROCESSORS=('cms.tests.rendering.sample_plugin_processor',),
-                CMS_PLUGIN_CONTEXT_PROCESSORS=('cms.tests.rendering.sample_plugin_context_processor',),
+                CMS_PLUGIN_PROCESSORS=('cms.tests.test_rendering.sample_plugin_processor',),
+                CMS_PLUGIN_CONTEXT_PROCESSORS=('cms.tests.test_rendering.sample_plugin_context_processor',),
         ):
             def test_passed_plugin_context_processor(instance, placeholder, context):
                 return {'test_passed_plugin_context_processor': 'test_passed_plugin_context_processor_ok'}
@@ -420,4 +420,4 @@ def test_render_placeholder_toolbar(self):
         ]
         output = render_placeholder_toolbar(placeholder, context, 'test', 'en')
         for cls in classes:
-            self.assertTrue(cls in output, '%r is not in %r' % (cls, output))
+            self.assertTrue(cls in output, '%r is not in %r' % (cls, output))
diff --git a/cms/tests/reversion_tests.py → cms/tests/test_reversion_tests.py b/cms/tests/reversion_tests.py → cms/tests/test_reversion_tests.py
diff --git a/cms/tests/security.py → cms/tests/test_security.py b/cms/tests/security.py → cms/tests/test_security.py
diff --git a/cms/tests/settings.py → cms/tests/test_settings.py b/cms/tests/settings.py → cms/tests/test_settings.py
diff --git a/cms/tests/signals.py → cms/tests/test_signals.py b/cms/tests/signals.py → cms/tests/test_signals.py
diff --git a/cms/tests/site.py → cms/tests/test_site.py b/cms/tests/site.py → cms/tests/test_site.py
diff --git a/cms/tests/sitemap.py → cms/tests/test_sitemap.py b/cms/tests/sitemap.py → cms/tests/test_sitemap.py
diff --git a/cms/tests/static_analysis.py → cms/tests/test_static_analysis.py b/cms/tests/static_analysis.py → cms/tests/test_static_analysis.py
diff --git a/cms/tests/static_placeholder.py → cms/tests/test_static_placeholder.py b/cms/tests/static_placeholder.py → cms/tests/test_static_placeholder.py
@@ -5,7 +5,7 @@
 from cms.api import add_plugin
 from cms.constants import PLUGIN_MOVE_ACTION, PLUGIN_COPY_ACTION
 from cms.models import StaticPlaceholder, Placeholder, CMSPlugin
-from cms.tests.plugins import PluginsTestBaseCase
+from cms.tests.test_plugins import PluginsTestBaseCase
 from cms.utils.compat.dj import force_unicode
 from cms.utils.urlutils import admin_reverse
 from django.contrib.admin.sites import site

diff --git a/cms/tests/staticfiles.py → cms/tests/test_staticfiles.py b/cms/tests/staticfiles.py → cms/tests/test_staticfiles.py
diff --git a/cms/tests/templates.py → cms/tests/test_templates.py b/cms/tests/templates.py → cms/tests/test_templates.py
diff --git a/cms/tests/templatetags.py → cms/tests/test_templatetags.py b/cms/tests/templatetags.py → cms/tests/test_templatetags.py
diff --git a/cms/tests/toolbar.py → cms/tests/test_toolbar.py b/cms/tests/toolbar.py → cms/tests/test_toolbar.py
diff --git a/cms/tests/toolbar_pool.py → cms/tests/test_toolbar_pool.py b/cms/tests/toolbar_pool.py → cms/tests/test_toolbar_pool.py
@@ -15,47 +15,48 @@ class TestToolbar(CMSToolbar):
 
 
 class ToolbarPoolTests(CMSTestCase):
-
-    def setUp(self):
-        self.pool = ToolbarPool()
-
     def test_register(self):
-        self.pool.register(TestToolbar)
-        self.pool.register(CMSToolbar)
-        self.assertEqual(self.pool.toolbars, {
+        pool = ToolbarPool()
+        pool.register(TestToolbar)
+        pool.register(CMSToolbar)
+        self.assertEqual(pool.toolbars, {
             'cms.toolbar_base.CMSToolbar': CMSToolbar,
-            'cms.tests.toolbar_pool.TestToolbar': TestToolbar})
+            'cms.tests.test_toolbar_pool.TestToolbar': TestToolbar})
 
         self.assertRaises(ToolbarAlreadyRegistered,
-                          self.pool.register, TestToolbar)
+                          pool.register, TestToolbar)
 
     def test_register_type(self):
-        self.assertRaises(ImproperlyConfigured, self.pool.register, str)
-        self.assertRaises(ImproperlyConfigured, self.pool.register, object)
+        pool = ToolbarPool()
+        self.assertRaises(ImproperlyConfigured, pool.register, str)
+        self.assertRaises(ImproperlyConfigured, pool.register, object)
 
     def test_register_order(self):
-        self.pool.register(TestToolbar)
-        self.pool.register(CMSToolbar)
+        pool = ToolbarPool()
+        pool.register(TestToolbar)
+        pool.register(CMSToolbar)
 
         test_toolbar = SortedDict()
-        test_toolbar['cms.tests.toolbar_pool.TestToolbar'] = TestToolbar
+        test_toolbar['cms.tests.test_toolbar_pool.TestToolbar'] = TestToolbar
         test_toolbar['cms.toolbar_base.CMSToolbar'] = CMSToolbar
-        self.assertEqual(list(test_toolbar.keys()), list(self.pool.toolbars.keys()))
+        self.assertEqual(list(test_toolbar.keys()), list(pool.toolbars.keys()))
 
     def test_unregister(self):
-        self.pool.register(TestToolbar)
-        self.pool.unregister(TestToolbar)
-        self.assertEqual(self.pool.toolbars, {})
+        pool = ToolbarPool()
+        pool.register(TestToolbar)
+        pool.unregister(TestToolbar)
+        self.assertEqual(pool.toolbars, {})
 
         self.assertRaises(ToolbarNotRegistered,
-                          self.pool.unregister, TestToolbar)
+                          pool.unregister, TestToolbar)
 
     def test_settings(self):
+        pool = ToolbarPool()
         toolbars = toolbar_pool.toolbars
         toolbar_pool.clear()
         with SettingsOverride(CMS_TOOLBARS=['cms.cms_toolbar.BasicToolbar', 'cms.cms_toolbar.PlaceholderToolbar']):
             toolbar_pool.register(TestToolbar)
-            self.assertEqual(len(list(self.pool.get_toolbars().keys())), 2)
+            self.assertEqual(len(list(pool.get_toolbars().keys())), 2)
             api.create_page("home", "simple.html", "en", published=True)
             with self.login_user_context(self.get_superuser()):
                 response = self.client.get("/en/?%s" % get_cms_setting('CMS_TOOLBAR_URL__EDIT_ON'))

diff --git a/cms/tests/urlutils.py → cms/tests/test_urlutils.py b/cms/tests/urlutils.py → cms/tests/test_urlutils.py
diff --git a/cms/tests/views.py → cms/tests/test_views.py b/cms/tests/views.py → cms/tests/test_views.py
diff --git a/cms/tests/widgets.py → cms/tests/test_widgets.py b/cms/tests/widgets.py → cms/tests/test_widgets.py