summaryrefslogtreecommitdiff
path: root/doc/development/testing.md
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-03 17:04:47 +0100
committerPhil Hughes <me@iamphill.com>2017-05-03 17:04:47 +0100
commitf29e5d4d93123ea73e5f58be46020781af2ef7cb (patch)
treed08a8f8e5a9cf30dd4f238c187673ffe30ac39b3 /doc/development/testing.md
parent4134d700623404948f163349882caf4a6d940cf3 (diff)
parent8f29bf96b9306fd95b9b98019e80173b47b3a6b8 (diff)
downloadgitlab-ce-f29e5d4d93123ea73e5f58be46020781af2ef7cb.tar.gz
Merge branch 'master' into deploy-keys-load-async
Diffstat (limited to 'doc/development/testing.md')
-rw-r--r--doc/development/testing.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/development/testing.md b/doc/development/testing.md
index 9b0b9808827..6d8b846d27f 100644
--- a/doc/development/testing.md
+++ b/doc/development/testing.md
@@ -188,7 +188,8 @@ Please consult the [dedicated "Frontend testing" guide](./fe_guide/testing.md).
### General Guidelines
- Use a single, top-level `describe ClassName` block.
-- Use `described_class` instead of repeating the class name being described.
+- Use `described_class` instead of repeating the class name being described
+ (_this is enforced by RuboCop_).
- Use `.method` to describe class methods and `#method` to describe instance
methods.
- Use `context` to test branching logic.
@@ -197,7 +198,7 @@ Please consult the [dedicated "Frontend testing" guide](./fe_guide/testing.md).
- Don't `describe` symbols (see [Gotchas](gotchas.md#dont-describe-symbols)).
- Don't assert against the absolute value of a sequence-generated attribute (see [Gotchas](gotchas.md#dont-assert-against-the-absolute-value-of-a-sequence-generated-attribute)).
- Don't supply the `:each` argument to hooks since it's the default.
-- Prefer `not_to` to `to_not` (_this is enforced by Rubocop_).
+- Prefer `not_to` to `to_not` (_this is enforced by RuboCop_).
- Try to match the ordering of tests to the ordering within the class.
- Try to follow the [Four-Phase Test][four-phase-test] pattern, using newlines
to separate phases.