summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorVinnie Okada <vokada@mrvinn.com>2014-10-16 23:10:50 -0500
committerVinnie Okada <vokada@mrvinn.com>2014-10-18 17:58:34 -0500
commite1491465de441b386c72726f0b869104d1c15680 (patch)
tree9207fdd5957bda3d22946e268054f19ad8c1f093 /features/project
parentcd3eabd71236d2be1430d2dbf23aad91d73aa783 (diff)
downloadgitlab-ce-e1491465de441b386c72726f0b869104d1c15680.tar.gz
Refactor Markdown preview tests
Create a new shared module for common issue/merge request behavior, use `expect` syntax instead of `should`, and avoid `visible: false` in the `have_css` matcher.
Diffstat (limited to 'features/project')
-rw-r--r--features/project/merge_requests.feature8
1 files changed, 4 insertions, 4 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index f1adf0bd34d..f8a43e1ee36 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -193,21 +193,21 @@ Feature: Project Merge Requests
@javascript
Scenario: I can't preview without text
Given I visit merge request page "Bug NS-04"
- And I click link "Edit"
+ And I click link "Edit" for the merge request
And I haven't written any description text
Then I should not see the Markdown preview button
@javascript
Scenario: I can preview with text
Given I visit merge request page "Bug NS-04"
- And I click link "Edit"
+ And I click link "Edit" for the merge request
And I write a description like "Nice"
Then I should see the Markdown preview button
@javascript
Scenario: I preview a merge request description
Given I visit merge request page "Bug NS-04"
- And I click link "Edit"
+ And I click link "Edit" for the merge request
And I preview a description text like "Bug fixed :smile:"
Then I should see the Markdown preview
And I should not see the Markdown text field
@@ -215,6 +215,6 @@ Feature: Project Merge Requests
@javascript
Scenario: I can edit after preview
Given I visit merge request page "Bug NS-04"
- And I click link "Edit"
+ And I click link "Edit" for the merge request
And I preview a description text like "Bug fixed :smile:"
Then I should see the Markdown edit button