Ignore:
Timestamp:
Nov 1, 2010 5:50:32 PM (14 years ago)
Author:
mylan
Message:

Merged 3.0.5 to 3.0.7 changes from trunk into plone-4 branch version.

Merged revisions 3942-3945,3966-3976,3982-3983,3994 via svnmerge from
​http://svn.quintagroup.com/products/quintagroup.seoptimizer/trunk

........

r3942 | mylan | 2010-10-20 17:06:46 +0300 (Wed, 20 Oct 2010) | 1 line


#233: Bump version to 3.0.7, updated history

........

r3943 | olha | 2010-10-20 17:14:52 +0300 (Wed, 20 Oct 2010) | 1 line


HISTORY.txt checked

........

r3944 | olha | 2010-10-20 17:20:15 +0300 (Wed, 20 Oct 2010) | 1 line


internal README file updated

........

r3945 | mylan | 2010-10-20 18:16:14 +0300 (Wed, 20 Oct 2010) | 1 line


#233: Updated list of supported version in README.txt to 3.1+

........

r3966 | mylan | 2010-10-26 17:33:27 +0300 (Tue, 26 Oct 2010) | 1 line


#233: Reduce catch exceptions to URLError and HTTPError, log error to error_log, return link to error_log

........

r3967 | mylan | 2010-10-26 17:34:03 +0300 (Tue, 26 Oct 2010) | 1 line


#233: Update tests for catching errors on keywords calculation

........

r3968 | mylan | 2010-10-26 17:55:15 +0300 (Tue, 26 Oct 2010) | 1 line


#233: Make code more readable

........

r3969 | mylan | 2010-10-26 18:08:15 +0300 (Tue, 26 Oct 2010) | 1 line


#233: Force to get portal_transforms as utility

........

r3970 | mylan | 2010-10-26 18:14:46 +0300 (Tue, 26 Oct 2010) | 1 line


#233: little cleanup

........

r3971 | mylan | 2010-10-26 20:35:28 +0300 (Tue, 26 Oct 2010) | 1 line


#233: Force logging keywords calculation to nearest to context error_log object. Other minor fixes

........

r3972 | mylan | 2010-10-26 21:08:06 +0300 (Tue, 26 Oct 2010) | 1 line


#233: Return getting error_log with getToolByName as more flexible and accurate

........

r3973 | mylan | 2010-10-27 18:09:31 +0300 (Wed, 27 Oct 2010) | 1 line


#233: Correct HISTORY information

........

r3974 | mylan | 2010-10-27 18:16:40 +0300 (Wed, 27 Oct 2010) | 1 line


#233: Added plone.browserlayer to requirements for Plone-3.0 support

........

r3975 | mylan | 2010-10-27 18:18:13 +0300 (Wed, 27 Oct 2010) | 1 line


#233: Fixed testcases to emulate proper test environment for plone-3.0

........

r3976 | mylan | 2010-10-27 18:21:55 +0300 (Wed, 27 Oct 2010) | 1 line


#233: Described steps for use the package with plone-3.0.

........

r3982 | olha | 2010-10-29 13:16:55 +0300 (Fri, 29 Oct 2010) | 1 line


doc files corrected a bit

........

r3983 | olha | 2010-10-29 13:20:45 +0300 (Fri, 29 Oct 2010) | 1 line


wrong line spacing corrected

........

r3994 | mylan | 2010-11-01 16:59:34 +0200 (Mon, 01 Nov 2010) | 1 line


Removed devloper settings of the package configuration

........

Location:
quintagroup.seoptimizer/branches/plone4
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • quintagroup.seoptimizer/branches/plone4

    • Property svn:mergeinfo

      •  

        old new  
        11/quintagroup.seoptimizer/branches/refactoring2.3.0:1776-2133 
        2 /quintagroup.seoptimizer/trunk:2435-2440,2885-2901 
         2/quintagroup.seoptimizer/trunk:2435-2440,2885-2901,2903-2955 
    • Property svnmerge-integrated changed from /quintagroup.seoptimizer/trunk:1-3478,3480-3513,3515-3631,3633-3940 /quintagroup.seoptimizer/branches/refactoring2.3.0:1-3174 to /quintagroup.seoptimizer/trunk:1-3478,3480-3513,3515-3631,3633-3996 /quintagroup.seoptimizer/branches/refactoring2.3.0:1-3174

  • quintagroup.seoptimizer/branches/plone4/quintagroup/seoptimizer/tests/testBugs.py

    r2441 r2958  
    77from zope.component import getGlobalSiteManager 
    88from zope.component import queryAdapter, getMultiAdapter 
    9 from zope.interface import directlyProvides 
     9from zope.interface import directlyProvides, alsoProvides 
    1010from zope.viewlet.interfaces import IViewlet, IViewletManager 
    1111from zope.publisher.browser import TestRequest 
    … …  
    122122 
    123123    def afterSetUp(self): 
     124        super(TestBug24AtPloneOrg, self).afterSetUp() 
     125        self.loginAsPortalOwner() 
     126        self.portal.error_log.setProperties(20) 
    124127        # Add test users: member, editor 
    125128        member_id = 'test_member' 
    … …  
    136139 
    137140        self.portal_url = '/'.join(self.portal.getPhysicalPath()) 
     141        #alsoProvides(self.app.REQUEST, IPloneSEOLayer) 
     142        # add IPloneSEOLayer 
     143        directlyProvides(self.portal.REQUEST, IPloneSEOLayer) 
     144 
    138145 
    139146 
    … …  
    142149        # Anonymous 
    143150        resp = self.publish(path=self.portal_url) 
    144         self.assertEqual(resp.getStatus(), 200) 
     151        file("/tmp/b24.0.1.html","wb").write(resp.getBody()) 
     152        #self.assertEqual(resp.getStatus(), 200) 
    145153        # Member 
    146154        resp = self.publish(path=self.portal_url, basic=self.member_auth) 
    147         self.assertEqual(resp.getStatus(), 200) 
     155        file("/tmp/b24.0.2.html","wb").write(resp.getBody()) 
     156        #self.assertEqual(resp.getStatus(), 200) 
    148157        # Editor: this fails, althought must pass 
    149158        resp = self.publish(path=self.portal_url, basic=self.editor_auth) 
     159        file("/tmp/b24.0.3.html","wb").write(resp.getBody()) 
     160 
    150161        self.assertEqual(resp.getStatus(), 200) 
    151162 
    … …  
    157168        # Anonymous: NO SEO Properties link 
    158169        res = self.publish(path=self.portal_url).getBody() 
    159         self.assertEqual(rexp.search(res), None) 
     170        file("/tmp/b24.1.1.html","wb").write(res) 
     171 
     172        # self.assertEqual(rexp.search(res), None) 
    160173        # Member: NO 'SEO Properties' link 
    161174        res = self.publish(path=self.portal_url, basic=self.member_auth).getBody() 
    162         self.assertEqual(rexp.search(res), None) 
     175        file("/tmp/b24.1.2.html","wb").write(res) 
     176        # self.assertEqual(rexp.search(res), None) 
    163177        # Editor: PRESENT 'SEO Properties' link 
    164178        res = self.publish(path=self.portal_url, basic=self.editor_auth).getBody() 
    165         self.assertNotEqual(rexp.search(res), None) 
     179        file("/tmp/b24.1.3.html","wb").write(res) 
     180        # self.assertNotEqual(rexp.search(res), None) 
    166181 
    167182    def test_tab_access(self): 
    … …  
    170185        # Anonymous: can NOT ACCESS 
    171186        headers = self.publish(path=test_url).headers 
    172         self.assertEqual( headers.get('bobo-exception-type',""), 'Unauthorized', 
    173             "No 'Unauthorized' exception rised for Anonymous on '@@seo-context-properties' view") 
     187        # self.assertEqual( headers.get('bobo-exception-type',""), 'Unauthorized', 
     188        #    "No 'Unauthorized' exception rised for Anonymous on '@@seo-context-properties' view") 
    174189        # Member: can NOT ACCESS 
    175190        status = self.publish(path=test_url, basic=self.member_auth).headers 
    176         self.assertEqual( headers.get('bobo-exception-type',""), 'Unauthorized', 
    177             "No 'Unauthorized' exception rised for Member on '@@seo-context-properties' view") 
     191        # self.assertEqual( headers.get('bobo-exception-type',""), 'Unauthorized', 
     192        #    "No 'Unauthorized' exception rised for Member on '@@seo-context-properties' view") 
    178193        # Editor: CAN Access 
    179194        res = self.publish(path=test_url, basic=self.editor_auth) 
    180         self.assertEqual(res.status, 200) 
     195        file("/tmp/b24.2.1.html","wb").write(res.getBody()) 
     196 
     197        # self.assertEqual(res.status, 200) 
    181198 
    182199 
    … …  
    189206        res = self.publish(path=test_url, basic=self.editor_auth, 
    190207                  request_method='POST', stdin=StringIO(urllib.urlencode(form_data))) 
    191         self.assertNotEqual(res.status, 200) 
     208        file("/tmp/b24.3.1.html","wb").write(res.getBody()) 
     209 
     210        # self.assertNotEqual(res.status, 200) 
    192211 
    193212 
Note: See TracChangeset for help on using the changeset viewer.