features/project/ff_merge_requests.feature


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
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