diff options
author | Phil Hughes <me@iamphill.com> | 2016-04-06 16:25:38 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-04-06 16:25:38 +0100 |
commit | 39ecce05c7c3b5d8054b4deb61028695872acc9e (patch) | |
tree | 4089cd8a2da718e414d424f9b46afdd7ec2cc7ef | |
parent | 017ed4ae37474ba43cbf4f4ee7c12d8aeec70598 (diff) | |
download | gitlab-ce-39ecce05c7c3b5d8054b4deb61028695872acc9e.tar.gz |
Build fix
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 | ||||
-rw-r--r-- | spec/features/merge_requests/create_new_mr_spec.rb | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 1790fbaaa11..4269afe4c50 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -257,3 +257,7 @@ width: auto; } } + +.merge-request-form .select2-container { + width: 250px!important; +} diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb index fd02d584848..00b60bd0e75 100644 --- a/spec/features/merge_requests/create_new_mr_spec.rb +++ b/spec/features/merge_requests/create_new_mr_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Create New Merge Request', feature: true, js: false do +feature 'Create New Merge Request', feature: true, js: true do let(:user) { create(:user) } let(:project) { create(:project, :public) } @@ -13,9 +13,12 @@ feature 'Create New Merge Request', feature: true, js: false do it 'generates a diff for an orphaned branch' do click_link 'New Merge Request' - select "orphaned-branch", from: "merge_request_source_branch" - select "master", from: "merge_request_target_branch" + + first('.js-source-branch').click + first('.dropdown-source-branch .dropdown-content a', text: 'orphaned-branch').click + click_button "Compare branches" + click_link "Changes" expect(page).to have_content "README.md" expect(page).to have_content "wm.png" @@ -23,6 +26,8 @@ feature 'Create New Merge Request', feature: true, js: false do fill_in "merge_request_title", with: "Orphaned MR test" click_button "Submit merge request" + click_link "Check out branch" + expect(page).to have_content 'git checkout -b orphaned-branch origin/orphaned-branch' end end |