Test case branch

.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,4 @@
-#Tue Sep 15 11:43:51 CEST 2009
+#Thu Nov 05 11:08:34 CET 2009
 eclipse.preferences.version=1
 encoding//cms/docs/conf.py=utf-8
-encoding//cms/tests/page.py=UTF-8
+encoding//cms/tests/page.py=utf-8

cms/templatetags/cms_admin.py

@@ -105,7 +105,7 @@ def page_submit_row(context):
         'is_popup': is_popup,
         'show_save': True,
         'language': language,
-        'language_name': [name for langcode, name in cms_settings.CMS_LANGUAGES if langcode == language][0],
+        'language_name': [name for langcode, name in settings.CMS_LANGUAGES if langcode == language][0],
         'show_delete_translation': show_delete_translation
     }
 page_submit_row = register.inclusion_tag('admin/page_submit_line.html', takes_context=True)(page_submit_row)

cms/tests/base.py

@@ -37,8 +37,8 @@ def get_new_page_data(self, parent_id=''):
             'site':1, 'template':'index.html', 'parent': parent_id}
 
         # required only if user haves can_change_permission
-        #page_data['pagepermission_set-TOTAL_FORMS'] = 0
-        #page_data['pagepermission_set-INITIAL_FORMS'] = 0
+        page_data['pagepermission_set-TOTAL_FORMS'] = 0
+        page_data['pagepermission_set-INITIAL_FORMS'] = 0
 
         self.counter = self.counter + 1
         return page_data

cms/tests/page.py

@@ -16,18 +16,6 @@ def setUp(self):
 
         self.login_user(u)
 
-    def get_new_page_data(self):
-        page_data = {'title':'test page %d' % self.counter, 
-            'slug':'test-page-%d' % self.counter, 'language':'en',
-            'site':1, 'published':True, 'template':'index.html'}
-
-        # required only if user haves can_change_permission
-        page_data['pagepermission_set-TOTAL_FORMS'] = 0
-        page_data['pagepermission_set-INITIAL_FORMS'] = 0
-
-        self.counter = self.counter + 1
-        return page_data
-
     def test_01_add_page(self):
         """
         Test that the add admin page could be displayed via the admin