summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/performance.md6
-rw-r--r--doc/development/testing.md1
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/development/performance.md b/doc/development/performance.md
index 41f415812a0..fb37b3a889c 100644
--- a/doc/development/performance.md
+++ b/doc/development/performance.md
@@ -16,7 +16,7 @@ The process of solving performance problems is roughly as follows:
timings, etc) to the issue mentioned in step 1.
4. Solve the problem.
5. Create a merge request, assign the "performance" label and ping the right
- people (e.g. [@yorickpeterse][@yorickpeterse] and [@joshfng][@joshfng]).
+ people (e.g. [@yorickpeterse][yorickpeterse] and [@joshfng][joshfng]).
6. Once a change has been deployed make sure to _again_ measure for at least 24
hours to see if your changes have any impact on the production environment.
7. Repeat until you're done.
@@ -253,6 +253,6 @@ impact on runtime performance, and as such, using a constant instead of
referencing an object directly may even slow code down.
[#15607]: https://gitlab.com/gitlab-org/gitlab-ce/issues/15607
-[@yorickpeterse]: https://gitlab.com/u/yorickpeterse
-[@joshfng]: https://gitlab.com/u/joshfng
+[yorickpeterse]: https://gitlab.com/u/yorickpeterse
+[joshfng]: https://gitlab.com/u/joshfng
[anti-pattern]: https://en.wikipedia.org/wiki/Anti-pattern
diff --git a/doc/development/testing.md b/doc/development/testing.md
index 672e3fb4649..33eed29ba5c 100644
--- a/doc/development/testing.md
+++ b/doc/development/testing.md
@@ -64,6 +64,7 @@ the command line via `bundle exec teaspoon`, or via a web browser at
methods.
- Use `context` to test branching logic.
- Don't `describe` symbols (see [Gotchas](gotchas.md#dont-describe-symbols)).
+- Don't supply the `:each` argument to hooks since it's the default.
- Prefer `not_to` to `to_not`.
- 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