diff options
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/testing.rst | 6 | ||||
| -rw-r--r-- | docs/narr/viewconfig.rst | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/narr/testing.rst b/docs/narr/testing.rst index 7ee432fa7..5ce2c8a66 100644 --- a/docs/narr/testing.rst +++ b/docs/narr/testing.rst @@ -303,12 +303,12 @@ In :app:`Pyramid`, a *unit test* typically relies on "mock" or "dummy" implementations to give the code under test only enough context to run. "Integration testing" implies another sort of testing. In the context of a -:app:`Pyramid`, integration test, the test logic tests the functionality of +:app:`Pyramid` integration test, the test logic tests the functionality of some code *and* its integration with the rest of the :app:`Pyramid` framework. In :app:`Pyramid` applications that are plugins to Pyramid, you can create an -integration test by including it's ``includeme`` function via +integration test by including its ``includeme`` function via :meth:`pyramid.config.Configurator.include` in the test's setup code. This causes the entire :app:`Pyramid` environment to be set up and torn down as if your application was running "for real". This is a heavy-hammer way of @@ -372,7 +372,7 @@ Creating Functional Tests Functional tests test your literal application. The below test assumes that your application's package name is ``myapp``, and -that there is view that returns an HTML body when the root URL is invoked. +that there is a view that returns an HTML body when the root URL is invoked. It further assumes that you've added a ``tests_require`` dependency on the ``WebTest`` package within your ``setup.py`` file. :term:`WebTest` is a functional testing package written by Ian Bicking. diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst index 763c0e131..23b4fde68 100644 --- a/docs/narr/viewconfig.rst +++ b/docs/narr/viewconfig.rst @@ -900,7 +900,7 @@ When a non-``None`` ``http_cache`` argument is passed to a view configuration, Pyramid will set ``Expires`` and ``Cache-Control`` response headers in the resulting response, causing browsers to cache the response data for some time. See ``http_cache`` in :ref:`nonpredicate_view_args` for -the its allowable values and what they mean. +the allowable values and what they mean. Sometimes it's undesirable to have these headers set as the result of returning a response from a view, even though you'd like to decorate the view |