Ticket #1466: webtest_prelim.patch

turbogears/controllers.py

@@ -412 +412 @@
-    assert isinstance(output, basestring) or isinstance(output, dict) \
-        or isinstance(output, types.GeneratorType), \
-           "Method %s.%s() returned unexpected output. Output should " \
-
-
+, not %s
+, type(output)
-    if isinstance(output, dict):
-        template = output.pop("tg_template", template)
-        format = output.pop("tg_format", format)

turbogears/tests/test_form_controllers.py

@@ -34 +34 @@
-        self.name = name
-        self.age = age
-        self.date = date
+        return dict(name=name, age=age, date=date)
-
-    @expose()
-    @validate(form=myform)
@@ -43 +44 @@
-        self.name = name
-        self.age = age
-        self.date = date
+        return dict(name=name, age=age, date=date)
-
-def test_form_translation():
-    """Form input is translated into properly converted parameters"""
-    root = MyRoot()
-    cherrypy.root = root
-
+response = 
-    assert root.name == "ed"
-    assert root.age == 5
-
@@ -56 +58 @@
-    """Form input is translated into properly converted parameters"""
-    root = MyRoot()
-    cherrypy.root = root
-
+response = 
-    assert root.name == "ed"
-    assert root.age == 5
-
-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"""
-
-
+
+
+
+
-
-def test_javascript_should_appear():
-    """JavaScript should appear when asked for"""
-
-cherrypy.response.body[0]
+response = 
+response.body
-
-def test_include_mochikit():
-    """JSLinks (and MochiKit especially) can be included easily"""
-
-
+
+
+
-
-def test_suppress_mochikit():
-    """MochiKit inclusion can be suppressed"""
-
-
-
+
+
-    # repair the fixture
-
-
-
-
-
+
-
+    included = testutil.create_request("/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"
-
- {"tg.mochikit_all"
-cherrypy.response.body[0]
+{"tg.mochikit_all" 
+response = 
+{"tg.mochikit_all" 
+response.body
-
-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}})
-
+response = 
-    config.update({"global": {"tg.mochikit_all": False}})
-    config.update({"global": {"tg.mochikit_suppress": False}})
-cherrypy.response.body[0]
+response.body
-
-def test_include_widgets():
-    """Any widget can be included everywhere by setting tg.include_widgets"""
-    config.update({"global": {"tg.include_widgets": ["mochikit"]}})
-
+response = 
-    config.update({"global": {"tg.include_widgets": []}})
-cherrypy.response.body[0]
+response.body
-
-
-class State(object):
@@ -149 +151 @@
-        cherrypy.root = self.Controller()
-        # parameter values are irrelevant
-        url = '/validation?a=1&b=2&c.a=3&c.b=4'
-
-
+
-        msg = "Validation state is not handled properly"
-        # 4 == 1 (a) + 1(b) + 1(c.a) + 1(c.b)
-
+response.

turbogears/tests/test_errorhandling.py

@@ -223 +223 @@
-
-    def test_defaultErrorHandler(self):
-        """ Default error handler. """
-
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
+response = 
+response.body
+response = 
+response.body
-
-    def test_specialisedErrorHandler(self):
-        """ Error handler specialisation. """
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-    def test_exceptionErrorHandler(self):
-        """ Error handler for exceptions. """
-
-cherrypy.response.body[0]
+response = 
+response.body
-
-    def test_recursiveErrorHandler(self):
-        """ Recursive error handler. """
-
-
-
-
-
+
+
+
+
-
-    def test_implicitErrorHandler(self):
-        """ Implicit error handling. """
-
-
-
-
-
-
+
+
+
+
-
-    def test_normalMethodErrorHandler(self):
-        """ Normal method as an error handler. """
-
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
+response = 
+response.body
+response = 
+response.body
-
-    def test_infiniteRecursionPrevention(self):
-        """ Infinite recursion prevention. """
-
-cherrypy.response.body[0]
+response = 
+response.body
-
-    def test_positionalArgs(self):
-        """ Positional argument validation.  """
-
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
+response = 
+response.body
+response = 
+response.body
+response = 
+response.body
+response = 
+response.body
-        self.failUnless(cherrypy.root.first == "first")
-        self.failUnless(cherrypy.root.second == 23)
-        self.failUnless(cherrypy.root.third == "third")
-
-    def test_missingArgs(self):
-        """ Arguments required in validation missing. """
-
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
+response = 
+response.body
+response = 
+response.body
-
-    def test_nohandler(self):
-ld
-
-cherrypy.response.body[0]
+dl
+response = 
+response.body
-
-    def test_bindArgs(self):
-        """ Arguments can be bond to an error handler. """
-
-cherrypy.response.body[0]
+response = 
+response.body
-
-    def test_notExposed(self):
-        """ Validation error handling is decoupled from expose. """
-
-cherrypy.response.body[0]
-cherrypy.response.body[0]
+response = 
+response.body
+response.body
-
-    def test_continuations(self):
-        """ Continuations via error handling mechanism. """
-
-cherrypy.response.body[0]
+response = 
+response.body
-        self.failUnless(cherrypy.root.continuation == True)
-
-    def test_nested(self):
-        """ Potentially ambiguous cases. """
-
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
+response = 
+response.body
+response = 
+response.body
-
-    def test_failsafe(self):
-        """ Failsafe values for erroneous input. """
-
-cherrypy.response.body[0]
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
-cherrypy.response.body[0]
-
+response = 
+response.body
+response.body
+response = 
+response.body
+response.body
+response = 
+response.body
+response.body
+response = 
-        self.failUnless('"bar": "Please enter an integer value"' in
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
-cherrypy.response.body[0]
-
-cherrypy.response.body[0],cherrypy.response.body[0]
-cherrypy.response.body[0]
+response.body
+ 
+response.body
+response = 
+response.body
+response.body
+response = 
+response.body,response.body
+response.body

turbogears/tests/test_sqlalchemy.py

@@ -135 +135 @@
-        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)
@@ -181 +180 @@
-    """If a controller causes an SA exception, it is raised properly."""
-    capture_log("turbogears.database")
-    cherrypy.root = MyRoot()
-
-
+
-    print_log()
+    assert 'No exceptions occurred' in response.body
+    response = create_request("/create_person?id=20", status=500)
+    output = response.body
-    print output
-    assert 'No exceptions occurred' in output
-    create_request("/create_person?id=20")
-    output = cherrypy.response.body[0]
-    print output
-    assert 'KARL25' not in output, \
-        'Exception should NOT have been handled by our handler'
-    assert 'DBAPIError' in output, \
@@ -218 +215 @@
-def test_cntrl_commit():
-    """It's safe to commit a transaction in the controller."""
-    cherrypy.root = MyRoot()
-
-cherrypy.response.body[0]
+response = 
+response.body
-    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()
-
-cherrypy.response.body[0]
+response = 
+response.body
-    assert session.query(Person).get(24) is not None, \
-        'The Person 24 should have been saved during commit' \
-        ' inside controller and not rolled back'
@@ -235 +232 @@
-def test_cntrl_flush():
-    """It's safe to flush in the controller."""
-    cherrypy.root = MyRoot()
-
-cherrypy.response.body[0]
-cherrypy.response.body[0]
-create_request("/create_person?id=25&doflush=0"
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
-
-cherrypy.response.body[0]
+response = 
+response.body
+response.body
+response = create_request("/create_person?id=25&doflush=0", status=500
+response.body
+response = 
+response.body
+response = 
+response.body
-
-
-# Exception handling with rollback
@@ -297 +294 @@
-
-    """
-    cherrypy.root = RbRoot()
-
-cherrypy.response.body[0]
+response = 
+response.body
-    print output
-    assert 'KARL27' in output, 'Exception handler should have answered'
-    assert session.query(User).get(26) is None
@@ -312 +309 @@
-
-    """
-    cherrypy.root = RbRoot()
-
-cherrypy.response.body[0]
+response = 
+response.body
-    assert 'KARL27' in output, 'Exception handler should have answered'
-    assert session.query(User).get('XX') is None
-
-def test_exc_done_rollback():
-    """No problems with error handler if controller manually rollbacks."""
-    cherrypy.root = RbRoot()
-
-cherrypy.response.body[0]
+response = 
+response.body
-    assert 'KARL27' in output, 'Exception handler should have answered'
-    assert session.query(User).get(28) is None
-    assert session.query(User).get(29) is not None
@@ -356 +353 @@
-    """
-    test_table.insert().execute(dict(id=1, val='a'))
-    cherrypy.root = FreshRoot()
-create_request("/test1"
-cherrypy.response.body[0]
+response = create_request("/test1", status=500
+response.body
-    # Call test2 in a different thread
-    class ThreadB(threading.Thread):
-        def run(self):
-create_request("/test2"
-cherrypy.response.body[0]
+response = create_request("/test2", status=500
+response.body
-    thrdb = ThreadB()
-    thrdb.start()
-    thrdb.join()
-create_request("/test3"
-cherrypy.response.body[0]
+response = create_request("/test3", status=500
+response.body

turbogears/tests/test_expose.py

@@ -21 +21 @@
-
-def test_gettinghtml():
-    cherrypy.root = ExposeRoot()
-
-
-
+
+
-
-def test_gettingjson():
-    cherrypy.root = ExposeRoot()
-
-
-
+
+
-
-def test_gettingjsonviaaccept():
-    cherrypy.root = ExposeRoot()
-
+response = 
-            headers=dict(Accept="text/javascript"))
-
-
+
-
-def test_getting_json_with_accept_but_using_tg_format():
-    cherrypy.root = ExposeRoot()
-
-
-
+
+
-
-def test_getting_plaintext():
-    cherrypy.root = ExposeRoot()
-
+response = 
-        headers=dict(Accept="text/plain"))
-
-
+
-
-def test_allow_json():
-
@@ -59 +54 @@
-            return dict(title="Foobar", mybool=False, someval="niggles")
-
-    cherrypy.root = NewRoot()
-
-
-
+
+
-    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 turbogears
+from turbogears import config, controllers, database, \
+    error_handler, exception_handler, expose, flash, redirect, \
+    startup, testutil, url, validate, validators
+import simplejson
-import formencode
-import cherrypy
-import pkg_resources
-
-
-
+
-
-
-class SubApp(controllers.RootController):
-
+    @expose()
-    def index(self):
-        return url("/Foo/")
-    index = expose()(index)
-
+    @expose()
+    def foo(self):
+        return url("foo")
-
+    @expose()
+    def foo2(self):
+        return url("/foo")
+
+    @expose()
+    def redir(self):
+        turbogears.redirect("foo")
+
+    @expose()
+    def redir2(self):
+        raise turbogears.redirect("foo")
+
+
-class MyRoot(controllers.RootController):
-
-    @expose()
-    def index(self):
-pass
+return {}
-
-    def validation_error_handler(self, tg_source, tg_errors, *args, **kw):
-        self.functionname = tg_source.__name__
@@ -215 +234 @@
-
-    def test_js_files(self):
-        """Can access the JavaScript files"""
-
-
-
-
+
+
-
-    def test_json_output(self):
-
-import simplejson
-values = simplejson.loads(cherrypy.response.body[0])
-assert values == dict(title="Foobar", mybool=False,
-    someval="niggles", tg_flash=None
-cherrypy.
+response = 
+values = simplejson.loads(response.body)
+expected = dict(title="Foobar", mybool=False, someval="niggles",
+    tg_flash=None)
+eq_(values, expected
+
-
-    def test_implied_json(self):
-
-cherrypy.response.body[0]
+response = 
+response.body
-
-    def test_allow_json(self):
-testutil.create_request("/allowjson?tg_format=json"
-cherrypy.response.headers["Content-Type"] == "text/html"
+response = testutil.create_request("/allowjson?tg_format=json", status=500
+response.headers["Content-Type"] == "text/html", response.headers
-
-    def test_allow_json_config(self):
-        """JSON output can be enabled via config."""
@@ -245 +262 @@
-                return dict(title="Foobar", mybool=False, someval="foo",
-                     tg_html="turbogears.tests.simple")
-        cherrypy.root = JSONRoot()
-
-cherrypy.response.headers["Content-Type"] == 
- 
+response = 
+response.headers["Content-Type"]==
+
-
-    def test_allow_json_config_false(self):
-        """Make sure JSON can still be restricted with a global config on."""
@@ -258 +275 @@
-                return dict(title="Foobar", mybool=False, someval="foo",
-                     tg_html="turbogears.tests.simple")
-        cherrypy.root = JSONRoot()
-testutil.create_request('/allowjson?tg_format=json'
-cherrypy.response.headers["Content-Type"] == 
+response = testutil.create_request('/allowjson?tg_format=json', status=404
+response.headers["Content-Type"]==
-        config.update({'tg.allow_json': False})
-
-    def test_invalid_return(self):
-
-
+
-
-    def test_strict_parameters(self):
-
-
-
-
-
+
+
+
+
-
-    def test_throw_out_random(self):
-        """Can append random value to the URL to avoid caching problems."""
-
-cherrypy.response.body[0]
+response = 
+response.body
-        config.update({"tg.strict_parameters": True})
-
-
-
-
-
-
+
+
+
-
-    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):
@@ -305 +314 @@
-        assert d["title"] == "Foobar"
-
-    def test_templateOutput(self):
-
-
+
+
+
-
+    def test_throw_out_random(self):
+        """A random value can be appended to the URL to avoid caching
+        problems."""
+        response = testutil.create_request("/test?tg_random=1")
+        assert "Paging all niggles" in response.body
+
-    def test_safari_unicode_fix(self):
-testutil.create_request("/unicode", headers={'User-Agent'
-
-cherrypy.response.body[0]
+response = testutil.create_request("/unicode", headers={'User-Agent' 
+, status=200
+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"""
-
-cherrypy.
+response = 
+
-
-    def test_returned_template_name(self):
-
-cherrypy.response.body[0]
+response = 
+response.body
-        assert "<body>" in data
-        assert 'groovy test template' in data
-
-    def test_returned_template_short(self):
-
-cherrypy.response.body[0]
+response = 
+response.body
-
-    def test_expose_template_short(self):
-
-cherrypy.response.body[0]
+response = 
+response.body
-
-    def test_validation(self):
-        """Data can be converted and validated"""
-
+
+
-        assert cherrypy.root.value is True
-        testutil.create_request("/istrue?value=false")
-        assert cherrypy.root.value is False
-        cherrypy.root = MyRoot()
-
+response = 
-        assert not hasattr(cherrypy.root, "value")
-        assert cherrypy.root.functionname == "istrue"
-
+
+
-        assert cherrypy.root.fullname == "John Doe"
-        assert cherrypy.root.submit == "send"
-        testutil.create_request("/save?submit=send&firstname=Arthur")
@@ -369 +385 @@
-        assert cherrypy.root.errors.has_key("firstname")
-
-    def test_validation_with_schema(self):
-/
+ and 
-        testutil.create_request("/save2?submit=send&firstname=Joe&lastname=Doe")
-        assert cherrypy.root.fullname == "Joe Doe"
-        assert cherrypy.root.submit == "send"
@@ -384 +400 @@
-
-    def test_other_template(self):
-        """'tg_html' in a returned dict will use the template specified there"""
-
-cherrypy.response.body[0]
+response = 
+response.body, response.body
-
-    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"""
@@ -405 +420 @@
-
-    def test_positional(self):
-        """Positional parameters should work"""
-
+response = 
-        assert cherrypy.root.posvalue == "foo"
-
-    def test_flash_plain(self):
-        """flash with strings should work"""
-
-
-
+
+
-        assert values["tg_flash"] == "plain"
-cherrypy.response.simple_cookie.has_key("tg_flash")
+response.cookies_set.has_key("tg_flash"), response.cookies_set
-
-    def test_flash_unicode(self):
-        """flash with unicode objects should work"""
-
-
-
+
+
-        assert values["tg_flash"] == u"\xfcnicode"
-cherrypy.response.simple_cookie.has_key("tg_flash")
+response.cookies_set.has_key("tg_flash"), response.cookies_set
-
-    def test_flash_on_redirect(self):
-        """flash must survive a redirect"""
-
-
-
-
-
-
-
+
+
+
+
+
+
-        assert values["tg_flash"] == u"redirect \xfcnicode"
-
-    def test_double_flash(self):
@@ -440 +452 @@
-        # 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().
-
-
-
-
+
+
+
-        assert values["tg_flash"] == "plain"
-cherrypy.response.simple_cookie
+response.cookies_set
-                "Cookie clearing request should be present"
-cherrypy.response.simple_cookie
+response.cookies_set
-        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'})
-
-
-