Chris McDonough
2011-07-08 deb32f2a8aa996187645bad897051ebe27741d52
more tests
2 files modified
10 ■■■■ changed files
pyramid/config.py 7 ●●●●● patch | view | raw | blame | history
pyramid/tests/test_config.py 3 ●●●● patch | view | raw | blame | history
pyramid/config.py
@@ -2942,10 +2942,9 @@
            result = view(context, request)
            response = registry.queryAdapterOrSelf(result, IResponse)
            if response is None:
                if response is None:
                    raise ValueError(
                        'Could not convert view return value "%s" into a '
                        'response object' % (result,))
                raise ValueError(
                    'Could not convert view return value "%s" into a '
                    'response object' % (result,))
            return response
        return wrapper
pyramid/tests/test_config.py
@@ -3981,7 +3981,8 @@
        def outer_view(context, request):
            self.assertEqual(request.wrapped_response, inner_response)
            self.assertEqual(request.wrapped_body, inner_response.body)
            self.assertEqual(request.wrapped_view, inner_view)
            self.assertEqual(request.wrapped_view.__original_view__,
                             inner_view)
            return Response('outer ' + request.wrapped_body)
        self.config.registry.registerAdapter(
            outer_view, (IViewClassifier, None, None), IView, 'owrap')