summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Merickel <mmerickel@users.noreply.github.com>2016-11-15 23:03:10 -0600
committerGitHub <noreply@github.com>2016-11-15 23:03:09 -0600
commit917a473262c82b7be1ff35789b18c08f9c1302dc (patch)
treeba15b36431e619e888008360b218a2114fc161f5 /docs
parent4db295a08c931328fa6bc0d15c7b9aa57ddad86c (diff)
parentb824f093bf3c9088ea3ca968fa85f508ebac79c7 (diff)
downloadpyramid-917a473262c82b7be1ff35789b18c08f9c1302dc.tar.gz
pyramid-917a473262c82b7be1ff35789b18c08f9c1302dc.tar.bz2
pyramid-917a473262c82b7be1ff35789b18c08f9c1302dc.zip
Merge pull request #2821 from mmerickel/fix/2819-to-master
forward port #2819 to master
Diffstat (limited to 'docs')
-rw-r--r--docs/quick_tour.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 451830687..45c706b0d 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -678,10 +678,10 @@ egregious, as Pyramid has had a deep commitment to full test coverage since
before its release.
Our ``pyramid_jinja2_starter`` scaffold generated a ``tests.py`` module with
-one unit test in it. To run it, let's install the handy ``pytest`` test runner
-by editing ``setup.py``. While we're at it, we'll throw in the ``pytest-cov``
-tool which yells at us for code that isn't tested. Insert and edit the
-following lines as shown:
+one unit test in it. It also configured ``setup.py`` with test requirements:
+``py.test`` as the test runner, ``WebTest`` for running view tests, and the
+``pytest-cov`` tool which yells at us for code that isn't tested. The
+highlighted lines show this:
.. code-block:: python
:linenos:
@@ -711,7 +711,7 @@ following lines as shown:
'testing': tests_require,
},
-We changed ``setup.py`` which means we need to rerun ``$VENV/bin/pip install -e
+To install the test requirements, run ``$VENV/bin/pip install -e
".[testing]"``. We can now run all our tests:
.. code-block:: bash