diff options
| author | Pierre de La Morinerie <pierre@capitainetrain.com> | 2016-02-04 19:23:58 +0100 |
|---|---|---|
| committer | Pierre de La Morinerie <pierre@capitainetrain.com> | 2016-03-03 15:11:44 +0100 |
| commit | 543845f7efe0b70926ea699eaf1e413fa878b285 (patch) | |
| tree | f37858135e9ce5ac7c5bd7e4aad685582c363686 /features/project | |
| parent | 566ea8543d971c4b811b2939b0677c5db52feab3 (diff) | |
| download | gitlab-ce-543845f7efe0b70926ea699eaf1e413fa878b285.tar.gz | |
Indicate how much an MR branch diverges from the target branch
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/merge_requests.feature | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 495f25f28e7..a69089f00c4 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -26,6 +26,16 @@ Feature: Project Merge Requests When I visit project "Shop" merge requests page Then I should see "other_branch" branch + Scenario: I should not see the numbers of diverged commits if the branch is rebased on the target + Given project "Shop" have "Bug NS-07" open merge request with rebased branch + When I visit merge request page "Bug NS-07" + Then I should not see the diverged commits count + + Scenario: I should see the numbers of diverged commits if the branch diverged from the target + Given project "Shop" have "Bug NS-08" open merge request with diverged branch + When I visit merge request page "Bug NS-08" + Then I should see the diverged commits count + Scenario: I should see rejected merge requests Given I click link "Closed" Then I should see "Feature NS-03" in merge requests |