summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-09-16 09:46:07 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-09-16 09:46:07 +0000
commit7ac475164f06d40b7f33f2f9c663806fa675f462 (patch)
treee03089726aeea8ad734a269464c5de2bd4db4c59 /CONTRIBUTING.md
parenteb0787fdbaf7afc182ed5138950ef83a5295d12f (diff)
parentdbe37d2f6b588b399b8be95c696c770199df5cbd (diff)
downloadgitlab-ce-7ac475164f06d40b7f33f2f9c663806fa675f462.tar.gz
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
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 549918284c1..d5e15bfce14 100644
--- 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