Changeset 2205 in products

Timestamp:

Apr 26, 2010 5:13:06 PM (14 years ago)

Author:

crchemist

Message:

fix ​http://plone.org/products/plone-seo/issues/20 and write test for it

Location:

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer

Files:

• browser/viewlets.py (modified) (1 diff)
• tests/testBugs.py (modified) (2 diffs)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/viewlets.py

@@ -158 +158 @@
 
     def std_title(self):
-        portal_title = safe_unicode(self.context_state.object_title())
-        page_title = safe_unicode(self.portal_state.portal_title())
+        page_title = safe_unicode(self.context_state.object_title())
+        portal_title = safe_unicode(self.portal_state.portal_title())
         if page_title == portal_title:
             return u"<title>%s</title>" % (escape(portal_title))

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testBugs.py

@@ -1 +1 @@
 import urllib
 from cStringIO import StringIO
+
+from zope.component import getMultiAdapter
+from zope.component import providedBy
+from zope.interface import directlyProvides
+from zope.viewlet.interfaces import IViewlet, IViewletManager
+from zope.publisher.browser import TestRequest
+
+from quintagroup.seoptimizer.browser.interfaces import IPloneSEOLayer
 from base import *
+
 
 class TestBugs(FunctionalTestCase):
@@ -27 +36 @@
         self.assertNotEqual(md_before, md_after)
 
+    def test_bug_20_at_plone_org(self):
+        portal = self.portal
+        fp = portal['front-page']
+        request = portal.REQUEST
+        view = portal.restrictedTraverse('@@plone')
+
+        manager = getMultiAdapter((fp, request, view), IViewletManager,
+                        name=u'plone.htmlhead')
+        viewlet = getMultiAdapter((fp, request, view, manager), IViewlet,
+                        name=u'plone.htmlhead.title')
+        viewlet.update()
+        old_title = viewlet.render()
+
+        # add IPloneSEOLayer
+        directlyProvides(request, IPloneSEOLayer)
+
+        viewlet = getMultiAdapter((fp, request, view, manager), IViewlet,
+                        name=u'plone.htmlhead.title')
+        viewlet.update()
+        new_title = viewlet.render()
+
+        self.assertEqual(old_title, new_title)
+
+
 
 def test_suite():