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/testConfiglet.py

    r3163 r3510  
    3232 
    3333    def testAddContentSitemap(self): 
    34         resp = self.submitForm( 
    35                    {'form.button.AddContent': "Add Content Sitemap"}) 
     34        resp = self.submitForm({'form.button.AddContent': 
     35                               "Add Content Sitemap"}) 
    3636        self.assertEqual(resp.getStatus() / 100, 3) 
    3737        sm_edit = "sitemap.xml/edit" 
     
    4141        #self.portal["sitemap.xml"].setPortalTypes(("Documents",)) 
    4242        newform = self.publish(self.settingsURL, basic=self.auth).getBody() 
    43         self.assertEqual('href="http://nohost/plone/sitemap.xml/edit"' in \ 
     43        self.assertEqual('href="http://nohost/plone/sitemap.xml/edit"' in 
    4444                         newform, True) 
    4545        self.assertEqual("form.button.AddContent" in newform, False) 
     
    5454        #self.portal["news-sitemap.xml"].setPortalTypes(("News Item",)) 
    5555        newform = self.publish(self.settingsURL, basic=self.auth).getBody() 
    56         self.assertEqual('href="http://nohost/plone/news-sitemap.xml/edit"' \ 
     56        self.assertEqual('href="http://nohost/plone/news-sitemap.xml/edit"' 
    5757                         in newform, True) 
    5858        self.assertEqual("form.button.AddNews" in newform, False) 
     
    6767        #self.portal["mobile-sitemap.xml"].setPortalTypes(("Documents",)) 
    6868        newform = self.publish(self.settingsURL, basic=self.auth).getBody() 
    69         self.assertEqual('href="http://nohost/plone/mobile-sitemap.xml/edit"' \ 
     69        self.assertEqual('href="http://nohost/plone/mobile-sitemap.xml/edit"' 
    7070                         in newform, True) 
    7171        self.assertEqual("form.button.AddMobile" in newform, False) 
Note: See TracChangeset for help on using the changeset viewer.