Merge branch 'sh-add-link-to-reliable-capybara-specs' into 'master'

Add link to article on how to write reliable, asynchronous tests with Capybara This article has been incredibly useful for all developers. Adding a link to it so more people can refer to it. See merge request !6312

Merge branch 'sh-add-link-to-reliable-capybara-specs' into 'master'
7ac47516 · Achilleas Pipinellis · eb0787fd · dbe37d2f · 7ac47516
Commit 7ac47516 authored Sep 16, 2016 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

CONTRIBUTING.md CONTRIBUTING.md +2 -0

No files found.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -277,6 +277,8 @@ request is as follows:
 1. For more complex migrations, write tests.
 1. Merge requests **must** adhere to the [merge request performance
   guidelines](doc/development/merge_request_performance_guidelines.md).
+1. For tests that use Capybara or PhantomJS, see this [article on how
+   to write reliable asynchronous tests](https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara).

 The **official merge window** is in the beginning of the month from the 1st to
 the 7th day of the month. This is the best time to submit an MR and get