summaryrefslogtreecommitdiff
path: root/doc/development/fe_guide
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-07 20:50:41 +0200
committerRémy Coutable <remy@rymai.me>2017-04-10 16:40:33 +0200
commit91fb9f446fa8476f287657032003aa286c2606b6 (patch)
treebeb42d274e3088f01fab1ed457ecc56d236664fd /doc/development/fe_guide
parent35bf7c7e47eb0ccd1f10fdfd19f9a85b426c184e (diff)
downloadgitlab-ce-91fb9f446fa8476f287657032003aa286c2606b6.tar.gz
Improve testing documentation with Robert's feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'doc/development/fe_guide')
-rw-r--r--doc/development/fe_guide/testing.md27
1 files changed, 13 insertions, 14 deletions
diff --git a/doc/development/fe_guide/testing.md b/doc/development/fe_guide/testing.md
index a8a01747c75..175873c9efa 100644
--- a/doc/development/fe_guide/testing.md
+++ b/doc/development/fe_guide/testing.md
@@ -87,16 +87,16 @@ JavaScript enabled:
```ruby
# For one spec
it 'presents information about abuse report', :js do
- # assertions...
+ # assertions...
end
describe "Admin::AbuseReports", :js do
- it 'presents information about abuse report' do
- # assertions...
- end
- it 'shows buttons for adding to abuse report' do
- # assertions...
- end
+ it 'presents information about abuse report' do
+ # assertions...
+ end
+ it 'shows buttons for adding to abuse report' do
+ # assertions...
+ end
end
```
@@ -112,13 +112,12 @@ file for the failing spec, add the `@javascript` flag above the Scenario:
```
@javascript
Scenario: Developer can approve merge request
- Given I am a "Shop" developer
- And I visit project "Shop" merge requests page
- And merge request 'Bug NS-04' must be approved
- And I click link "Bug NS-04"
- When I click link "Approve"
- Then I should see approved merge request "Bug NS-04"
-
+ Given I am a "Shop" developer
+ And I visit project "Shop" merge requests page
+ And merge request 'Bug NS-04' must be approved
+ And I click link "Bug NS-04"
+ When I click link "Approve"
+ Then I should see approved merge request "Bug NS-04"
```
[capybara]: http://teamcapybara.github.io/capybara/