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]
-testutil.create_reques
-cherrypy.response.body[0]
-testutil.create_reques
-cherrypy.response.body[0]
-cherrypy.root.first
-cherrypy.root.second
-cherrypy.root.third
+response = app.ge
+response
+response = app.ge
+response
+response = app.ge
+response
+response = app.ge
+response
+response.raw['first']
+response.raw['second']
+response.raw['third']
-
-    def test_missingArgs(self):
-        """Arguments required in validation missing."""
-testutil.create_reques
-cherrypy.response.body[0]
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response
+response = app.ge
+response
-
-    def test_nohandler(self):
-        """No error hanlder declared."""
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response
-
-    def test_bindArgs(self):
-        """Arguments can be bond to an error handler."""
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response
-
-    def test_notExposed(self):
-        """Validation error handling is decoupled from expose."""
-testutil.create_reques
-cherrypy.response.body[0]
-cherrypy.response.body[0]
+response = app.ge
+response
+response
-
-    def test_continuations(self):
-        """Continuations via error handling mechanism."""
-testutil.create_reques
-cherrypy.response.body[0]
-cherrypy.root.continuation
+response = app.ge
+response
+response.raw['continuation']
-
-    def test_nested(self):
-        """Potentially ambiguous cases."""
-testutil.create_reques
-cherrypy.response.body[0]
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response
+response = app.ge
+response
-
-    def test_failsafe(self):
-        """Failsafe values for erroneous input."""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

turbogears/tests/test_sqlalchemy.py

@@ -9 +9 @@
-from turbogears.database import metadata, session, mapper, \
-    bind_metadata, get_metadata
-from turbogears.controllers import RootController
-create_request
-
+make_app
+, start_server, stop_server
-
-
-# Fixture
@@ -81 +81 @@
-    mapper(Address, addresses_table, properties=dict(
-        person=relation(Person, backref='addresses')))
-    mapper(Test, test_table)
+  
+    start_server()
-
-def teardown_module():
-    fresh_metadata = get_metadata('fresh')
@@ -91 +93 @@
-    if os.path.exists('freshtest.db'):
-        os.unlink('freshtest.db')
-
+    stop_server()
-
+
-# Database tests
-
-def test_query_in_session():
@@ -135 +139 @@
-        will be marked with this name :)
-
-        """
-        cherrypy.response.code = 501
-        msg = "KARL25 responding\n"
-        msg += "user with id: '%s' should not be saved.\n" % id
-        msg += "An exception occurred: %r (%s)" % ((tg_exceptions,)*2)
@@ -165 +168 @@
-def test_implicit_trans_no_error():
-    """If a controller runs sucessfully, the transaction is commited."""
-    capture_log("turbogears.database")
-
-
-
-
+
+
-    print_log()
-    q = session.query(Person)
-    arthur = q.filter_by(name="A. Dent").first()
-output
+response
-        'The no error should have redirected to someconfirmhandler'
-    assert arthur is not None, 'Person arthur should have been saved!'
-    assert arthur.name == "A. Dent", 'Person arthur should be named "A. Dent"'
@@ -180 +181 @@
-def test_raise_sa_exception():
-    """If a controller causes an SA exception, it is raised properly."""
-    capture_log("turbogears.database")
-
-
-
+
+
-    print_log()
-
-
-
-
-
-
-
-
+
+
+
-        'Exception should NOT have been handled by our handler'
-output
+response
-        'The page should have displayed an SQLAlchemy exception'
-
-def test_user_exception():
-    """If a controller raises an exception, transactions are rolled back."""
-    capture_log("turbogears.database")
-
-
-
+
+
-    print_log()
-
-
+
-        'The exception handler should have answered us'
-    p = session.query(Person).get(19)
-    assert p is None, \
@@ -212 +205 @@
-
-def test_user_redirect():
-    """If a controller redirects, transactions are committed."""
-cherrypy.root = MyRoot(
-create_reques
+app = make_app(MyRoot
+app.ge
-    assert session.query(Person).get(22) is not None, \
-        'The controller only redirected, the Person should have been saved'
-
-def test_cntrl_commit():
-    """It's safe to commit a transaction in the controller."""
-cherrypy.root = MyRoot(
-create_reques
-cherrypy.response.body[0]
+app = make_app(MyRoot
+response = app.ge
+response
-    assert session.query(Person).get(23) is not None, \
-        'The Person 23 should have been saved during commit inside controller'
-
-def test_cntrl_commit2():
-    """A commit inside the controller is not rolled back by the exception."""
-cherrypy.root = MyRoot(
-create_reques
-cherrypy.response.body[0]
+app = make_app(MyRoot
+response = app.ge
+response
-    assert session.query(Person).get(24) is not None, \
-        'The Person 24 should have been saved during commit' \
-        ' inside controller and not rolled back'
-
-def test_cntrl_flush():
-    """It's safe to flush in the controller."""
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-# Exception handling with rollback
@@ -301 +290 @@
-    is created by the exception handler.
-
-    """
-
-
-
-
-
+
+
+
-    assert session.query(User).get(26) is None
-    assert session.query(User).get(27) is not None
-
@@ -316 +303 @@
-    so user XX should not exist.
-
-    """
-
-
-
-
+
+
+
-    assert session.query(User).get('XX') is None
-
-def test_exc_done_rollback():
-    """No problems with error handler if controller manually rollbacks."""
-
-
-
-
+
+
+
-    assert session.query(User).get(28) is None
-    assert session.query(User).get(29) is not None
-
@@ -360 +345 @@
-
-    """
-    test_table.insert().execute(dict(id=1, val='a'))
-
-
-
-
+
+
+
-    # Call test2 in a different thread
-    class ThreadB(threading.Thread):
-        def run(self):
-
-
-
+
+
-    thrdb = ThreadB()
-    thrdb.start()
-    thrdb.join()
-
-
-
+
+

turbogears/tests/test_expose.py

@@ -1 @@
-import cherrypy
-import simplejson
-
-from turbogears import controllers, expose
-create_request
+make_app, start_server, stop_server
-
+def setup_module():
+    start_server()
-
+def teardown_module():
+    stop_server()
+
+
-class ExposeRoot(controllers.RootController):
-
-    @expose("turbogears.tests.simple")
@@ -20 +24 @@
-
-
-def test_gettinghtml():
-
-
-
-
+
+
+
-
-def test_gettingjson():
-
-
-
-
+
+
+
-
-def test_gettingjsonviaaccept():
-cherrypy.root = ExposeRoot(
-create_reques
+app = make_app(ExposeRoot
+response = app.ge
-            headers=dict(Accept="text/javascript"))
-
-
+
-
-def test_getting_json_with_accept_but_using_tg_format():
-
-
-
-
+
+
+
-
-def test_getting_plaintext():
-cherrypy.root = ExposeRoot(
-create_reques
+app = make_app(ExposeRoot
+response = app.ge
-        headers=dict(Accept="text/plain"))
-
-
+
-
-def test_allow_json():
-
@@ -58 +57 @@
-        def test(self):
-            return dict(title="Foobar", mybool=False, someval="niggles")
-
-
-
-
-
+
+
+
-    assert values == dict(title="Foobar", mybool=False, someval="niggles",
-        tg_flash=None)
-
-
-
-
+
+
+
-    assert values == dict(title="Foobar", mybool=False, someval="niggles",
-        tg_flash=None)
-cherrypy.
+

turbogears/tests/test_controllers.py

@@ -1 +1 @@
-import unittest
+import simplejson
-import formencode
-import cherrypy
-import pkg_resources
@@ -18 +19 @@
-
-    @expose()
-    def index(self):
-pass
+return dict()
-
-    def validation_error_handler(self, tg_source, tg_errors, *args, **kw):
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-    @expose(html="turbogears.tests.simple", allow_json=True)
-    def test(self):
-        return dict(title="Foobar", mybool=False, someval="niggles")
@@ -36 +42 @@
-
-    @expose()
-    def pos(self, posvalue):
-
-
+
-
-    @expose()
-    def servefile(self, tg_exceptions=None):
@@ -48 +53 @@
-                "turbogears.tests", "test_controllers.py"))
-
-    @expose()
-
-
+
+
+
+
-        return u'\u00bfHabla espa\u00f1ol?'
-
-    @expose()
@@ -82 +89 @@
-    @validate(validators={'value': validators.StringBoolean()})
-    @error_handler(istrue)
-    def errorchain(self, value):
-"No Error"
+{'error' : "No Error", 'value' : self.value}
-
-    @expose(format="json", html="turbogears.tests.simple")
-    def returnjson(self):
@@ -117 +124 @@
-        "lastname": validators.String()})
-    @error_handler(validation_error_handler)
-    def save(self, submit, firstname, lastname="Miller"):
-
-
-
-
-
+
+
+
-
+
-    class Registration(formencode.Schema):
-        allow_extra_fields = True
-        firstname = validators.String(min=2, not_empty=True)
@@ -171 +177 @@
-    def flash_redirected(self):
-        return dict(title="Foobar", mybool=False, someval="niggles")
-
+    @expose()
+    def redirect(self):
+        redirect("/foo")
+
+    @expose()
+    def raise_redirect(self):
+        raise redirect("/foo")
+
-    @expose(html="turbogears.tests.simple", allow_json=True)
-    def flash_redirect_with_trouble_chars(self):
-        flash(u"$foo, k\xe4se;\tbar!")
@@ -220 +234 @@
-        return "redirected OK"
-
-
-unittest.TestCase
+testutil.TGWebTest
-
-    def setUp(self):
-
-
-
-
+
+
+
-
-
-
-
-
+
-    def test_js_files(self):
-        """Can access the JavaScript files"""
-
-
-
-
+
+
-
-    def test_json_output(self):
-
-
-
+
+
-        assert values == dict(title="Foobar", mybool=False,
-            someval="niggles", tg_flash=None)
-cherrypy.
+
-
-    def test_implied_json(self):
-testutil.create_reques
-cherrypy.response.body[0]
+response = self.app.ge
+response
-
-    def test_allow_json(self):
-
-
-
+
+
-
-    def test_allow_json_config(self):
-        """JSON output can be enabled via config."""
@@ -264 +270 @@
-            def allowjsonconfig(self):
-                return dict(title="Foobar", mybool=False, someval="foo",
-                     tg_html="turbogears.tests.simple")
-cherrypy.root = JSONRoot(
-testutil.create_reques
-cherrypy.
+app = testutil.make_app(JSONRoot
+response = app.ge
+
-        config.update({'tg.allow_json': False})
-
-    def test_allow_json_config_false(self):
@@ -277 +283 @@
-            def allowjsonconfig(self):
-                return dict(title="Foobar", mybool=False, someval="foo",
-                     tg_html="turbogears.tests.simple")
-cherrypy.root = JSONRoot
-testutil.create_request('/allowjsonconfig'
-assert cherrypy.response.status.startswith("200"
-testutil.create_request('/allowjsonconfig?tg_format=json
-assert cherrypy.response.status.startswith("500"
-cherrypy.
+testutil.stop_server
+app = testutil.make_app(JSONRoot
+testutil.start_server(
+response = app.get('/allowjsonconfig
+response = app.get('/allowjsonconfig?tg_format=json', status=500
+
-        config.update({'tg.allow_json': True})
-
-    def test_json_error(self):
-        """The error handler should return JSON if requested."""
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    def test_invalid_return(self):
-
-
+
-
-    def test_strict_parameters(self):
-        config.update({"tg.strict_parameters": True})
-testutil.create_reques
-)
-assert cherrypy.response.status.startswith("500"
+response = self.app.ge
+,
+    status=500
-        assert not hasattr(cherrypy.root, "errors")
-
-    def test_throw_out_random(self):
-        """Can append random value to the URL to avoid caching problems."""
-testutil.create_reques
-cherrypy.response.body[0]
+response = self.app.ge
+response
-        config.update({"tg.strict_parameters": True})
-
-
-
-
-
+
+
+
-        assert not hasattr(cherrypy.root, "errors")
-
-    def test_ignore_parameters(self):
-        config.update({"tg.strict_parameters": True})
-
-
+
-        assert not hasattr(cherrypy.root, "errors")
-        config.update({"tg.ignore_parameters": ['ignore_me', 'me_too']})
-
-
-
-
-
-
-
+
+
+
+
+
-        assert not hasattr(cherrypy.root, "errors")
-
-    def test_retrieve_dict_directly(self):
-d = testutil.call(cherrypy.root.returnjson
-d
+response = self.app.get('/returnjson'
+response.raw
-
-    def test_templateOutput(self):
-testutil.create_reques
-cherrypy.response.body[0]
+response = self.app.ge
+response
-
-    def test_safari_unicode_fix(self):
-testutil.create_reques
+response = self.app.ge
-            "Apple WebKit Safari/412.2"})
-cherrypy.response.body[0]
+response.body
-        assert firstline == "¿Habla español?"
-        assert isinstance(firstline, str)
-
-    def test_default_format(self):
-        """The default format can be set via expose"""
-
-
-
-
-
-
-
+
+
+
-
-    def test_content_type(self):
-        """The content-type can be set via expose"""
-testutil.create_reques
-cherrypy.
+response = self.app.ge
+
-
-    def test_returned_template_name(self):
-testutil.create_reques
-cherrypy.response.body[0]
+response = self.app.ge
+response.body
-        assert "<body>" in data
-        assert 'groovy test template' in data
-
-    def test_returned_template_short(self):
-testutil.create_reques
-cherrypy.response.body[0]
+response = self.app.ge
+response
-
-    def test_expose_template_short(self):
-testutil.create_reques
-cherrypy.response.body[0]
+response = self.app.ge
+response
-
-    def test_validation(self):
-        """Data can be converted and validated"""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+        app = testutil.make_app(MyRoot)
+        response = app.get("/istrue?value=foo")
+        assert response.raw['msg'] == 'Error Message'
+
+        response = app.get("/save?submit=send&firstname=John&lastname=Doe")
+        assert response.raw['fullname'] == "John Doe"
+        assert response.raw['submit'] == "send"
+        response = app.get("/save?submit=send&firstname=Arthur")
+        assert response.raw['fullname'] == "Arthur Miller"
+        response = app.get("/save?submit=send&firstname=Arthur&lastname=")
+        assert response.raw['fullname'] == "Arthur "
+        response = app.get("/save?submit=send&firstname=D&lastname=")
+        assert len(response.raw['errors'].keys()) == 1
+        assert response.raw['errors'].has_key("firstname")
+        assert "characters" in response.raw['errors']["firstname"].lower()
+        response = app.get("/save?submit=send&firstname=&lastname=")
+        assert len(response.raw['errors'].keys()) == 1
+        assert response.raw['errors'].has_key("firstname")
+
-    def test_validation_chained(self):
-        """Validation is not repeated if it already happened"""
-        cherrypy.root.value = None
-testutil.create_reques
+response = self.app.ge
-        assert cherrypy.root.value is None
-
+
+
-        assert cherrypy.root.value == 'notbool'
+        assert 'No Error' in response.body
+        assert response.raw['value'] is None
-
-    def test_validation_nested(self):
-        """Validation is not repeated in nested method call"""
-        cherrypy.root.value = None
-testutil.create_reques
+response = self.app.ge
-        assert cherrypy.root.value == 'True'
-testutil.create_reques
+self.app.ge
-        assert cherrypy.root.value == 'False'
-
-    def test_validation_with_schema(self):
-        """Data can be converted/validated with formencode.Schema instance"""
-testutil.create_reques
-cherrypy.root.fullname
-cherrypy.root.submit
-testutil.create_reques
-cherrypy.root.fullname
-testutil.create_reques
-cherrypy.root.errors
-cherrypy.root.errors
-testutil.create_reques
-cherrypy.root.errors
-cherrypy.root.errors
+response = self.app.ge
+response.raw['fullname']
+response.raw['submit']
+response = self.app.ge
+response.raw['fullname']
+response = self.app.ge
+response.raw['errors']
+response.raw['errors']
+response = self.app.ge
+response.raw['errors']
+response.raw['errors']
-
-    def test_other_template(self):
-        """'tg_html' in a returned dict will use the template specified there"""
-testutil.create_reques
-cherrypy.response.body[0]
+response = self.app.ge
+response
-
-    def test_cheetah_template(self):
-        """Cheetah templates can be used as well"""
-
-
-
-
+
+
+
-
-    def test_run_with_trans(self):
-        """run_with_transaction is called only on topmost exposed method"""
-        oldrwt = database.run_with_transaction
-        database.run_with_transaction = cherrypy.root.rwt
-testutil.create_reques
+self.app.ge
-        database.run_with_transaction = oldrwt
-        assert cherrypy.root.value
-        assert cherrypy.root.rwt_called == 1
-
-    def test_positional(self):
-        """Positional parameters should work"""
-testutil.create_reques
-cherrypy.root.posvalue
+response = self.app.ge
+response.raw['posvalue']
-
-    def test_flash_plain(self):
-        """flash with strings should work"""
-
-
-
+
+
-        assert values["tg_flash"] == "plain"
-cherrypy.response.simple_cookie
+response.headers
-
-    def test_flash_unicode(self):
-        """flash with unicode objects should work"""
-
-
-
+
+
-        assert values["tg_flash"] == u"\xfcnicode"
-cherrypy.response.simple_cookie
+response.headers
-
-    def test_flash_on_redirect(self):
-        """flash must survive a redirect"""
-
-
-
-
-
-
-
+
+
+
+
-        assert values["tg_flash"] == u"redirect \xfcnicode"
-
-    def test_flash_redirect_with_trouble_chars(self):
-        """flash redirect with chars that can cause troubles in cookies"""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        assert values["tg_flash"] == u"$foo, k\xe4se;\tbar!"
-
-    def test_double_flash(self):
@@ -507 +493 @@
-        # Here we are calling method that sets a flash message. However flash
-        # cookie is still there. Turbogears should discard old flash message
-        # from cookie and use new one, set by flash_plain().
-testutil.create_reques
+response = self.app.ge
-            headers=dict(Cookie='tg_flash="old flash"; Path=/;'))
-
-
+
-        assert values["tg_flash"] == "plain"
-cherrypy.response.simple_cookie
+response.cookies_set
-                "Cookie clearing request should be present"
-        flashcookie = cherrypy.response.simple_cookie['tg_flash']
-        assert flashcookie['expires'] == 0
-
-    def test_set_kid_outputformat_in_config(self):
-        """the outputformat for kid can be set in the config"""
-        config.update({'kid.outputformat': 'xhtml'})
-
-
+
-        assert '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML ' in response
-        config.update({'kid.outputformat': 'html'})
-
-
+
-        assert  '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML ' in response
-        assert '    This is the groovy test ' in response
-        config.update({'kid.outputformat': 'html compact'})
-
-
+
-        assert  '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML ' in response
-        assert 'This is the groovy test ' in response
-        assert '    ' not in response
@@ -538 +518 @@
-    def test_fileserving(self):
-        #outputcap = StringIO()
-        #sys.stdout = outputcap
-testutil.create_reques
+response = self.app.ge
-        assert cherrypy.root.servedit
-        assert not cherrypy.root.serve_exceptions
-        #assert "AssertionError" not in outputcap.getvalue()
-
-    def test_internal_redirect(self):
-        """regression test for #1022, #1407 and #1598"""
-
-
-
+
+
-
-    def test_internal_redirect_nested_variables(self):
-        """regression test for #1022, #1407 and #1598"""
-testutil.create_reques
+response = self.app.ge
-            "/internal_redirect?a=1&a-1.b=2&a-2.c=3&a-2.c-1=4")
-
-
+
-
-    def test_exc_value(self):
-        """Exception is handled gracefully by the right exception handler."""
-testutil.create_reques
-cherrypy.response.body[0]
+response = self.app.ge
+response
-
-    def test_exc_index(self):
-        """Exception is handled gracefully by the right exception handler."""
-testutil.create_reques
-cherrypy.response.body[0]
+response = self.app.ge
+response
-
-    def test_exc_all(self):
-        """Test a controller that is protected by multiple exception handlers.
@@ -573 +551 @@
-        by their respective handlers without problem...
-
-        """
-testutil.create_reques
-cherrypy.response.body[0]
-testutil.create_reques
-cherrypy.response.body[0]
-testutil.create_reques
-cherrypy.response.body[0]
+response = self.app.ge
+response
+response = self.app.ge
+response
+response = self.app.ge
+response
-
-
-unittest.TestCase
+testutil.TGWebTest
-
-    def setUp(self):
-cherrypy.tree.mount_points = {}
-cherrypy.root = MyRoot(
-cherrypy.root.subthing = SubApp(
-cherrypy.root.subthing.subsubthing = SubApp(
+testutil.TGWebTest.setUp(self)
+testutil.mount(MyRoot()
+testutil.mount(SubApp(), '/subthing'
+testutil.mount(SubApp(), '/subthing/subsubthing'
-
-    def test_basic_urls(self):
-testutil.create_reques
+self.app.ge
-        assert "/foo" == url("/foo")
-        assert "foo/bar" == url(["foo", "bar"])
-        assert url("/foo", bar=1, baz=2) in \
@@ -604 +582 @@
-        assert url("/foo") == "/foo"
-
-    def test_approots(self):
-
+
+
-        assert url("foo") == "foo"
-        assert url("/foo") == "/subthing/foo"
-
-    def test_lower_approots(self):
-
+
+
-        assert url("/foo") == "/subthing/subsubthing/foo"
-
-
-
-
-
+
+
+
-        assert url("/foo") == "/coolsite/root/subthing/foo"
-
-    def test_redirect(self):
-        config.update({"server.webpath": "/coolsite/root"})
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    def test_multi_values(self):
-testutil.create_reques
+self.app.ge
-        assert url("/foo", bar=[1, 2]) in \
-            ["/foo?bar=1&bar=2", "/foo?bar=2&bar=1"]
-        assert url("/foo", bar=("asdf", "qwer")) in \
@@ -642 +613 @@
-
-    def test_unicode(self):
-        """url() can handle unicode parameters"""
-testutil.create_reques
+self.app.ge
-        assert url('/', x=u'\N{LATIN SMALL LETTER A WITH GRAVE}'
-            u'\N{LATIN SMALL LETTER E WITH GRAVE}'
-            u'\N{LATIN SMALL LETTER I WITH GRAVE}'
@@ -652 +623 @@
-
-    def test_list(self):
-        """url() can handle list parameters, with unicode too"""
-testutil.create_reques
+self.app.ge
-        assert url('/', foo=['bar', u'\N{LATIN SMALL LETTER A WITH GRAVE}']
-            ) == '/?foo=bar&foo=%C3%A0'
-
-    def tearDown(self):
+        testutil.TGWebTest.tearDown(self)
-        config.update({"server.webpath": ""})
-        startup.startTurboGears()
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-def test_can_use_internally_defined_arguments(
-
+    def test_can_use_internally_defined_arguments(self
+    
-
-
+    
-
-
-
-
+    
+    
+    
-
-
-
-
-
-
-
+
+
+
+
+
-
-def test_url_kwargs_overwrite_tgparams(
-
-
-
+    def test_url_kwargs_overwrite_tgparams(self
+    
+    
+    
-
-def test_url_doesnt_change_tgparams(
-
-
-
-
+    def test_url_doesnt_change_tgparams(self
+    
+    
+    
+    

turbogears/tests/test_view.py

@@ -1 +1 @@
-# -*- coding: utf-8 -*-
-
-from turbogears import view, config, testutil
-import cherrypy
-import unittest
@@ -7 +6 @@
-class TestView(unittest.TestCase):
-
-    def setUp(self):
-cp
+server
-        cherrypy.serving.request = testutil.DummyRequest()
-        cherrypy.serving.response = testutil.DummyResponse()
-

turbogears/tests/test_testutil.py

@@ -4 +4 @@
-from turbogears import controllers
-from turbogears import testutil
-
+def setup_module():
+    testutil.unmount()
+    testutil.mount(MyRoot())
+    testutil.start_server()
+
+def teardown_module():
+    testutil.unmount()
+    testutil.stop_server()
+
-class MyRoot(controllers.RootController):
-    def set_name(self, name):
-        cookies = cherrypy.response.simple_cookie
@@ -21 +30 @@
-
-
-def test_browser_session():
-    cherrypy.root = MyRoot()
-    bs = testutil.BrowsingSession()
-    bs.goto('/get_name')
-    assert bs.response == 'cookie not found'
@@ -30 +38 @@
-    assert bs.response == 'me'
-
-def test_browser_session_for_two_users():
-    cherrypy.root = MyRoot()
-    bs1 = testutil.BrowsingSession()
-    bs2 = testutil.BrowsingSession()
-    bs1.goto('/set_name?name=bs1')

turbogears/tests/test_catwalk.py

@@ -3 +3 @@
-from turbogears import testutil
-from turbogears import controllers
-from turbogears.toolbox.catwalk import CatWalk
-import cherrypy
-import simplejson
-from catwalk_models import browse
-import timeit
@@ -40 +39 @@
-        pass
-    index = turbogears.expose()(index)
-
+
+def setup_module():
+    #testutil.unmount()
+    testutil.mount(MyRoot(), "/")
+    testutil.mount(CatWalk(browse), '/catwalk')
+    testutil.start_server()
+
+def teardown_module():
+    #testutil.unmount()
+    testutil.stop_server()
+
+
+#app = testutil.make_app()
+
-class Browse(unittest.TestCase):
-    def setUp(self):
-        browse_data(browse)
-
+
+
+
+
-
+    def tearDown(self):
+        #testutil.stop_server()
+        pass
+
-    def test_wrong_filter_format(self):
-
-
-
+
-        assert 'filter_format_error' in response
-
-    def test_wrong_filter_column(self):
-
-
-
+
-        assert 'filter_column_error' in response
-
-    def test_filters(self):
-
-
-
-
+
+
-        assert values['total'] == 15 * 15 * 15 #without the filters we get all songs (3375)
-
-
-
+
+
+
+
-        assert values['total'] == 15 #filter by album id (only 15 songs)
-
-    def test_response_fields(self):
-        #Check that the response contains the expected keys
-
-
-
-
+
+
-        assert values.has_key('headers')
-        assert values.has_key('rows')
-        assert values.has_key('start')
@@ -86 +99 @@
-    def test_rows_joins_count(self):
-        #Control that the count for related and multiple joins match
-        #the number of related instances when accessed as a field
-
-
-
-
+
+
-        artist = browse.Artist.get(1)
-        assert int(values['rows'][0]['genres']) == len(list(artist.genres))
-        assert int(values['rows'][0]['albums']) == len(list(artist.albums))
-
-    def test_rows_column_number(self):
-        #Control that the number of columns match the number of fields in the model
-
-
-
-
+
+
-        assert len(values['rows'][0]) == 4
-
-    def test_rows_limit(self):
-        #Update the limit of rows for the query and control the number of rows returned
-
-
-
-
+
+
-        assert values.has_key('rows')
-        assert len(values['rows']) == 10
-
-cherrypy.response.body[0]
-
+
+self.app.get("/catwalk/browse/?object_name=Artist&page_size=15&tg_format=json")
+.body
-        assert values.has_key('rows')
-        assert len(values['rows']) == 15
-
-    def test_header_labels(self):
-        #Check that the returned header labels match the the model
-
-
-
-
+
+
-        assert len(values['headers']) == 5
-        for header in values['headers']:
-            assert header['name'] in ['id','name','albums','genres', 'plays_instruments']
@@ -131 +136 @@
-    model = browse
-
-    def setUp(self):
-
-
+
+
+
-        testutil.DBTest.setUp(self)
-        browse_data(browse)
+        self.app = testutil.make_app()
-
+    def tearDown(self):
+        #testutil.stop_server()
+        testutil.DBTest.tearDown(self)
+
-    def test_addremove_related_joins(self):
-        # check the update_join function when nondefault add/remove are used
-        artist = self.model.Artist.get(1)
-        assert len(artist.plays_instruments) == 0
-testutil.create_reques
+self.app.ge
-        assert len(artist.plays_instruments) == 2
-testutil.create_reques
+self.app.ge
-        assert len(artist.plays_instruments) == 1, str(artist.plays_instruments)

turbogears/tests/test_paginate.py

@@ -4 +4 @@
-from urllib import quote
-import warnings
-
-
+, testutil
-from turbogears.controllers import RootController, url
-from turbogears.database import get_engine, metadata, session, mapper
-from turbogears.paginate import paginate, sort_ordering, sort_data
-create_request, 
+
-from turbojson.jsonify import jsonify
-
-import cherrypy
@@ -183 +183 @@
-    return result
-
-
-unittest.TestCase
+testutil.TGWebTest
-    """Never trust a spy"""
-
-    class MyRoot(RootController):
@@ -218 +218 @@
-
-
-    def setUp(self):
-
+
+
-
-    def test_spy(self):
-
-
-
+
+
-        try:
-
+response.
-            raise Exception("above test should have failed")
-        except AssertionError:
-            pass
-
-    def test_correct_expectation(self):
-
-
-
+
+
-
-    def test_wrong_expectation(self):
-
-
-
+
+
-
-    def test_invalid_expectation(self):
-
-
-
+
+
-
-    def test_raw_expectation(self):
-create_reques
-cherrypy.response.body[0]
-cherrypy.response.body[0]
+response = self.app.ge
+response.body
+response.body
-
-
-unittest.TestCase
+testutil.TGWebTest
-    """Base class for all Paginate TestCases"""
-
-
-create_request(url
-cherrypy.response.body[0]
+, status=200
+response = self.app.get(url, status=status
+response.body
-        if "fail: " in self.body:
-            print self.body
-            assert False, "Spy alert! Check body output for details..."
@@ -343 +340 @@
-
-
-    def setUp(self):
-
+
+
-
-    def test_pagination_old_style(self):
-        self.request("/basic")
@@ -439 +437 @@
-        Spy.assert_ok(self.body, 'pages', xrange(4, 8))
-
-    def test_invalid_dynamic_limit(self):
-
-
+
-        assert 'paginate: dynamic_limit (foobar) not found in output dict' in self.body
-
-    def test_dynamic_limit(self):
@@ -754 +751 @@
-
-
-    def setUp(self):
-
+
+
-
-    def assert_order(self, *args):
-        expr = 'data="%s"' % ''.join(['[Address %r]' % x for x in args])
@@ -826 +824 @@
-
-    def test_invalid_default_reversed(self):
-        for method in "Q", "QA", "SR", "SO", "SL":
-
-
+
-            assert ('paginate: default_reversed (deprecated) only allowed'
-                ' when default_order is a basestring') in self.body
-

turbogears/qstemplates/quickstart/+package+/tests/test_controllers.py_tmpl

@@ -4 +4 @@
-from ${package}.controllers import Root
-import cherrypy
-
-cherrypy.root = Root(
+testutil.mount(root = Root()
-
-class TestPages(unittest.TestCase):
-
-    def setUp(self):
-urbogears.startup.startTurboGears
+estutil.start_server
-
-    def tearDown(self):
-        """Tests for apps using identity need to stop CP/TG after each test to
-        stop the VisitManager thread.
-        See http://trac.turbogears.org/turbogears/ticket/1217 for details.
-        """
-urbogears.startup.stopTurboGears
+estutil.stop_server
-
-    def test_method(self):
-        "the index method should return a string called now"
-        import types
-ult = testutil.call(cherrypy.root.index
-ult
+ponse = testutil.go("/"
+ponse.raw
-
-    def test_indextitle(self):
-        "The indexpage should have the right title"
-
-
-
+
+
-
-#if $identity != "none"
-    def test_logintitle(self):
-        "login page should have the right title"
-
-
-
+
+
-#end if

turbogears/testutil.py

@@ -6 +6 @@
-import cStringIO as StringIO
-
-import cherrypy
-cherrypy import _cphttptools
+webtest import TestApp
-
+cherrypy_major_ver = int(cherrypy.__version__.split('.')[0])
+if cherrypy_major_ver < 3:
+    from cherrypy._cphttptools import Request, Response
+else:
+    from cherrypy import Request, Response
+
+print cherrypy_major_ver
+
+
-try:
-    import sqlobject
-    from sqlobject.inheritance import InheritableSQLObject
@@ -21 +30 @@
-from turbogears import startup, config, update_config, \
-    controllers, database, validators
-from turbogears.identity import current_provider
-
+, deprecated
-
-cwd = os.getcwd()
-
@@ -51 +60 @@
-        {'autoreload.on': False, 'tg.new_style_logging': True}})
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+    if not config.get("server_started"):
+        startup.startTurboGears()
+        config.update({"server_started" : True})
-
+start_cp = deprecated('start_cp is superceded by start_server')(start_server)
+
+
+def stop_server(tg_only = False):
+    """Stop the server and unmount the application.  \
+    Use tg_only = True to leave CherryPy running (for faster tests).
+    """
+    unmount()
+    if config.get("cp_started") and not tg_only:
+       cherrypy.server.stop()
+       config.update({"cp_started" : False})
+   
+    if config.get("server_started"):
+        startup.stopTurboGears()
+        config.update({"server_started" : False})
+
+
+
-test_user = None
-
+@deprecated()
-def set_identity_user(user):
-    """Setup a user for configuring request's identity."""
-    global test_user
-    test_user = user
-
-
+@deprecated()
-def attach_identity(req):
-    if config.get("identity.on", False):
-        req.identity = (test_user
-            and current_provider.authenticated_identity(test_user)
-            or current_provider.anonymous_identity())
-
-
+
-def create_request(request, method="GET", protocol="HTTP/1.1",
-        headers={}, rfile=None, clientAddress="127.0.0.1",
-        remoteHost="localhost", scheme="http"):
-cp
+server
-    if not rfile:
-        rfile = StringIO.StringIO("")
-    if type(headers) != dict:
@@ -86 +123 @@
-    if not hasattr(cherrypy.root, "started"):
-        startup.startTurboGears()
-        cherrypy.root.started = True
-_cphttptools.
+
-    cherrypy.serving.request = req
-    attach_identity(req)
-_cphttptools.
+
-    req.run(" ".join((method, request, protocol)), headerList, rfile)
+    return cherrypy.serving.response
-
+createRequest = create_request
-
+
+def make_wsgiapp():
+    """Return a WSGI application from cherrypy's root object."""
+    if cherrypy_major_ver < 3:
+        wsgiapp = cherrypy._cpwsgi.wsgiApp
+    else:
+        #This is untested but should work.. if not, one of the others will
+        wsgiapp = cherrpy.root
+        #wsgiapp = cherrypy.tree.mount(cherrypy.root, '/')
+        #wsgiapp = cherrypy.wsgi.CPWSGIServer
+    return wsgiapp
+
+
+def make_app(controller=None):
+    """Return a WebTest.TestApp instance from Cherrypy.
+    If a Controller object is provided, it will be mounted at the root level.
+    If not, it'll look for an already mounted root.
+    """
+    if controller:
+        wsgiapp = mount(controller(), '/')
+    else:
+        wsgiapp = make_wsgiapp()
+    testapp = TestApp(wsgiapp)
+
+    return testapp
+
+
+class TGWebTest(unittest.TestCase):
+    """A WebTest enabled unit testing class.
+
+    This allows testers to subclass us and use self.app to make WebTest calls.
+    """
+    def setUp(self):
+        start_server()
+        self.app = make_app()
+
+    def tearDown(self):
+        stop_server(tg_only = True)
+        del self.app
+
+    def login_user(self, user):
+        """ Log a specified user object into the system """
+        self.app.post(config.get('identity.failure_url'), {
+                'user_name' : user.user_name,
+                'password'  : user.password,
+                'login'     : 'Login',
+        })
+
+
-class BrowsingSession(object):
-
-    def __init__(self):
-        self.visit = None
-        self.response, self.status = None, None
-        self.cookie = Cookie.SimpleCookie()
+        self.app = make_app()
-
-    def goto(self, *args, **kwargs):
-        if self.cookie:
-            headers = kwargs.setdefault('headers', {})
-.output()
-create_reques
-cherrypy.response.body[0]
-cherrypy.
-if cherrypy.response.simple_cookie:
-    self.cookie.update(cherrypy.response.simple_cookie
+_encoded
+response = self.app.ge
+response.body
+
+self.cookie = response.cookies_set
+self.cookie_encoded = response.headers.get('Set-Cookie', ''
-
-
-def _return_directly(output, *args):
@@ -142 +231 @@
-    headers = {}
-
-
+@deprecated("Please see the TestMigration page in the TG wiki.")
-def call(method, *args, **kw):
-cp
+server
-    output, response = call_with_request(method, DummyRequest(), *args, **kw)
-    return output
-
-
+@deprecated("Please see the TestMigration page in the TG wiki.")
-def call_with_request(method, request, *args, **kw):
-    """More fine-grained version of call method.
-
@@ -156 +247 @@
-    """
-    orig_proc_output = controllers._process_output
-    controllers._process_output = _return_directly
-_cphttptools.
+
-    cherrypy.serving.request = request
-    if not hasattr(request, "identity"):
-        attach_identity(request)
@@ -200 +291 @@
-                and item != InheritableSQLObject:
-                item.dropTable(ifExists=True)
-
-
-
+
+
+
+
+
+
-    cherrypy.root = None
+    cherrypy.tree.mount_points = {}
-
+reset_cp = deprecated('reset_cp has been superceded by unmount.')(unmount)
-
+
+def mount(controller, path="/"):
+    """Mount a controller at a path.  Returns a wsgi application."""
+    if path == '/':
+        cherrypy.root = controller
+    else:
+        cherrypy.tree.mount(controller, path)
+    return make_wsgiapp()
+
-def catch_validation_errors(widget, value):
-    """Catch and unpack validation errors (for testing purposes)."""
-    try:
@@ -253 +359 @@
-
-    """
-    global _currentcat
-
+, "_currentcat not cleared.  Use get_log to reset."
-    if not isinstance(category, list) and not isinstance(category, tuple):
-        category = [category]
-    _currentcat = category
@@ -307 +413 @@
-
-__all__ = ["call", "create_request", "DBTest",
-    "attach_identity", "set_identity_user",
-
+
+
+

turbogears/widgets/tests/test_nested_form_controllers.py

@@ -1 +1 @@
-import turbogears
-import cherrypy
-from turbogears import widgets
-from turbogears import controllers
-from turbogears import validators
-from turbogears import testutil
-
+
+def setup_module():
+    global app
+    app = testutil.make_app(MyRoot)
+    testutil.start_server()
+
+def teardown_module():
+    testutil.stop_server()
+
+
-myform = widgets.TableForm(fields = [
-    widgets.FieldSet(
-        name = "p_data",
@@ -17 +26 @@
-
-class MyRoot(controllers.RootController):
-    def testform(self, p_data, tg_errors=None):
-if tg_errors:
-    self.has_errors = True
-self.name = p_data['nam
-self.age = p_data['age']
+has_errors = tg_errors is not None
+name = p_data['name']
+age = p_data['ag
+return dict(has_errors = has_errors, name=name, age = age)
-    testform = turbogears.validate(form=myform)(testform)
-html
+template
-                                 testform)
-
-    def set_errors(self):
-
+
+
-
-    def testform_new_style(self, p_data):
-
-
+
+
+
-    testform_new_style = turbogears.validate(form=myform)(testform_new_style)
-    testform_new_style = turbogears.error_handler(set_errors)(testform_new_style)
-    testform_new_style = turbogears.expose()(testform_new_style)
-
-
+
-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"
-oot = cherrypy.root
-testutil.create_request("/testform_new_style?p_data.name=ed&p_data.age=edalso")
-
+esponse = app.get("/testform_new_style?p_data.name=ed&p_data.age=edalso")
+assert response.raw['has_errors']
+

turbogears/widgets/tests/test_datagrid.py

@@ -2 +2 @@
-from turbogears.widgets.datagrid import DataGrid
-
-def setup_module():
-cp
+server
-
-class Foo:
-

turbogears/widgets/tests/test_link_inclusion.py

@@ -1 +1 @@
-import turbogears
-import cherrypy
-
-from turbogears import widgets, testutil
-
+def setup_module():
+    testutil.start_server()
-
+def teardown_module():
+    testutil.stop_server()
+
+
-def test_table_widget_js():
-    """
-    The TableForm Widget can require JavaScript and CSS resources. Addresses
@@ -21 +25 @@
-            return dict(form=form)
-        test = turbogears.expose(template="turbogears.widgets.tests.form")(test)
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-def test_calendardatepicker_js():
@@ -37 +40 @@
-            return dict(widget=widgets.CalendarDatePicker(calendar_lang=lang))
-        test = turbogears.expose(template="turbogears.widgets.tests.widget")(test)
-
-cherrypy.root = MyRoot(
+app = testutil.make_app(MyRoot
-
-    # testing default language (en)
-
-
-
-
-
+
+
+
+
-
-    # testing non-existing language
-
-
-
-
-
+
+
+
-
-    # testing French language
-
-
-
-
-
-
+
+
+
+
-
-    # testing German language with any charset
-testutil.create_request("/test",
+response = app.get("/test", 
-        headers={"Accept-Language": "de", "Accept-Charset": "*"})
-
-
-
-
+
+
+
-
-    # testing Turkish language with non-existing charset
-testutil.create_reques
+response = app.ge
-        headers={"Accept-Language": "tr", "Accept-Charset": "big5"})
-
-
-
-
+
+
+
-
-    win1254 = 'windows-1254'
-    from codecs import lookup
@@ -85 +81 @@
-        win1254 = 'cp1254' # cannot test name normalization here
-
-    # testing Turkish language with existing, not normalized charset
-testutil.create_reques
+response = app.ge
-        headers={"Accept-Language": "tr", "Accept-Charset": win1254})
-
-
-
-
+
+
+
-
-    # testing more than one language and charset
-testutil.create_reques
+response = app.ge
-        "Accept-Charset": "big5,%s,latin-1" % win1254})
-
-
-
-
-
-
+
+
+
+
+
-
-    # testing predetermined language (fr)
-testutil.create_reques
+response = app.ge
-        headers={"Accept-Language": "de,en,tr"})
-
-
-
+
+
-
-    # testing predetermined non-existing language
-testutil.create_reques
+response = app.ge
-        headers={"Accept-Language": "de,en,fr,tr"})
-output = cherrypy.response.body[0]
-de.js' in output
-x.js' not in output
-
+assert 'calendar/lang/calendar-de.js' in response.body
+x.js' not in response.body
+en.js' not in response.body
+

turbogears/widgets/tests/test_new_validation.py

@@ -1 @@
-import cherrypy
-import turbogears.widgets as widgets
-import turbogears.validators as validators
-
-from turbogears.testutil import catch_validation_errors
-
-class Request:
-    validation_errors = {}
-
-oldrequest = None
-
-def setup_module():
-    global oldrequest
-    oldrequest = cherrypy.request
-    cherrypy.request = Request()
-
-
-def teardown_module():
-    global oldrequest
-    cherrypy.request = oldrequest
-
-
-
-
-class SimpleSchema(validators.Schema):
-    phone = validators.Int()
-

turbogears/widgets/tests/test_forms.py

@@ -4 +4 @@
-from turbogears import widgets, validators, controllers, expose, validate, \
-                       testutil
-from turbogears import config
-create_request
+make_app
-import cherrypy
-
-
-def setup_module():
-
-
+
-
+def teardown_module():
+    testutil.stop_server()
+
+
-def test_rendering():
-    """Forms can be rendered"""
-    form = widgets.TableForm(fields=[widgets.TextField("name", label="Your Name")])
@@ -166 +169 @@
-
-    @expose()
-    @validate(form=nestedform)
-
-
+
+
+
+
-
+    @expose()
+    def field_for(self):
+        cherrypy.request.validation_errors = dict(foo=dict(foo='error'))
+        template = """\
+        <div xmlns:py="http://purl.org/kid/ns#">
+            ${field_for('foo').fq_name}.appears
+            ${field_for('foo').error}_appears
+            ${field_for('foo').field_id}_appears
+            ${field_for('foo').display(value_for('foo'), **params_for('foo'))}
+        </div>
+        """
+        textfield = widgets.TextField("foo")
+        fieldset = widgets.FieldSet("foo", fields=[textfield], template=template)
+        form = widgets.Form("form", fields=[fieldset], template=template)
-
+        # Good example below of how you can pass parameters and values to nested
+        # widgets.
+        value = dict(foo=dict(foo="HiYo!"))
+        params = dict(attrs=dict(foo=dict(foo=dict(size=100))))
+        params['format'] = 'xhtml'
+        return form.render(value, **params)
+
+
-def test_nested_variables():
-    newroot = NestedController()
-    cherrypy.root = None
-    cherrypy.tree.mount_points = {}
-    cherrypy.tree.mount(newroot, "/")
-    url = u"/checkform?foo.name=Kevin&foo.age=some%20Numero".encode("utf-8")
-
+
+
+
+
+
-    assert config.get("decoding_filter.encoding", path="/") == "utf8"
-assert newroot.foo
-newroot.foo
-newroot.foo
+print "raw", request.raw
+request.raw
+request.raw
-
-def test_field_for():
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+

turbogears/widgets/tests/test_request_related_features.py

@@ -1 +1 @@
-import re
-import turbogears
-import cherrypy
-
-import turbogears.testutil as testutil
-
+, validate, expose, error_handler
-
+def setup_module():
+    testutil.start_server()
+
+def teardown_module():
+    testutil.stop_server()
+
+
-def test_required_fields():
-    """
-    Required field are automatically discovered from the form validator and marked
@@ -20 +26 @@
-            return dict(form=form)
-        test = turbogears.expose(template="turbogears.widgets.tests.form")(test)
-
-cherrypy.root = MyRoot(
-testutil.create_reques
-cherrypy.response.body[0]
+app = testutil.make_app(MyRoot
+response = app.ge
+response.body
-
-    print output
-    name_p = 'name="comment"'
@@ -48 +54 @@
-    form2 = widgets.TableForm(name="form2", fields=MyFields())
-
-    class MyRoot(turbogears.controllers.RootController):
-
-
+
+
+
+
+
+
+
+
+
+
-        test = turbogears.expose(template="turbogears.widgets.tests.two_forms")(test)
-        test = turbogears.validate(form=form1)(test)
-        test = turbogears.error_handler(test)(test)
-
+
-        def test2(self):
-
+
+
+
+
+
-        test2 = turbogears.expose(template="turbogears.widgets.tests.form")(test2)
-        test2 = turbogears.validate(form=form2)(test2)
-        test2 = turbogears.error_handler(test2)(test2)
-
-        def test3(self):
-
+
+
+
+
+
-        test3 = turbogears.expose(template="turbogears.widgets.tests.form")(test3)
-        test3 = turbogears.validate(form=form2)(test3)
-        test3 = turbogears.error_handler(test3)(test3)
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    value_p = 'value="foo"'
-    id_p = 'id="form1_age"'
-    assert (re.compile('.*'.join([value_p, id_p])).search(output) or
@@ -92 +108 @@
-            re.compile('.*'.join([id_p, value_p])).search(output)
-    )
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-    assert 'value="foo"' in output
-    assert '>bar<' in output
-    assert 'class="fielderror"' in output
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-    assert 'value="foo"' not in output
-    assert '>bar<' not in output
-    assert 'class="fielderror"' not in output
@@ -141 +139 @@
-            name="repeat", fields=MyFields(), repetitions=repetitions)])
-
-    class MyRoot(turbogears.controllers.RootController):
-        @turbogears.expose(template="turbogears.widgets.tests.form")
-        def test(self):
-            return dict(form=form)
+        test = turbogears.expose(template="turbogears.widgets.tests.form")(test)
-
-        @turbogears.expose(template="turbogears.widgets.tests.form")
-        def test_value(self):
-            value = dict(repeat=[{'name':'foo', 'comment':'hello'},
-                                 None,
-                                 None,
-                                 {'name':'bar', 'comment':'byebye'}])
-            return dict(form=form, value=value)
+        test_value = turbogears.expose(template="turbogears.widgets.tests.form")(test_value)
-
-        def test_validation(self):
-return dict(form=form)
-test_validation = turbogears.expose(
-     
+validation_errors = cherrypy.request.validation_errors
+    return dict(form=form, validation_errors=validation_errors)
+test_validation = turbogears.expose(
-        test_validation = turbogears.validate(form=form)(test_validation)
-        test_validation = turbogears.error_handler(test_validation)(test_validation)
-
-cherrypy.root = MyRoot(
-testutil.create_reques
-cherrypy.response.body[0]
+app = testutil.make_app(MyRoot
+response = app.ge
+response.body
-    for i in range(repetitions):
-        assert 'id="form_repeat_%i"' % i in output
-        assert 'name="repeat-%i.name"' % i in output
@@ -170 +168 @@
-        assert 'name="repeat-%i.comment"' % i in output
-        assert 'id="form_repeat_%i_comment"' % i in output
-
-
-
-
+
+
-    name_p = 'name="repeat-0.name"'
-    value_p = 'value="foo"'
-    assert (re.compile('.*'.join([value_p, name_p])).search(output) or
@@ -204 +201 @@
-            re.compile('.*'.join([name_p, value_p])).search(output)
-    )
-
-
-
+
+
+
+
+
+
-        "&repeat-2.name=bar&repeat-3.name=&repeat-4.name=")
-
-
+
+
+
-    assert validation_errors.has_key("repeat")
-    assert isinstance(validation_errors["repeat"], list)
-    assert validation_errors["repeat"][0] is None

turbogears/widgets/tests/test_widgets.py

@@ -4 +4 @@
-from turbogears.testutil import catch_validation_errors
-
-def setup_module():
-cp
+server
-    cherrypy.serving.request = testutil.DummyRequest()
-
+def teardown_module():
+    testutil.stop_server()
-
+
-def test_rendering_without_engine():
-    """Helpful error when rendering widgets with no templating engine loaded"""
-    from turbogears import view

turbogears/widgets/tests/test_nested_widgets.py

@@ -1 +1 @@
-import re
-cp
+server
-import turbogears
-from turbogears import testutil
-import cherrypy
-import turbogears.widgets as widgets
-import turbogears.validators as validators
-from turbogears.widgets.meta import copy_schema
-
-def setup_module():
-
-
+
-
-
-#XXX: We ignore missing keys to make passing value easier in tests
@@ -56 +54 @@
-        Checks if names fo the widgets are set correctly depending on their
-        path.
-        """
-cherrypy.root = self.MyRoot(
-testutil.create_reques
-cherrypy.response.body[0]
+app = testutil.make_app(self.MyRoot
+response = app.ge
+response.body
-        value_p = 'value="22"'
-        name_p = 'name="sub.sub2.age"'
-        assert (re.compile('.*'.join([value_p, name_p])).search(output) or
-                re.compile('.*'.join([name_p, value_p])).search(output))
-
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response.body
-        value_p = 'value="22"'
-        name_p = 'name="sub.age"'
-        id_p = 'id="myform_sub_age"'
@@ -74 +72 @@
-        assert (re.compile('.*'.join([value_p, id_p])).search(output) or
-                re.compile('.*'.join([id_p, value_p])).search(output))
-
-testutil.create_reques
-cherrypy.response.body[0]
+response = app.ge
+response.body
-        value_p = 'value="22"'
-        name_p = 'name="age"'
-        assert (re.compile('.*'.join([value_p, name_p])).search(output) or

turbogears/view/base.py

@@ -107 +107 @@
-    @type template: string
-
-    """
+    environ = getattr(cherrypy.request, 'wsgi_environ', {})
+    if environ.get('paste.testing', False):
+        cherrypy.request.wsgi_environ['paste.testing_variables']['raw'] = info
+
-    template = info.pop("tg_template", template)
-    if not info.has_key("tg_flash"):
-        if config.get("tg.empty_flash", True):