merge_requests.feature 9.6 KB
Newer Older
1
Feature: Project Merge Requests
2
  Background:
3
    Given I sign in as a user
4 5 6
    And I own project "Shop"
    And project "Shop" have "Bug NS-04" open merge request
    And project "Shop" have "Feature NS-03" closed merge request
7
    And I visit project "Shop" merge requests page
8 9 10 11 12

  Scenario: I should see open merge requests
    Then I should see "Bug NS-04" in merge requests
    And I should not see "Feature NS-03" in merge requests

13 14 15 16 17 18
  Scenario: I should see CI status for merge requests
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    Given "Bug NS-05" has CI status
    When I visit project "Shop" merge requests page
    Then I should see merge request "Bug NS-05" with CI status

Douwe Maan's avatar
Douwe Maan committed
19
  Scenario: I should see rejected merge requests
20
    Given I click link "Closed"
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
    Then I should see "Feature NS-03" in merge requests
    And I should not see "Bug NS-04" in merge requests

  Scenario: I should see all merge requests
    Given I click link "All"
    Then I should see "Feature NS-03" in merge requests
    And I should see "Bug NS-04" in merge requests

  Scenario: I visit merge request page
    Given I click link "Bug NS-04"
    Then I should see merge request "Bug NS-04"

  Scenario: I close merge request page
    Given I click link "Bug NS-04"
    And I click link "Close"
    Then I should see closed merge request "Bug NS-04"

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
38 39 40 41 42 43 44
  Scenario: I reopen merge request page
    Given I click link "Bug NS-04"
    And I click link "Close"
    Then I should see closed merge request "Bug NS-04"
    When I click link "Reopen"
    Then I should see reopened merge request "Bug NS-04"

45 46 47 48 49
  Scenario: I submit new unassigned merge request
    Given I click link "New Merge Request"
    And I submit new merge request "Wiki Feature"
    Then I should see merge request "Wiki Feature"

50 51 52 53 54 55 56 57 58 59 60 61
  Scenario: I download a diff on a public merge request
    Given public project "Community"
    And "John Doe" owns public project "Community"
    And project "Community" has "Bug CO-01" open merge request with diffs inside
    Given I logout directly
    And I visit merge request page "Bug CO-01"
    And I click on "Email Patches"
    Then I should see a patch diff
    And I visit merge request page "Bug CO-01"
    And I click on "Plain Diff"
    Then I should see a patch diff

62 63 64 65 66
  @javascript
  Scenario: I comment on a merge request
    Given I visit merge request page "Bug NS-04"
    And I leave a comment like "XML attached"
    Then I should see comment "XML attached"
67

68 69 70 71
  @javascript
  Scenario: I comment on a merge request diff
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    And I visit merge request page "Bug NS-05"
72
    And I click on the Changes tab
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
73
    And I leave a comment like "Line is wrong" on diff
74
    And I switch to the merge request's comments tab
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
75
    Then I should see a discussion has started on diff
76 77 78 79 80

  @javascript
  Scenario: I comment on a line of a commit in merge request
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    And I visit merge request page "Bug NS-05"
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
81 82
    And I click on the commit in the merge request
    And I leave a comment like "Line is wrong" on diff in commit
83
    And I switch to the merge request's comments tab
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
84
    Then I should see a discussion has started on commit diff
85 86 87 88 89

  @javascript
  Scenario: I comment on a commit in merge request
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    And I visit merge request page "Bug NS-05"
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
90
    And I click on the commit in the merge request
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
91
    And I leave a comment on the diff page in commit
92
    And I switch to the merge request's comments tab
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
93
    Then I should see a discussion has started on commit
94 95 96 97 98 99 100 101 102 103

  @javascript
  Scenario: I accept merge request with custom commit message
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    And merge request "Bug NS-05" is mergeable
    And I visit merge request page "Bug NS-05"
    And merge request is mergeable
    Then I modify merge commit message
    And I accept this merge request
    Then I should see merged request
104 105 106 107 108 109 110 111 112 113 114 115

  # Markdown

  Scenario: Headers inside the description should have ids generated for them.
    When I visit merge request page "Bug NS-04"
    Then Header "Description header" should have correct id and link

  @javascript
  Scenario: Headers inside comments should not have ids generated for them.
    Given I visit merge request page "Bug NS-04"
    And I leave a comment with a header containing "Comment with a header"
    Then The comment with the header should not have an ID
116 117 118 119 120 121 122

  # Toggling inline comments

  @javascript
  Scenario: I hide comments on a merge request diff with comments in a single file
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    And I visit merge request page "Bug NS-05"
123
    And I click on the Changes tab
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
124 125 126
    And I leave a comment like "Line is wrong" on line 39 of the third file
    And I click link "Hide inline discussion" of the third file
    Then I should not see a comment like "Line is wrong here" in the third file
127 128 129 130 131

  @javascript
  Scenario: I show comments on a merge request diff with comments in a single file
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    And I visit merge request page "Bug NS-05"
132
    And I click on the Changes tab
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
133 134
    And I leave a comment like "Line is wrong" on line 39 of the third file
    Then I should see a comment like "Line is wrong" in the third file
135 136 137 138 139

  @javascript
  Scenario: I hide comments on a merge request diff with comments in multiple files
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    And I visit merge request page "Bug NS-05"
140
    And I click on the Changes tab
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
141 142 143 144 145
    And I leave a comment like "Line is correct" on line 12 of the second file
    And I leave a comment like "Line is wrong" on line 39 of the third file
    And I click link "Hide inline discussion" of the third file
    Then I should not see a comment like "Line is wrong here" in the third file
    And I should still see a comment like "Line is correct" in the second file
146 147 148 149 150

  @javascript
  Scenario: I show comments on a merge request diff with comments in multiple files
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    And I visit merge request page "Bug NS-05"
151
    And I click on the Changes tab
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
152 153 154 155 156 157
    And I leave a comment like "Line is correct" on line 12 of the second file
    And I leave a comment like "Line is wrong" on line 39 of the third file
    And I click link "Hide inline discussion" of the third file
    And I click link "Show inline discussion" of the third file
    Then I should see a comment like "Line is wrong" in the third file
    And I should still see a comment like "Line is correct" in the second file
skv's avatar
skv committed
158 159 160 161 162

  @javascript
  Scenario: I unfold diff
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    And I visit merge request page "Bug NS-05"
163
    And I click on the Changes tab
skv's avatar
skv committed
164 165
    And I unfold diff
    Then I should see additional file lines
Marin Jankovski's avatar
Marin Jankovski committed
166 167 168 169 170

  @javascript
  Scenario: I show comments on a merge request side-by-side diff with comments in multiple files
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    And I visit merge request page "Bug NS-05"
171
    And I click on the Changes tab
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
172 173
    And I leave a comment like "Line is correct" on line 12 of the second file
    And I leave a comment like "Line is wrong" on line 39 of the third file
Marin Jankovski's avatar
Marin Jankovski committed
174 175
    And I click Side-by-side Diff tab
    Then I should see comments on the side-by-side diff page
176

177 178 179 180
  @javascript
  Scenario: I view diffs on a merge request
    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
    And I visit merge request page "Bug NS-05"
181
    And I click on the Changes tab
182 183
    Then I should see the proper Inline and Side-by-side links

184 185 186 187 188
  # Description preview

  @javascript
  Scenario: I can't preview without text
    Given I visit merge request page "Bug NS-04"
189
    And I click link "Edit" for the merge request
190
    And I haven't written any description text
191
    Then The Markdown preview tab should say there is nothing to do
192 193 194 195

  @javascript
  Scenario: I can preview with text
    Given I visit merge request page "Bug NS-04"
196
    And I click link "Edit" for the merge request
197 198
    And I write a description like ":+1: Nice"
    Then The Markdown preview tab should display rendered Markdown
199 200 201 202

  @javascript
  Scenario: I preview a merge request description
    Given I visit merge request page "Bug NS-04"
203
    And I click link "Edit" for the merge request
204 205 206 207 208 209 210
    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"
211
    And I click link "Edit" for the merge request
212
    And I preview a description text like "Bug fixed :smile:"
213
    Then I should see the Markdown write tab
214 215 216 217 218 219 220

  @javascript
  Scenario: I search merge request
    Given I click link "All"
    When I fill in merge request search with "Fe"
    Then I should see "Feature NS-03" in merge requests
    And I should not see "Bug NS-04" in merge requests
Valery Sizov's avatar
tests  
Valery Sizov committed
221 222 223 224 225 226 227

  @javascript
  Scenario: I can unsubscribe from merge request
    Given I visit merge request page "Bug NS-04"
    Then I should see that I am subscribed
    When I click button "Unsubscribe"
    Then I should see that I am unsubscribed
228 229 230 231 232 233 234 235

  @javascript
  Scenario: I can change the target branch
    Given I visit merge request page "Bug NS-04"
    And I click link "Edit" for the merge request
    When I click the "Target branch" dropdown
    And I select a new target branch
    Then I should see new target branch changes