Merge branch 'improvements/pallets-eco#14-3rd-party-decorator' into develop

Author: hoatle

flask_classful.py

@@ -167,7 +167,6 @@ def parse_options(cls, options):
         endpoint = options.pop('endpoint', None)
         return subdomain, endpoint, options,
 
-
     @classmethod
     def make_proxy_method(cls, name):
         """Creates a proxy function that can be used by Flasks routing. The
@@ -190,7 +189,7 @@ def inner(*args, **kwargs):
         view = make_func(view)
 
         # Now apply the class decorator list in reverse order
-        # to match memeber decorator order
+        # to match member decorator order
         if cls.decorators:
             for decorator in reversed(cls.decorators):
                 view = decorator(view)

test_classful/test_decorators.py

@@ -68,88 +68,98 @@ def test_params_decorator_delete():
 
 
 def test_decorator_bold_list_get():
-    '''Tests that the get route is wrapped in bold'''
+    """Tests that the get route is wrapped in bold"""
     resp = client.get('/decorated_bold_list_view/1234')
     eq_(b'<b>' in resp.data, True)
     eq_(b'</b>' in resp.data, True)
+    eq_(b'<b>Get 1234</b>', resp.data)
 
 
 def test_decorator_bold_list_index():
-    '''Tests that the index route is wrapped in bold'''
+    """Tests that the index route is wrapped in bold"""
     resp = client.get('/decorated_bold_list_view/')
     eq_(b'<b>' in resp.data, True)
     eq_(b'</b>' in resp.data, True)
+    eq_(b'<b>Index</b>', resp.data)
 
 
 def test_decorator_bold_italics_list_get():
-    '''Tests that the get route is wrapped in bold and italics'''
+    """Tests that the get route is wrapped in bold and italics"""
     resp = client.get('/decorated_bold_italics_list_view/1234')
     eq_(b'<i>' in resp.data, True)
     eq_(b'</i>' in resp.data, True)
     eq_(b'<b>' in resp.data, True)
     eq_(b'</b>' in resp.data, True)
+    eq_(b'<b><i>Get 1234</i></b>', resp.data)
 
 
 def test_decorator_bold_italics_list_index():
-    '''Tests that the index route is wrapped in bold and italics'''
+    """Tests that the index route is wrapped in bold and italics"""
     resp = client.get('/decorated_bold_italics_list_view/')
     eq_(b'<i>' in resp.data, True)
     eq_(b'</i>' in resp.data, True)
     eq_(b'<b>' in resp.data, True)
     eq_(b'</b>' in resp.data, True)
+    eq_(b'<b><i>Index</i></b>', resp.data)
 
 
 def test_decorator_list_member_index():
-    '''
+    """
     Tests that the index route is wrapped in bold,
     italics and paragraph
-    '''
+    """
     resp = client.get('/decorated_list_member_view/')
     eq_(b'<i>' in resp.data, True)
     eq_(b'</i>' in resp.data, True)
     eq_(b'<b>' in resp.data, True)
     eq_(b'</b>' in resp.data, True)
     eq_(b'<p>' not in resp.data, True)
     eq_(b'</p>' not in resp.data, True)
+    eq_(b'<b><i>Index</i></b>', resp.data)
 
 
 def test_decorator_list_member_get():
-    '''Tests the ordering of decorators'''
+    """Tests the ordering of decorators"""
     resp = client.get('/decorated_list_member_view/1234')
     eq_(b'<b>', resp.data[:3])
     eq_(b'<i>', resp.data[3:6])
     eq_(b'<p>', resp.data[6:9])
     eq_(b'</p>', resp.data[-12:-8])
     eq_(b'</i>', resp.data[-8:-4])
     eq_(b'</b>', resp.data[-4:])
+    eq_(b'<b><i><p>Get 1234</p></i></b>', resp.data)
 
 
 def test_decorator_list_function_attributes_get():
-    '''Verify list of decorators with attributes modify all functions in FlaskView'''
+    """Verify list of decorators with attributes modify all functions in FlaskView"""
     resp = client.get('/decorated_list_function_attributes_view/1234')
     eq_(b'Get 1234' in resp.data, True)
+    eq_(b'<i><b>Get 1234</b></i>', resp.data)
     eq_(hasattr(app.view_functions['DecoratedListFunctionAttributesView:get'], 'eggs'), True)
     eq_('scrambled', app.view_functions['DecoratedListFunctionAttributesView:get'].eggs)
 
 
 def test_decorator_list_function_attributes_index():
-    '''Verify list of decorators with attributes modify all functions in FlaskView'''
+    """Verify list of decorators with attributes modify all functions in FlaskView"""
     resp = client.get('/decorated_list_function_attributes_view/')
     eq_(b'Index' in resp.data, True)
+    eq_(b'<i>Index</i>', resp.data)
     eq_(hasattr(app.view_functions['DecoratedListFunctionAttributesView:index'], 'eggs'), True)
     eq_('scrambled', app.view_functions['DecoratedListFunctionAttributesView:index'].eggs)
 
 
 def test_decorator_list_member_function_attributes_get():
-    '''Verify decorator with attributes does not modify other members'''
+    """Verify decorator with attributes does not modify other members"""
     resp = client.get('/decorated_list_member_function_attributes_view/4321')
     eq_(b'Get 4321' in resp.data, True)
+    eq_(b'<i><b>Get 4321</b></i>', resp.data)
     eq_(hasattr(app.view_functions['DecoratedListMemberFunctionAttributesView:get'], 'eggs'), False)
 
 
 def test_decorator_list_member_function_attributes_index():
-    '''Verify decorator with attributes modify decorated memeber functions'''
+    """Verify decorator with attributes modify decorated memeber functions"""
     resp = client.get('/decorated_list_member_function_attributes_view/')
     eq_(b'Index' in resp.data, True)
+    eq_(b'<i>Index</i>', resp.data)
     eq_(hasattr(app.view_functions['DecoratedListMemberFunctionAttributesView:index'], 'eggs'), True)
     eq_('scrambled', app.view_functions['DecoratedListMemberFunctionAttributesView:index'].eggs)