summaryrefslogtreecommitdiff
path: root/features/project/merge_requests.feature
diff options
context:
space:
mode:
Diffstat (limited to 'features/project/merge_requests.feature')
-rw-r--r--features/project/merge_requests.feature34
1 files changed, 32 insertions, 2 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index e1e0edd0545..7c029f05d75 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -168,11 +168,10 @@ Feature: Project Merge Requests
# Task status in issues list
- @now
Scenario: Merge requests list should display task status
Given project "Shop" has "MR-task-open" open MR with task markdown
When I visit project "Shop" merge requests page
- Then I should see the task status for merge request "MR-task-open"
+ Then I should see the task status for the Taskable
# Toggling task items
@@ -188,3 +187,34 @@ Feature: Project Merge Requests
And I visit merge request page "MR-task-open"
And I click link "Close"
Then Task checkboxes should be disabled
+
+ # Description preview
+
+ @javascript
+ Scenario: I can't preview without text
+ 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 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 ":+1: Nice"
+ Then The Markdown preview tab should display rendered Markdown
+
+ @javascript
+ Scenario: I preview a merge request description
+ 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 preview
+ And I should not see the Markdown text field
+
+ @javascript
+ Scenario: I can edit after preview
+ 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 write tab