Ignore:
Timestamp:
Aug 22, 2012 10:22:22 AM (8 years ago)
Author:
potar
Message:

Merged sitemap_date branch into trunk

Location:
quintagroup.plonegooglesitemaps/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • quintagroup.plonegooglesitemaps/trunk

    • Property svn:mergeinfo
      •  

        old new  
        33/quintagroup.plonegooglesitemaps/branches/migratioin_product:2826-2839 
        44/quintagroup.plonegooglesitemaps/branches/plone4:2549-2553 
         5/quintagroup.plonegooglesitemaps/branches/sitemap_date:3481-3509 
        56/quintagroup.plonegooglesitemaps/branches/test_refactoring:2527-2536 
  • quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testMobileSitemaps.py

    r3163 r3510  
    4040    def reParse(self): 
    4141        # Parse mobile sitemap 
    42         self.sitemap = self.publish("/" + self.portal.absolute_url(1) + \ 
     42        self.sitemap = self.publish("/" + self.portal.absolute_url(1) + 
    4343                                    "/mobile-sitemap.xml", 
    4444                                    "%s:%s" % (portal_owner, 
     
    6464 
    6565    def test_lastmod(self): 
    66         md = [f for k, f in \ 
    67               mobilesitemapview.MobileSitemapView.additional_maps \ 
     66        md = [f for k, f in 
     67              mobilesitemapview.MobileSitemapView.additional_maps 
    6868              if k == 'modification_date'][0] 
    6969        bmobile = self.portal.portal_catalog(id="my_mobile")[0] 
    7070        self.assert_("lastmod" in self.start.keys()) 
    71         self.assert_(md(bmobile) in self.data, "Wrong 'modified date':" \ 
    72                      " must be '%s', but exist: '%s'" \ 
     71        self.assert_(md(bmobile) in self.data, "Wrong 'modified date':" 
     72                     " must be '%s', but exist: '%s'" 
    7373                     % (md(bmobile), self.data)) 
    7474 
     
    8585        self.default_layout = mobile_sm.getProperty('layout', "") 
    8686        self.mobile_view = queryMultiAdapter((mobile_sm, self.portal.REQUEST), 
    87                                name=self.default_layout) 
     87                                             name=self.default_layout) 
    8888 
    8989    def testLayout(self): 
     
    100100    def testAdditionalMaps(self): 
    101101        self.assert_(hasattr(self.mobile_view, "additional_maps")) 
    102         self.assert_([1 for k, f in self.mobile_view.additional_maps \ 
     102        self.assert_([1 for k, f in self.mobile_view.additional_maps 
    103103                      if k == "modification_date"]) 
    104104 
Note: See TracChangeset for help on using the changeset viewer.