Ticket #1762: webtest_blended.patch

setup.py

@@ -46 +46 @@
-
-testtools =  [
-    "nose >= 0.9.3, <= 0.10.0a1",
+    "WebTest",
-]
-
-tgtesttools =  [
-    "nose >= 0.9.3, <= 0.10.0a1",
+    "WebTest",
-]
-
-# python 2.5 compatible list

turbogears/identity/tests/test_identity.py

@@ -55 +55 @@
-
-    @expose()
-    def index(self):
-pass
+return dict()
-
-    @expose()
-    def identity_failed(self, **kw):
@@ -69 +69 @@
-    @expose()
-    @identity.require(in_group('peon'))
-    def in_peon_group(self):
+        user = TG_User.by_user_name("samIam")
+        group_ids = set((TG_Group.by_group_name("peon").id,
+            TG_Group.by_group_name("other").id))
+        assert identity.current.user == user
+        assert identity.current.user_name == user.user_name
+        assert identity.current.user_id == user.id
+        assert identity.current.groups == set(('peon', 'other'))
+        assert identity.current.group_ids == group_ids
+        assert "samIam" == cherrypy.serving.request.identity.user_name
+
-        return 'in_peon_group'
-
-    @expose()
@@ -136 +146 @@
-            return 'wrong params: %s\nexpected unicode objects' \
-                ' for all strings' % cherrypy.request.params
-
+    @expose()
+    def is_anonymous(self):
+        assert cherrypy.serving.request.identity.user_name == None
+        assert cherrypy.serving.request.identity.anonymous
+        assert identity.current.anonymous
+        return 'is_anonymous'
-
-class TestIdentity(unittest.TestCase):
-
+
+class TestIdentity(testutil.TGWebTest):
+
-    def setUp(self):
-        # identity requires visit and a failure_url
-        test_config = {'global': {
@@ -151 +169 @@
-        self._original_config = original_config
-        config.configure_loggers(test_config)
-        config.update(test_config['global'])
-cherrypy.root = IdentityRoot(
-startup.startTurboGears(
+testutil.mount(IdentityRoot()
+testutil.TGWebTest.setUp(self
-        self.init_model()
-
-    def tearDown(self):
-
+
+
-        config.update(self._original_config)
-
-    def init_model(self):
@@ -181 +200 @@
-
-    def test_user_password_parameters(self):
-        """Controller can receive user_name and password parameters."""
-
-
-
+
+
-
-    def test_user_exists(self):
-        u = TG_User.by_user_name('samIam')
@@ -205 +223 @@
-        config.update({'identity.soprovider.encryption_algorithm': None})
-        # force new config values to load
-        startup.startTurboGears()
-testutil.create_reques
+self.app.ge
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
-        u.password = u'garçon'
@@ -219 +237 @@
-        config.update({'identity.soprovider.encryption_algorithm': 'sha1'})
-        # force new config values to load
-        startup.startTurboGears()
-testutil.create_reques
+self.app.ge
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
-        u.password = 'password'
@@ -234 +252 @@
-        config.update({'identity.soprovider.encryption_algorithm': 'sha1'})
-        # force new config values to load
-        startup.startTurboGears()
-testutil.create_reques
+self.app.ge
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
-        u.password = u'garçon'
@@ -248 +266 @@
-        config.update({'identity.soprovider.encryption_algorithm': 'md5'})
-        # force new config values to load
-        startup.startTurboGears()
-testutil.create_reques
+self.app.ge
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
-        u.password = 'password'
@@ -263 +281 @@
-        config.update({'identity.soprovider.encryption_algorithm': 'md5'})
-        # force new config values to load
-        startup.startTurboGears()
-testutil.create_reques
+self.app.ge
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
-        u.password = u'garçon'
@@ -280 +298 @@
-        config.update({'identity.soprovider.encryption_algorithm': 'md5'})
-        # force new config values to load
-        startup.startTurboGears()
-testutil.create_reques
+self.app.ge
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
-        u.password = u'garçon'.encode('UTF-8')
@@ -295 +313 @@
-        config.update({'identity.soprovider.encryption_algorithm':'sha1'})
-        # force new config values to load
-        startup.startTurboGears()
-testutil.create_reques
+self.app.ge
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
-        u.set_password_raw('password')
@@ -308 +326 @@
-        config.update({'identity.soprovider.encryption_algorithm':'sha1'})
-        # force new config values to load
-        startup.startTurboGears()
-testutil.create_reques
+self.app.ge
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
-        u.set_password_raw(u'garçon')
@@ -324 +342 @@
-                'identity.tests.test_identity.mycustomencrypt'})
-        # force new config values to load
-        startup.startTurboGears()
-testutil.create_reques
+self.app.ge
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
-        u.password = 'password'
@@ -335 +353 @@
-
-    def test_anonymous_browsing(self):
-        """Test if we can show up anonymously."""
-testutil.create_request('/
-identity.current.anonymous
+response = self.app.get('/is_anonymous
+'is_anonymous' in response
-
-    def test_deny_anonymous(self):
-        """Test that we have secured an url from anonymous users."""
-
-
-
+
+
-
-    def test_deny_anonymous_viewable(self):
-        """Test that a logged in user can see an resource blocked
-        from anonymous users."""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=secret&login=Login')
-
-
+
-
-    def test_logout(self):
-        """Test that logout works and session is gets invalid afterwards."""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=secret&login=Login')
-
-
-
-
-
-
+
+
+
+
-
-    def test_logout_with_set_identity(self):
-        """Test that logout works even when there is no visit_key
-        (e.g. when testutils.set_identity_user is used)."""
-        request = testutil.DummyRequest()
-        old_user = testutil.test_user
-        user = TG_User.by_user_name("samIam")
-        testutil.set_identity_user(user)
-        testutil.attach_identity(request)
-        testutil.set_identity_user(old_user)
-        testutil.call_with_request(cherrypy.root.logout, request)
-        assert request.identity.anonymous
-
-    def test_require_group(self):
-        """Test that a anonymous user"""
-
-
-
+
+
-
-    def test_require_expose_required_permission(self):
-        """Test that the decorator exposes the correct permissions via _require
-        attribute on the actual method."""
-
-
-
+
+
-
-    def test_require_group_viewable(self):
-        """Test that a user with proper group membership can see a restricted url."""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=secret&login=Login')
-
-
+
-        user = TG_User.by_user_name("samIam")
-
-    def test_require_group_viewable(self):
-        """Test that the current user and group properties are set correctly."""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=secret&login=Login')
-        user = TG_User.by_user_name("samIam")
-        group_ids = set((TG_Group.by_group_name("peon").id,
-            TG_Group.by_group_name("other").id))
-        assert identity.current.user == user
-        assert identity.current.user_name == user.user_name
-        assert identity.current.user_id == user.id
-        assert identity.current.groups == set(('peon', 'other'))
-        assert identity.current.group_ids == group_ids
-
-    def test_user_not_in_right_group(self):
-
-
+
+
+
-            'user_name=samIam&password=secret&login=Login')
-
-
+
-
-    def test_require_permission(self):
-
-
-
-
+
+
+
+
+
-
-    def test_require_permission_viewable(self):
-        """Test that a user with proper permissions can see a restricted url."""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=secret&login=Login')
-
-
+
-
-    def test_user_lacks_permission(self):
-
-
+
+
+
+
-            'user_name=samIam&password=secret&login=Login')
-
-
+
-
-    def test_user_info_available(self):
-        """Test that we can see user information inside our controller."""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=secret&login=Login')
-
-
+
-
-    def test_bad_login(self):
-        """Test that we are denied access if we provide a bad login."""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=wrong&login=Login')
-
-
+
-
-    def test_restricted_subdirectory(self):
-        """Test that we can restrict access to a whole subdirectory."""
-
-
-
+
+
-
-    def test_restricted_subdirectory_viewable(self):
-        """Test that we can access a restricted subdirectory
-        if we have proper credentials."""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=secret&login=Login')
-
-
+
-
-    def test_decoratator_in_restricted_subdirectory(self):
-        """Test that we can require a different permission
-        in a protected subdirectory."""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=secret&login=Login')
-
-
+
-
-    def test_decoratator_failure_in_restricted_subdirectory(self):
-        """Test that we can get an identity failure from a decorator
-        in a restricted subdirectory"""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=secret&login=Login')
-
-
+
-
-    def test_explicit_checks_in_restricted_subdirectory(self):
-        """Test that explicit permission checks in a protected
-        directory is handled as expected"""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=secret&login=Login')
-
-
+
-
-    def test_throwing_identity_exception_in_restricted_subdirectory(self):
-        """Test that throwing an IdentityException in a protected
-        directory is handled as expected"""
-testutil.create_reques
+response = self.app.ge
-            'user_name=samIam&password=secret&login=Login')
-
-
+
-
-    def test_decode_filter_whenidfails(self):
-        """Test that the decode filter doesn't break with nested
-        variables and Identity"""
-        params = urllib.quote(IdentityRoot._test_encoded_params.decode(
-            'utf-8').encode('latin-1'), '=&')
-
-
-
+
+
-
-    def test_decode_filter_whenidworks(self):
-        """Test that the decode filter doesn't break with nested
@@ -511 +497 @@
-        params = urllib.quote(IdentityRoot._test_encoded_params.decode(
-            'utf-8').encode('latin-1'), '=&')
-        params += '&user_name=samIam&password=secret&login=Login'
-
-
-
+
+
-
-
-class TestTGUser(testutil.DBTest):
@@ -522 +507 @@
-    def setUp(self):
-        self._identity_on = config.get('identity.on', False)
-        config.update({'identity.on': False})
-        try:
-            self._provider = cherrypy.request.identityProvider
-        except AttributeError:
-            self._provider= None
-        cherrypy.request.identityProvider = None
-        startup.startTurboGears()
-        testutil.DBTest.setUp(self)
-
-    def tearDown(self):
-        testutil.DBTest.tearDown(self)
-        startup.stopTurboGears()
-        cherrypy.request.identityProvider = self._provider
-        config.update({'identity.on': self._identity_on})
-
-    def test_create_user(self):

turbogears/identity/tests/test_visit.py

@@ -2 +2 @@
-from unittest import TestCase
-import cherrypy
-from turbogears import config, controllers, expose, startup, testutil, visit
+from Cookie import SimpleCookie
-
-
-morsel
+response
-    """Returns a dict containing cookie information to pass to a server."""
-{'Cookie': morsel.output(header="")[1:]}
+dict(Cookie=response.headers['Set-Cookie'])
-
-
-class VisitRoot(controllers.RootController):
-
-    @expose()
-    def index(self):
-
+
+
+
+
+
-
-
-class TestVisit(TestCase):
-
-    def setUp(self):
+        testutil.stop_server(tg_only = True)
-        self._visit_on = config.get('visit.on', False)
-        config.update({'visit.on': True})
-        self._visit_timeout = config.get('visit.timeout', 20)
-        config.update({'visit.timeout': 50})
-        self.cookie_name = config.get("visit.cookie.name", 'tg-visit')
-
+
+
-
-    def tearDown(self):
-startup.stopTurboGears(
+testutil.stop_server(tg_only = True
-        config.update({'visit.timeout': self._visit_timeout})
-        config.update({'visit.on': self._visit_on})
-
-    def test_visit_response(self):
-        """Test if the visit cookie is set in cherrypy.response."""
-testutil.create_reques
-cherrypy.response.simple_cookie
+response = self.app.ge
+response.cookies_set
-
-    def test_new_visit(self):
-        """Test that we can see a new visit on the server."""
-testutil.create_reques
-visit.current().is_new
+response = self.app.ge
+response.raw['new']
-
-    def test_old_visit(self):
-        """Test if we can track a visitor over time."""
-testutil.create_reques
+response = self.app.ge
-        # first visit's cookie
-
-
-
+
+
+
+
+
-
-    def test_cookie_expires(self):
-        """Test if the visit timeout mechanism works."""
-        timeout = config.get('visit.timeout', 50)
+        _app = self.app
-        try:
-            # set expiration to one second for this test only
+            testutil.stop_server(tg_only = True)
-            config.update({'visit.timeout': 1.0/60})
-
-
+
+
+
+
-            time.sleep(2) # 2 seconds
-testutil.create_request("/", headers=cookie_header(morsel
+response = self.app.get("/", headers=cookie_header(response
-        finally:
-            config.update({'visit.timeout': timeout})
-
-
+
+
+
-            'cookie values should not match'
-visit.current().is_new
+response.raw['new']
-            'this should be a new visit, as the cookie has expired'
-
-    def test_cookie_not_permanent(self):
-        """Check that by default the visit cookie is not permanent."""
-
-
+
+
+
-        assert not morsel['expires'] and not morsel['max-age']
-
-    def test_cookie_permanent(self):
@@ -78 +93 @@
-        permanent = config.get('visit.cookie.permanent', False)
-        try:
-            # set cookie permanent for this test only (needs restart)
-startup.stopTurboGears(
+testutil.stop_server(tg_only = True
-            config.update({'visit.cookie.permanent': True})
-
-
-
+
+
+
+
+
-        finally:
-            config.update({'visit.cookie.permanent': permanent})
-3000
+'3000'
-        expires = time.mktime(time.strptime(morsel['expires'],
-            '%a, %d-%b-%Y %H:%M:%S GMT')[:8] + (0,))
-
-
+
+
+

turbogears/visit/api.py

@@ -251 +251 @@
-        max_age = self.cookie_max_age
-        if max_age:
-            # use 'expires' because MSIE ignores 'max-age'
-
+'"%s"' % 
-                "%a, %d-%b-%Y %H:%M:%S GMT",
-                time.gmtime(time.time() + max_age))
-            # 'max-age' takes precedence on standard conformant browsers

turbogears/tests/test_form_controllers.py

@@ -1 @@
-from unittest import TestCase
-from datetime import datetime
+from unittest import TestCase
-import cherrypy
-from turbogears import widgets, config, controllers, expose, mochikit, \
-    validate, validators, testutil
+from turbogears.testutil import mount, unmount, make_app
-
-
+def setup_module():
+    global app
+    app = make_app(MyRoot)
+    testutil.start_server()
+
+def teardown_module():
+    testutil.stop_server()
+
+
-class MyFormFields(widgets.WidgetsList):
-    #XXX: Since allow_extra_fields should be removed from validators.Schema,
-    #     we need a validator for every input-expecting widget
@@ -16 +26 @@
-myform = widgets.TableForm(fields=MyFormFields())
-
-
+class State(object):
+    counter = 0
+
+class AddingValidator(validators.FancyValidator):
+    def _to_python(self, value, state=None):
+        state.counter += 1
+        return value
+
+class AddingSchema(validators.Schema):
+    a = AddingValidator()
+    b = AddingValidator()
+
+class AddingNestedSchema(AddingSchema):
+    c = AddingSchema()
+
+
-class MyRoot(controllers.RootController):
-
-    @expose(html="turbogears.tests.form")
@@ -31 +57 @@
-    def testform(self, name, date, age, tg_errors=None):
-        if tg_errors:
-            self.has_errors = True
-
-
-
+
-
-    @expose()
-    @validate(form=myform)
-    def testform_new_style(self, name, date, age):
-        if cherrypy.request.validation_errors:
-            self.has_errors = True
-
-
-
+
-
+    @expose()
+    @validate(validators=AddingNestedSchema(), state_factory=State)
+    def validation(self, a, b, c):
+        return 'counter: %d' % cherrypy.request.validation_state.counter
+
-def test_form_translation():
-    """Form input is translated into properly converted parameters"""
-
-
-
-
-
+
+
+
-
-def test_form_translation_new_style():
-    """Form input is translated into properly converted parameters"""
-
-
-
-
-
+
+
+
-
-def test_invalid_form_with_error_handling():
-    """Invalid forms can be handled by the method"""
-
-
-
+
-
-def test_css_should_appear():
-    """CSS should appear when asked for"""
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response
-
-def test_javascript_should_appear():
-    """JavaScript should appear when asked for"""
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response
-
-def test_include_mochikit():
-    """JSLinks (and MochiKit especially) can be included easily"""
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response
-
-def test_suppress_mochikit():
-    """MochiKit inclusion can be suppressed"""
-
-
-
+
+
-    # repair the fixture
-
-
-
-
-
+
-
+    included = app.get("/usemochi")
+    assert "MochiKit.js" not in suppressed.body
+    assert "MochiKit.js" in included.body
+
-def test_mochikit_everywhere():
-    """MochiKit can be included everywhere by setting tg.mochikit_all"""
- {"tg.mochikit_all"
-testutil.create_reques
- {"tg.mochikit_all"
-cherrypy.response.body[0]
+{"tg.mochikit_all" 
+response = app.ge
+{"tg.mochikit_all" 
+response
-
-def test_mochikit_nowhere():
-    """Setting tg.mochikit_suppress will prevent including it everywhere"""
-    config.update({"global": {"tg.mochikit_all": True}})
-    config.update({"global": {"tg.mochikit_suppress": True}})
-testutil.create_reques
+response = app.ge
-    config.update({"global": {"tg.mochikit_all": False}})
-    config.update({"global": {"tg.mochikit_suppress": False}})
-cherrypy.response.body[0]
+response
-
-def test_include_widgets():
-    """Any widget can be included everywhere by setting tg.include_widgets"""
-    config.update({"global": {"tg.include_widgets": ["mochikit"]}})
-testutil.create_reques
+response = app.ge
-    config.update({"global": {"tg.include_widgets": []}})
-cherrypy.response.body[0]
+response
-
+def test_counter_is_incremented():
+    # parameter values are irrelevant
+    url = '/validation?a=1&b=2&c.a=3&c.b=4'
+    response = app.get(url)
+    msg = "Validation state is not handled properly"
+    # 4 == 1 (a) + 1(b) + 1(c.a) + 1(c.b)
+    assert 'counter: 4' in response.body, msg
-
-class State(object):
-    counter = 0
-
-class AddingValidator(validators.FancyValidator):
-    def _to_python(self, value, state=None):
-        state.counter += 1
-        return value
-
-class AddingSchema(validators.Schema):
-    a = AddingValidator()
-    b = AddingValidator()
-
-class AddingNestedSchema(AddingSchema):
-    c = AddingSchema()
-
-
-class TestValidationState(TestCase):
-
-    class Controller(controllers.RootController):
-
-        @expose()
-        @validate(validators=AddingNestedSchema(), state_factory=State)
-        def validation(self, a, b, c):
-            return 'counter: %d' % cherrypy.request.validation_state.counter
-
-    def __init__(self, *args, **kw):
-        super(TestValidationState, self).__init__(*args, **kw)
-
-    def test_counter_is_incremented(self):
-        cherrypy.root = self.Controller()
-        # parameter values are irrelevant
-        url = '/validation?a=1&b=2&c.a=3&c.b=4'
-        testutil.create_request(url)
-        body = cherrypy.response.body[0]
-        msg = "Validation state is not handled properly"
-        # 4 == 1 (a) + 1(b) + 1(c.a) + 1(c.b)
-        self.failUnless('counter: 4' in body, msg)

turbogears/tests/test_errorhandling.py

@@ -1 +1 @@
-import unittest
-
-import cherrypy
-
-from turbogears.controllers import error_handler, exception_handler, \
-                                   expose, validate, RootController, Controller
-from turbogears.errorhandling import FailsafeSchema
@@ -16 +13 @@
-    else:
-        return str(errors)
-
+def setup_module():
+    testutil.unmount()
+    testutil.mount(MyRoot())
+    testutil.mount(NestedController(), "/nestedcontroller")
+    testutil.start_server()
-
+def teardown_module():
+    testutil.unmount()
+    testutil.stop_server()
+
-class MyRoot(RootController):
-
-    def defaulterrorhandler(self, tg_source, tg_errors, tg_exceptions,
@@ -94 +100 @@
-        "second": validators.Int(not_empty=True)})
-    @error_handler(defaulterrorhandler)
-    def positionalargs(self, first, second, *args, **kw):
-        self.first = first
-        self.second = second
-        self.third = args[0]
-        return dict(title="Positional arguments", first=first, second=second,
-
+third=args[0], 
-
-    @expose()
-    @validate(validators={"bar": validators.Int(not_empty=True)})
@@ -141 +144 @@
-        return self.notexposed(bar)
-
-    def continuation(self, tg_source):
-
-
+
+
+
-
-    @expose()
-    @validate(validators={"bar": validators.Int(not_empty=True)})
@@ -208 +212 @@
-        return dict(title="Nested")
-
-
+app = testutil.make_app()
+
-class TestErrorHandler(unittest.TestCase):
-
-    def setUp(self):
-        cherrypy.root = MyRoot()
-        cherrypy.root.nestedcontroller = NestedController()
-
-    def test_defaultErrorHandler(self):
-        """Default error handler."""
-testutil.create_reques
-cherrypy.response.body[0]
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response
+response = app.ge
+response
-
-    def test_specialisedErrorHandler(self):
-        """Error handler specialisation."""
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-    def test_exceptionErrorHandler(self):
-        """Error handler for exceptions."""
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response
-
-    def test_recursiveErrorHandler(self):
-        """Recursive error handler."""
-
-
-
-
-
+
+
+
+
-
-    def test_implicitErrorHandler(self):
-        """Implicit error handling."""
-
-
-
-
-
-
+
+
+
+
-
-    def test_normalMethodErrorHandler(self):
-        """Normal method as an error handler."""
-testutil.create_reques
-cherrypy.response.body[0]
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response
+response = app.ge
+response
-
-    def test_infiniteRecursionPrevention(self):
-        """Infinite recursion prevention."""
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response
-
-    def test_positionalArgs(self):
-        """Positional argument validation."""
-testutil.create_reques
-cherrypy.response.body[0]
-testutil.create_reques
-cherrypy.response.body[0]
-