Changeset 3224 in products for quintagroup.seoptimizer/trunk/quintagroup
- Timestamp:
- Jun 1, 2011 3:38:29 PM (13 years ago)
- Location:
- quintagroup.seoptimizer/trunk/quintagroup/seoptimizer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/views.py
r3141 r3224 65 65 'Subject', ()), 66 66 "seo_keywords": self.getSEOProperty('qSEO_keywords', default=()), 67 "seo_canonical": self.get Canonical(),67 "seo_canonical": self.getSEOProperty(CANONICAL_PROPERTY), 68 68 # Add test properties 69 69 "has_seo_title": self.context.hasProperty('qSEO_title'), … … 158 158 return result 159 159 160 # Not used 160 161 def getCanonical(self): 161 canonical = queryAdapter(self.context, ICanonicalLink) 162 return canonical and canonical.canonical_link or "" 162 # TODO: rewrite function structure 163 if self.context.hasProperty(CANONICAL_PROPERTY): 164 canonical = queryAdapter(self.context, ICanonicalLink) 165 return canonical and canonical.canonical_link or "" 166 return "" 163 167 164 168 -
quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testCanonicalURL.py
r3141 r3224 5 5 import re 6 6 from Products.CMFCore.utils import getToolByName 7 from quintagroup.canonicalpath.adapters import PROPERTY_LINK \ 8 as CANONICAL_PROPERTY 7 9 8 10 … … 20 22 re.S | re.M) 21 23 22 def test_ CanonicalURL(self):24 def test_NoCanonicalURL(self): 23 25 html = self.publish(self.mydoc_path, self.basic_auth).getBody() 24 26 foundcurls = self.curl.findall(html) 25 mydoc_url = self.mydoc.absolute_url() 27 assert not self.mydoc.hasProperty(CANONICAL_PROPERTY) 28 self.assertTrue(not foundcurls, "CANONICAL URL found, " \ 29 "but object hasn't '%s' property" % CANONICAL_PROPERTY) 26 30 27 self.assertTrue([1 for curl in foundcurls if curl == mydoc_url], 31 def test_CanonicalProperty(self): 32 self.assertTrue(not self.mydoc.hasProperty(CANONICAL_PROPERTY), 33 'Canonical URL property is present in new document.') 34 35 def test_CanonicalPropertyEnable(self): 36 curl = '/newcanonical' 37 res = self.publish(self.mydoc_path + '/@@seo-context-properties?' \ 38 'seo_canonical=%s&seo_canonical_override=checked&'\ 39 'form.submitted=1&form.button.Save=Save' % curl, 40 self.basic_auth).getBody() 41 42 self.assertTrue(self.mydoc.hasProperty(CANONICAL_PROPERTY), 43 'Overriding Canonical URL enabled,' \ 44 'but object hasn\'t canonical url property') 45 46 self.assertTrue(self.mydoc.getProperty(CANONICAL_PROPERTY) == curl, 47 "Wrong Canonical URL for document: %s, all must be: %s" 48 % (self.mydoc.getProperty(CANONICAL_PROPERTY), curl)) 49 50 def test_CanonicalPropertyDisable(self): 51 curl = '/newcanonical' 52 self.mydoc.manage_addProperty(CANONICAL_PROPERTY, curl, 53 'string') 54 55 assert self.mydoc.getProperty(CANONICAL_PROPERTY) == curl 56 57 res = self.publish(self.mydoc_path + '/@@seo-context-properties?' \ 58 'seo_canonical=%s&seo_canonical_override=&'\ 59 'form.submitted=1&form.button.Save=Save' % curl, 60 self.basic_auth).getBody() 61 62 self.assertTrue(not self.mydoc.hasProperty(CANONICAL_PROPERTY), 63 'Overriding Canonical URL disabled,' \ 64 'but canonical link is present in object properties') 65 66 def test_CanonicalUrlPresent(self): 67 self.mydoc.manage_addProperty(CANONICAL_PROPERTY, self.mydoc_path, 68 'string') 69 assert self.mydoc.hasProperty(CANONICAL_PROPERTY) 70 71 html = self.publish(self.mydoc_path, self.basic_auth).getBody() 72 foundcurls = self.curl.findall(html) 73 74 self.assertTrue([1 for curl in foundcurls if curl == self.mydoc_path], 28 75 "Wrong CANONICAL URL for document: %s, all must be: %s" % ( 29 foundcurls, mydoc_url))76 foundcurls, self.mydoc_path)) 30 77 31 78 def test_updateCanonicalURL(self):
Note: See TracChangeset
for help on using the changeset viewer.