Merge branch 'digi604-get-pages-root-problem' into develop

Fixes issue 1360 Fixes issue 1335
django-cms · Aug 8, 2012 · 998bceb · 998bceb
2 parents a80355c + 0ed20c2
commit 998bceb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/cms/test_utils/cli.py b/cms/test_utils/cli.py
@@ -188,7 +188,5 @@ def configure(**extra):
     patch_settings()
     from south.management.commands import patch_for_test_db_setup
     patch_for_test_db_setup()
-    from django.core.urlresolvers import set_urlconf
     from django.contrib import admin
     admin.autodiscover()
-    set_urlconf(settings.ROOT_URLCONF)
diff --git a/cms/tests/nonroot.py b/cms/tests/nonroot.py
@@ -19,9 +19,6 @@ def setUp(self):
             u.save()
             with self.login_user_context(u):
                 self.create_some_pages()
-
-    # def tearDown(self):
-    #     menu_pool.menus = self.old_menu
 
     def create_some_pages(self):
         """
@@ -45,7 +42,9 @@ def create_some_pages(self):
         self.top_level_pages = [self.page1, self.page4]
         self.level1_pages = [self.page2]
         self.level2_pages = [self.page3]
-
+
+    def test_get_page_root(self):
+        self.assertEqual(self.get_pages_root(), '/content/')
 
     def test_basic_cms_menu(self):
         with SettingsOverride(CMS_MODERATOR = False):