summaryrefslogtreecommitdiff
path: root/docs/narr/testing.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-24 11:46:52 -0800
committerChris McDonough <chrism@plope.com>2012-02-24 11:46:52 -0800
commit33f922bb012481424bdcd0b5d063ebf22f20d273 (patch)
tree708736152f7c25838512de98490bfdd53782b67a /docs/narr/testing.rst
parentf2f67edd97b9525ae6c6a20a09a9afa9189c018e (diff)
parent283494c2338dbd6e89a7da79a05318992ee04cfc (diff)
downloadpyramid-33f922bb012481424bdcd0b5d063ebf22f20d273.tar.gz
pyramid-33f922bb012481424bdcd0b5d063ebf22f20d273.tar.bz2
pyramid-33f922bb012481424bdcd0b5d063ebf22f20d273.zip
Merge pull request #445 from slinkp/master
Trivial doc typos
Diffstat (limited to 'docs/narr/testing.rst')
-rw-r--r--docs/narr/testing.rst6
1 files changed, 3 insertions, 3 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.