Remove class from test_views

11 years ago · e77bc2d86c
1 changed files with 142 additions and 150 deletions
--- a/tests/test_views.py
+++ b/tests/test_views.py
@ -17,155 +17,147 @@ import unittest
 from tests import TestFlask
 from werkzeug.http import parse_set_header

-class TestView(TestFlask):
-
-    def common_test(self, app):
-        c = app.test_client()
-
-        assert c.get('/').data == b'GET'
-        assert c.post('/').data == b'POST'
-        assert c.put('/').status_code == 405
-        meths = parse_set_header(c.open('/', method='OPTIONS').headers['Allow'])
-        assert sorted(meths) == ['GET', 'HEAD', 'OPTIONS', 'POST']
-
-    def test_basic_view(self):
-        app = flask.Flask(__name__)
-
-        class Index(flask.views.View):
-            methods = ['GET', 'POST']
-            def dispatch_request(self):
-                return flask.request.method
-
-        app.add_url_rule('/', view_func=Index.as_view('index'))
-        self.common_test(app)
-
-    def test_method_based_view(self):
-        app = flask.Flask(__name__)
-
-        class Index(flask.views.MethodView):
-            def get(self):
-                return 'GET'
-            def post(self):
-                return 'POST'
-
+def common_test(app):
+    c = app.test_client()
+
+    assert c.get('/').data == b'GET'
+    assert c.post('/').data == b'POST'
+    assert c.put('/').status_code == 405
+    meths = parse_set_header(c.open('/', method='OPTIONS').headers['Allow'])
+    assert sorted(meths) == ['GET', 'HEAD', 'OPTIONS', 'POST']
+
+def test_basic_view():
+    app = flask.Flask(__name__)
+
+    class Index(flask.views.View):
+        methods = ['GET', 'POST']
+        def dispatch_request(self):
+            return flask.request.method
+
+    app.add_url_rule('/', view_func=Index.as_view('index'))
+    common_test(app)
+
+def test_method_based_view():
+    app = flask.Flask(__name__)
+
+    class Index(flask.views.MethodView):
+        def get(self):
+            return 'GET'
+        def post(self):
+            return 'POST'
+
+    app.add_url_rule('/', view_func=Index.as_view('index'))
+
+    common_test(app)
+
+def test_view_patching():
+    app = flask.Flask(__name__)
+
+    class Index(flask.views.MethodView):
+        def get(self):
+            1 // 0
+        def post(self):
+            1 // 0
+
+    class Other(Index):
+        def get(self):
+            return 'GET'
+        def post(self):
+            return 'POST'
+
+    view = Index.as_view('index')
+    view.view_class = Other
+    app.add_url_rule('/', view_func=view)
+    common_test(app)
+
+def test_view_inheritance():
+    app = flask.Flask(__name__)
+
+    class Index(flask.views.MethodView):
+        def get(self):
+            return 'GET'
+        def post(self):
+            return 'POST'
+
+    class BetterIndex(Index):
+        def delete(self):
+            return 'DELETE'
+
+    app.add_url_rule('/', view_func=BetterIndex.as_view('index'))
+    c = app.test_client()
+
+    meths = parse_set_header(c.open('/', method='OPTIONS').headers['Allow'])
+    assert sorted(meths) == ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST']
+
+def test_view_decorators():
+    app = flask.Flask(__name__)
+
+    def add_x_parachute(f):
+        def new_function(*args, **kwargs):
+            resp = flask.make_response(f(*args, **kwargs))
+            resp.headers['X-Parachute'] = 'awesome'
+            return resp
+        return new_function
+
+    class Index(flask.views.View):
+        decorators = [add_x_parachute]
+        def dispatch_request(self):
+            return 'Awesome'
+
+    app.add_url_rule('/', view_func=Index.as_view('index'))
+    c = app.test_client()
+    rv = c.get('/')
+    assert rv.headers['X-Parachute'] == 'awesome'
+    assert rv.data == b'Awesome'
+
+def test_implicit_head():
+    app = flask.Flask(__name__)
+
+    class Index(flask.views.MethodView):
+        def get(self):
+            return flask.Response('Blub', headers={
+                'X-Method': flask.request.method
+            })
+
+    app.add_url_rule('/', view_func=Index.as_view('index'))
+    c = app.test_client()
+    rv = c.get('/')
+    assert rv.data == b'Blub'
+    assert rv.headers['X-Method'] == 'GET'
+    rv = c.head('/')
+    assert rv.data == b''
+    assert rv.headers['X-Method'] == 'HEAD'
+
+def test_explicit_head():
+    app = flask.Flask(__name__)
+
+    class Index(flask.views.MethodView):
+        def get(self):
+            return 'GET'
+        def head(self):
+            return flask.Response('', headers={'X-Method': 'HEAD'})
+
+    app.add_url_rule('/', view_func=Index.as_view('index'))
+    c = app.test_client()
+    rv = c.get('/')
+    assert rv.data == b'GET'
+    rv = c.head('/')
+    assert rv.data == b''
+    assert rv.headers['X-Method'] == 'HEAD'
+
+def test_endpoint_override():
+    app = flask.Flask(__name__)
+    app.debug = True
+
+    class Index(flask.views.View):
+        methods = ['GET', 'POST']
+        def dispatch_request(self):
+            return flask.request.method
+
+    app.add_url_rule('/', view_func=Index.as_view('index'))
+
+    with pytest.raises(AssertionError):
        app.add_url_rule('/', view_func=Index.as_view('index'))

-        self.common_test(app)
-
-    def test_view_patching(self):
-        app = flask.Flask(__name__)
-
-        class Index(flask.views.MethodView):
-            def get(self):
-                1 // 0
-            def post(self):
-                1 // 0
-
-        class Other(Index):
-            def get(self):
-                return 'GET'
-            def post(self):
-                return 'POST'
-
-        view = Index.as_view('index')
-        view.view_class = Other
-        app.add_url_rule('/', view_func=view)
-        self.common_test(app)
-
-    def test_view_inheritance(self):
-        app = flask.Flask(__name__)
-
-        class Index(flask.views.MethodView):
-            def get(self):
-                return 'GET'
-            def post(self):
-                return 'POST'
-
-        class BetterIndex(Index):
-            def delete(self):
-                return 'DELETE'
-
-        app.add_url_rule('/', view_func=BetterIndex.as_view('index'))
-        c = app.test_client()
-
-        meths = parse_set_header(c.open('/', method='OPTIONS').headers['Allow'])
-        assert sorted(meths) == ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST']
-
-    def test_view_decorators(self):
-        app = flask.Flask(__name__)
-
-        def add_x_parachute(f):
-            def new_function(*args, **kwargs):
-                resp = flask.make_response(f(*args, **kwargs))
-                resp.headers['X-Parachute'] = 'awesome'
-                return resp
-            return new_function
-
-        class Index(flask.views.View):
-            decorators = [add_x_parachute]
-            def dispatch_request(self):
-                return 'Awesome'
-
-        app.add_url_rule('/', view_func=Index.as_view('index'))
-        c = app.test_client()
-        rv = c.get('/')
-        assert rv.headers['X-Parachute'] == 'awesome'
-        assert rv.data == b'Awesome'
-
-    def test_implicit_head(self):
-        app = flask.Flask(__name__)
-
-        class Index(flask.views.MethodView):
-            def get(self):
-                return flask.Response('Blub', headers={
-                    'X-Method': flask.request.method
-                })
-
-        app.add_url_rule('/', view_func=Index.as_view('index'))
-        c = app.test_client()
-        rv = c.get('/')
-        assert rv.data == b'Blub'
-        assert rv.headers['X-Method'] == 'GET'
-        rv = c.head('/')
-        assert rv.data == b''
-        assert rv.headers['X-Method'] == 'HEAD'
-
-    def test_explicit_head(self):
-        app = flask.Flask(__name__)
-
-        class Index(flask.views.MethodView):
-            def get(self):
-                return 'GET'
-            def head(self):
-                return flask.Response('', headers={'X-Method': 'HEAD'})
-
-        app.add_url_rule('/', view_func=Index.as_view('index'))
-        c = app.test_client()
-        rv = c.get('/')
-        assert rv.data == b'GET'
-        rv = c.head('/')
-        assert rv.data == b''
-        assert rv.headers['X-Method'] == 'HEAD'
-
-    def test_endpoint_override(self):
-        app = flask.Flask(__name__)
-        app.debug = True
-
-        class Index(flask.views.View):
-            methods = ['GET', 'POST']
-            def dispatch_request(self):
-                return flask.request.method
-
-        app.add_url_rule('/', view_func=Index.as_view('index'))
-
-        with pytest.raises(AssertionError):
-            app.add_url_rule('/', view_func=Index.as_view('index'))
-
-        # But these tests should still pass. We just log a warning.
-        self.common_test(app)
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestView))
-    return suite
+    # But these tests should still pass. We just log a warning.
+    common_test(app)