summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-11-25 23:54:33 -0800
committerSteve Piercy <web@stevepiercy.com>2018-11-25 23:54:33 -0800
commit2e1da5700d30519d5e9f0a6feaaefabcfd145249 (patch)
treedda1fd576cf7bffc65152dca67e3a14bebe214f4
parentb2c7fc1bcf8bd12c24314f4fb09d194a28489a7d (diff)
downloadpyramid-2e1da5700d30519d5e9f0a6feaaefabcfd145249.tar.gz
pyramid-2e1da5700d30519d5e9f0a6feaaefabcfd145249.tar.bz2
pyramid-2e1da5700d30519d5e9f0a6feaaefabcfd145249.zip
rewrap narrative, adjust grammar
-rw-r--r--docs/tutorials/wiki/tests.rst52
1 files changed, 25 insertions, 27 deletions
diff --git a/docs/tutorials/wiki/tests.rst b/docs/tutorials/wiki/tests.rst
index fdd218add..9dacc5f96 100644
--- a/docs/tutorials/wiki/tests.rst
+++ b/docs/tutorials/wiki/tests.rst
@@ -4,58 +4,56 @@
Adding Tests
============
-We will now add tests for the models and the views and a few functional tests
-in ``tests.py``. Tests ensure that an application works, and that it
-continues to work when changes are made in the future.
+We will now add tests for the models and the views and a few functional tests in ``tests.py``.
+Tests ensure that an application works, and that it continues to work when changes are made in the future.
+
Test the models
===============
-We write tests for the ``model`` classes and the ``appmaker``. Changing
-``tests.py``, we'll write a separate test class for each ``model`` class, and
-we'll write a test class for the ``appmaker``.
+We write tests for the ``model`` classes and the ``appmaker``.
+Changing ``tests.py``, we will write a separate test class for each ``model`` class
+We will also write a test class for the ``appmaker``.
+
+To do so, we will retain the ``tutorial.tests.ViewTests`` class that was generated from choosing the ``zodb`` backend option.
+We will add three test classes, one for each of the following:
+
+- the ``Page`` model named ``PageModelTests``
+- the ``Wiki`` model named ``WikiModelTests``
+- the appmaker named ``AppmakerTests``
-To do so, we'll retain the ``tutorial.tests.ViewTests`` class that was
-generated from choosing the ``zodb`` backend option. We'll add three test
-classes: one for the ``Page`` model named ``PageModelTests``, one for the
-``Wiki`` model named ``WikiModelTests``, and one for the appmaker named
-``AppmakerTests``.
Test the views
==============
-We'll modify our ``tests.py`` file, adding tests for each view function we
-added previously. As a result, we'll delete the ``ViewTests`` class that the
-``zodb`` backend option provided, and add four other test classes:
-``ViewWikiTests``, ``ViewPageTests``, ``AddPageTests``, and ``EditPageTests``.
-These test the ``view_wiki``, ``view_page``, ``add_page``, and ``edit_page``
-views.
+We will modify our ``tests.py`` file, adding tests for each view function that we added previously.
+As a result, we will delete the ``ViewTests`` class that the ``zodb`` backend option provided, and add four other test classes: ``ViewWikiTests``, ``ViewPageTests``, ``AddPageTests``, and ``EditPageTests``.
+These test the ``view_wiki``, ``view_page``, ``add_page``, and ``edit_page`` views.
+
Functional tests
================
-We'll test the whole application, covering security aspects that are not
-tested in the unit tests, like logging in, logging out, checking that
-the ``viewer`` user cannot add or edit pages, but the ``editor`` user
-can, and so on.
+We will test the whole application, covering security aspects that are not tested in the unit tests, such as logging in, logging out, checking that the ``viewer`` user cannot add or edit pages, but the ``editor`` user can, and so on.
+
View the results of all our edits to ``tests.py``
=================================================
-Open the ``tutorial/tests.py`` module, and edit it such that it appears as
-follows:
+Open the ``tutorial/tests.py`` module, and edit it such that it appears as follows:
.. literalinclude:: src/tests/tutorial/tests.py
:linenos:
:language: python
+
Running the tests
=================
-We can run these tests by using ``pytest`` similarly to how we did in
-:ref:`running_tests`. Courtesy of the cookiecutter, our testing dependencies have
-already been satisfied and ``pytest`` and coverage have already been
-configured, so we can jump right to running tests.
+We can run these tests by using ``pytest`` similarly to how we did in :ref:`running_tests`.
+Courtesy of the cookiecutter, our testing dependencies have already been satisfied.
+``pytest`` and coverage have already been configured.
+We can jump right to running tests.
On Unix: