diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-05-28 18:00:37 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-05-29 04:08:08 -0700 |
| commit | 5e4384ec9bc5e015c6a5427e337d8f5412e91d1e (patch) | |
| tree | 6ebe10b61122e0128027529676df362aadaee77b /features/steps/dashboard | |
| parent | 06250eef2e12ed509b88f3770ae6d3fa4614b74d (diff) | |
| download | gitlab-ce-5e4384ec9bc5e015c6a5427e337d8f5412e91d1e.tar.gz | |
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/dashboard')
| -rw-r--r-- | features/steps/dashboard/dashboard.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb index 8508b2a8096..bb1f2f444f9 100644 --- a/features/steps/dashboard/dashboard.rb +++ b/features/steps/dashboard/dashboard.rb @@ -23,8 +23,8 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps step 'I see prefilled new Merge Request page' do current_path.should == new_namespace_project_merge_request_path(@project.namespace, @project) find("#merge_request_target_project_id").value.should == @project.id.to_s - find("#merge_request_source_branch").value.should == "fix" - find("#merge_request_target_branch").value.should == "master" + find("input#merge_request_source_branch").value.should == "fix" + find("input#merge_request_target_branch").value.should == "master" end step 'user with name "John Doe" joined project "Shop"' do |