diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-05-29 04:00:37 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-05-29 14:08:08 +0300 |
| commit | 5e4384ec9bc5e015c6a5427e337d8f5412e91d1e (patch) | |
| tree | 6ebe10b61122e0128027529676df362aadaee77b /features/steps/project/merge_requests.rb | |
| parent | 06250eef2e12ed509b88f3770ae6d3fa4614b74d (diff) | |
Support editing target branch of merge request
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
Diffstat (limited to 'features/steps/project/merge_requests.rb')
| -rw-r--r-- | features/steps/project/merge_requests.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 48bb316e203..4ca7cf5e5fe 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -305,6 +305,20 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps fill_in 'issue_search', with: "Fe" end + step 'I click the "Target branch" dropdown' do + first('.target_branch').click + end + + step 'I select a new target branch' do + select "feature", from: "merge_request_target_branch" + click_button 'Save' + end + + step 'I should see new target branch changes' do + page.should have_content 'From fix into feature' + page.should have_content 'Target branch changed from master to feature' + end + def merge_request @merge_request ||= MergeRequest.find_by!(title: "Bug NS-05") end |