summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-09-12 12:35:08 -0700
committerStan Hu <stanhu@gmail.com>2016-09-12 12:37:29 -0700
commitdbe37d2f6b588b399b8be95c696c770199df5cbd (patch)
tree7ef344c340f618bc93a37c1ab570bbcecbcd8af5 /CONTRIBUTING.md
parent3de4e8b589475b941ba8377ec88e28ab1a041169 (diff)
downloadgitlab-ce-dbe37d2f6b588b399b8be95c696c770199df5cbd.tar.gz
Add link to article on how to write reliable, asynchronous tests with Capybarash-add-link-to-reliable-capybara-specs
[ci skip]
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c77dcd96a7d..7a2ee38ad8f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -289,6 +289,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