Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of github.com:Pylons/pylonshq

  • Loading branch information...
commit 7834c0456c64d2ae6e1e799a89b18b7fc5e279ad 2 parents 991fecd + 4dfca0b
Chris McDonough mcdonc authored

Showing 2 changed files with 6 additions and 6 deletions. Show diff stats Hide diff stats

  1. +1 1  community/codestyle.rst
  2. +5 5 community/testing.rst
2  community/codestyle.rst
Source Rendered
@@ -86,7 +86,7 @@ the ``nose`` and ``coverage`` packages).
86 86 Testing code in a consistent manner can be difficult, to help developers learn
87 87 our style ("dogma") of testing we've made available a set of testing notes.
88 88
89   -:ref:`testing_guidelines`_
  89 +:ref:`testing_guidelines`
90 90
91 91 Coding Style
92 92 ------------
10 community/testing.rst
Source Rendered
@@ -155,7 +155,7 @@ prefer::
155 155 Guideline: Minimize module-scope dependencies.
156 156 ----------------------------------------------
157 157
158   -Unit tests need to be runnable even in an enviornment which is missing some
  158 +Unit tests need to be runnable even in an environment which is missing some
159 159 required features: in that case, one or more of the testcase methods (TCMs)
160 160 will fail. Defer imports of any needed library modules as late as possible.
161 161
@@ -324,7 +324,7 @@ Guideline: Use hooks and registries judiciously.
324 324 ------------------------------------------------
325 325
326 326 If the application already allows registering plugins or components, take
327   -advantage of the fact to insert your mock objects. Don't forget to cleanup
  327 +advantage of the fact to insert your mock objects. Don't forget to clean up
328 328 after each test!
329 329
330 330 It may be acceptable to add hook methods to the application, purely to allow
@@ -337,12 +337,12 @@ version after they run).
337 337 Guideline: Use mock objects to clarify dependent contracts
338 338 ----------------------------------------------------------
339 339
340   -Keeping the contracts on which the AUT dependes as simple as possible makes
  340 +Keeping the contracts on which the AUT depends as simple as possible makes
341 341 the AUT easier to write, and more resilient to changes. Writing mock objects
342 342 which supply only the simplest possible implementation of such contracts keeps
343 343 the AUT from acquiring "dependency creep."
344 344
345   -For example, in a relational application, the the SQL queries used by the
  345 +For example, in a relational application, the SQL queries used by the
346 346 application can be mocked up as a dummy implementation which takes keyword
347 347 parameters and returns lists of dictionaries::
348 348
@@ -378,7 +378,7 @@ for easy testing of how it is used by the AUT::
378 378 self.failUnless('NAME1' in names)
379 379 self.failUnless('NAME2' in names)
380 380
381   - self.assertEqual(query.called_with, {'bar', 'Dog and Whistle'})
  381 + self.assertEqual(query.called_with, [{'bar': 'Dog and Whistle'}])
382 382
383 383 Rule: Don't share text fixtures between test modules.
384 384 -----------------------------------------------------

0 comments on commit 7834c04

Please sign in to comment.
Something went wrong with that request. Please try again.