Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinnie Okada <vokada@mrvinn.com>2014-10-19 03:43:45 +0400
committerVinnie Okada <vokada@mrvinn.com>2014-10-19 03:43:45 +0400
commit5bb8aff5ddcc1debb4406303477c1ddbe618d058 (patch)
treefc73fc888d55d87bc516dc9ec20e796a7e60f3c7 /features/project
parent74c82ae32583ebf335f310a29ffb22d75b356863 (diff)
Fix more Markdown preview tests
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 f8a43e1ee36..7c029f05d75 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -195,14 +195,14 @@ Feature: Project Merge Requests
Given I visit merge request page "Bug NS-04"
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
+ Then The Markdown preview tab should say there is nothing to do
@javascript
Scenario: I can preview with text
Given I visit merge request page "Bug NS-04"
And I click link "Edit" for the merge request
- And I write a description like "Nice"
- Then I should see the Markdown preview button
+ And I write a description like ":+1: Nice"
+ Then The Markdown preview tab should display rendered Markdown
@javascript
Scenario: I preview a merge request description
@@ -217,4 +217,4 @@ Feature: Project Merge Requests
Given I visit merge request page "Bug NS-04"
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
+ Then I should see the Markdown write tab