Changeset 1269 in products

Timestamp:

Sep 9, 2009 3:26:45 PM (15 years ago)

Author:

liebster

Message:

Added tests manage custom meta tags.

Location:

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer

Files:

• browser/configure.zcml (modified) (1 diff)
• skins/quintagroup.seoptimizer/qseo_properties_edit.cpy (modified) (2 diffs)
• tests/testQSEOptimizer.py (modified) (4 diffs)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/configure.zcml

@@ -75 +75 @@
         layer=".interfaces.IPloneSEOLayer"
         permission="zope2.View"
-        allowed_attributes="seo_globalCustomMetaTags"
         />
 

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/skins/quintagroup.seoptimizer/qseo_properties_edit.cpy

@@ -8 +8 @@
 ##title=Update SEO Properties
 ##parameters=title=None,description=None,canonical=None,keywords=None,html_comment=None,robots=None,distribution=None,title_override=0,description_override=0,canonical_override=0,keywords_override=0,html_comment_override=0,robots_override=0,distribution_override=0,custommetatags=[],custommetatags_override=0
+
+from Products.CMFCore.utils import getToolByName
+SEPERATOR = '|'
 
 def setProperty(context, property, value, type='string'):
@@ -26 +29 @@
 if not custommetatags_override: custommetatags=[]
 
-globalCustomMetaTags = context.restrictedTraverse('@@seo_context').seo_globalCustomMetaTags()
+globalCustomMetaTags = []
+site_properties = getToolByName(context, 'portal_properties')
+if hasattr(site_properties, 'seo_properties'):
+    custom_meta_tags = getattr(site_properties.seo_properties, 'default_custom_metatags', [])
+    for tag in custom_meta_tags:
+        name_value = tag.split(SEPERATOR)
+        if name_value[0]:
+            globalCustomMetaTags.append({'meta_name'    : name_value[0],
+                                         'meta_content' : len(name_value) == 1 and '' or name_value[1]})
+
 custom_updated = []
 for tag in custommetatags:

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testQSEOptimizer.py

@@ -24 +24 @@
                     'meta_content' : 'metatag1value'},
                    {'meta_name'    : 'metatag2',
-                    'meta_content' : 'metatag2value'}]
+                    'meta_content' : 'metatag2value'},
+                   {'meta_name'    : 'metatag3',
+                    'meta_content' : ''}
+                  ]
+
+global_custom_metatags = {'default_custom_metatags':'metatag1|global_metatag1value\nmetatag4|global_metatag4value'}
 
 configlets = ({'id':'qSEOptimizer',
@@ -169 +174 @@
         my_doc = self.portal['my_doc']
         self.canonurl = 'http://test.site.com/test.html'
-
-        my_doc.qseo_properties_edit(title='hello world', description='it is description',
-                                    keywords='my1|key2', html_comment='no comments',
-                                    robots='ALL', distribution='Global', 
+        self.sp = self.portal.portal_properties.seo_properties
+        self.sp.manage_changeProperties(**global_custom_metatags)
+
+        my_doc.qseo_properties_edit(title='hello world', title_override=1,
+                                    description='it is description', description_override=1,
+                                    keywords='my1|key2', keywords_override=1,
+                                    html_comment='no comments', html_comment_override=1,
+                                    robots='ALL', robots_override=1,
+                                    distribution='Global', distribution_override=1,
                                     canonical=self.canonurl, canonical_override=1,
-                                    title_override=1,
-                                    description_override=1, keywords_override=1,
-                                    html_comment_override=1, robots_override=1,
-                                    distribution_override=1, custommetatags=custom_metatags)
+                                    custommetatags=custom_metatags, custommetatags_override=1)
 
         wf_tool = self.portal.portal_workflow
@@ -183 +190 @@
 
         abs_path = "/%s" % my_doc.absolute_url(1)
+        self.abs_path = abs_path
+        self.my_doc = my_doc
         self.html = self.publish(abs_path, self.basic_auth).getBody()
 
@@ -231 +240 @@
         for tag in custom_metatags:
             m = re.search('<meta name="%(meta_name)s" content="%(meta_content)s" />' % tag, self.html, re.S|re.M)
-            self.assert_(m, "Custom meta tag %s not applied." % tag['meta_name'])
+            if tag['meta_content']:
+                self.assert_(m, "Custom meta tag %s not applied." % tag['meta_name'])
+            else:
+                self.assert_(not m, "Meta tag %s has no content, but is present in the page." % tag['meta_name'])
+        m = re.search('<meta name="metatag4" content="global_metatag4value" />' , self.html, re.S|re.M)
+        self.assert_(m, "Global custom meta tag %s not applied." % 'metatag4')
+
+    def testDeleteCustomMetaTags(self):
+        self.sp.manage_changeProperties(**{'default_custom_metatags':'metatag1|global_metatag1value'})
+        my_doc = self.my_doc
+        my_doc.qseo_properties_edit(custommetatags=custom_metatags, custommetatags_override=0)
+        html = self.publish(self.abs_path, self.basic_auth).getBody()
+        m = re.search('<meta name="metatag4" content="global_metatag4value" />' , html, re.S|re.M)
+        self.assert_(not m, "Global custom meta tag %s is prosent in the page." % 'metatag4')
+        m = re.search('<meta name="metatag1" content="global_metatag1value" />' , html, re.S|re.M)
+        self.assert_(m, "Global custom meta tag %s is prosent in the page." % 'metatag4')
 
     def testCanonical(self):