diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 02:00:06 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 23:48:40 -0500 |
| commit | 761b2e98903aaa3fe731c8572dd8b1761c650cdc (patch) | |
| tree | a982463f3a5bca5845bfc0c7b38ea043fe29a444 /features/project | |
| parent | 1849336a221ba21f9d7c052e5cd8938499a98476 (diff) | |
| download | gitlab-ce-761b2e98903aaa3fe731c8572dd8b1761c650cdc.tar.gz | |
Port fast-foward spinach specs from EE
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/ff_merge_requests.feature | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/features/project/ff_merge_requests.feature b/features/project/ff_merge_requests.feature new file mode 100644 index 00000000000..995e52f9332 --- /dev/null +++ b/features/project/ff_merge_requests.feature @@ -0,0 +1,24 @@ +Feature: Project Ff Merge Requests + Background: + Given I sign in as a user + And I own project "Shop" + And project "Shop" have "Bug NS-05" open merge request with diffs inside + And merge request "Bug NS-05" is mergeable + + @javascript + Scenario: I do ff-only merge for rebased branch + Given ff merge enabled + And merge request "Bug NS-05" is rebased + When I visit merge request page "Bug NS-05" + Then I should see ff-only merge button + When I accept this merge request + Then I should see merged request + + @javascript + Scenario: I do ff-only merge for merged branch + Given ff merge enabled + And merge request "Bug NS-05" merged target + When I visit merge request page "Bug NS-05" + Then I should see ff-only merge button + When I accept this merge request + Then I should see merged request |