Changeset 1792 in products

Timestamp:

Feb 19, 2010 4:53:43 PM (14 years ago)

Author:

mylan

Message:

#140: Fix tests after swith to standard control panel form: added authenticator, changed form fields names

Location:

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests

Files:

• base.py (modified) (2 diffs)
• testQSEOptimizerExposeDCMetaTags.py (modified) (1 diff)
• testQSEOptimizerUsageKeywords.py (modified) (3 diffs)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/base.py

@@ -66 +66 @@
 ptc.setupPloneSite()
 
+class MixinTestCase:
 
-class TestCase(ptc.PloneTestCase):
+    def _getauth(self):
+        # Fix authenticator for the form
+        import re
+
+        authenticator = self.portal.restrictedTraverse("@@authenticator")
+        html = authenticator.authenticator()
+        handle = re.search('value="(.*)"', html).groups()[0]
+        return handle
+
+
+
+class TestCase(MixinTestCase, ptc.PloneTestCase):
     """We use this base class for all the tests in this package. If
     necessary, we can put common utility or setup code in here. This
@@ -73 +85 @@
     """
 
-class FunctionalTestCase(ptc.FunctionalTestCase):
+class FunctionalTestCase(MixinTestCase, ptc.FunctionalTestCase):
     """We use this class for functional integration tests that use
     doctest syntax. Again, we can put basic common utility or setup

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/testQSEOptimizerExposeDCMetaTags.py

@@ -22 +22 @@
 
     def test_exposeDCMetaTags_in_configletOn(self):
-        path = self.portal.id+'/@@seo-controlpanel?exposeDCMetaTags=True&form.submitted=1'
+        path = self.portal.id+'/@@seo-controlpanel?form.actions.save=1' \
+            '&form.exposeDCMetaTags=on&_authenticator=%s' % self._getauth()
         self.publish(path, self.basic_auth)
         self.assert_(self.sp.exposeDCMetaTags)
 
     def test_exposeDCMetaTags_in_configletOff(self):
-        self.publish(self.portal.id+'/@@seo-controlpanel?form.submitted=1', self.basic_auth)
+        self.publish(self.portal.id+'/@@seo-controlpanel?form.actions.save=1' \
+            '&form.exposeDCMetaTags=&_authenticator=%s' % self._getauth(),
+             self.basic_auth)
         self.assert_(not self.sp.exposeDCMetaTags)
 

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/testQSEOptimizerUsageKeywords.py

@@ -3 +3 @@
 from base import getToolByName, FunctionalTestCase, newSecurityManager
 from config import *
+
 
 class TestUsageKeywords(FunctionalTestCase):
@@ -30 +31 @@
     def test_changes_using_keywords_in_configlet(self):
         for sg, lg in ((1, 1), (1, 2), (2, 1), (2, 2), (3, 1), (3, 2)):
-            path = self.portal.id+'/@@seo-controlpanel?settingsUseKeywordsSG=%s'\
-                                '&settingsUseKeywordsLG=%s&form.submitted=1' % (sg, lg)
-            self.publish(path, self.basic_auth)
+            path = self.portal.id+'/@@seo-controlpanel?form.settings_use_keywords_sg=%s'\
+                                '&form.settings_use_keywords_lg=%s&form.actions.save=1'\
+                                '&_authenticator=%s' % (sg, lg, self._getauth())
+
+            html = self.publish(path, self.basic_auth)
+            open('/tmp/sg.html','w').write(str(html))
+            #self.app.REQUEST.form['_authenticator'] = self._getauth()
             self.assertEqual(self.sp.getProperty('settings_use_keywords_sg', 0), sg)
             self.assertEqual(self.sp.getProperty('settings_use_keywords_lg', 0), lg)
@@ -38 +43 @@
     def test_additional_keywords_in_configlet(self):
         quoted_keywords = urllib.quote('foo\nbar')
-        path = self.portal.id+'/@@seo-controlpanel?additionalKeywords:lines=%s&form.submitted=1'%quoted_keywords
+        path = self.portal.id+'/@@seo-controlpanel?form.additional_keywords=%s'\
+            '&form.actions.save=1&_authenticator=%s' % (quoted_keywords, self._getauth())
         self.publish(path, self.basic_auth)
         self.assertEqual(self.sp.additional_keywords, ('foo', 'bar'))
-        self.publish(self.portal.id+'/@@seo-controlpanel?form.submitted=1', self.basic_auth)
+
+        self.publish(self.portal.id+'/@@seo-controlpanel?form.actions.save=1'\
+            '&form.additional_keywords=&_authenticator=%s' % self._getauth(), self.basic_auth)
         self.assertEqual(self.sp.additional_keywords, ())