Commit 39ecce05 authored by Phil Hughes's avatar Phil Hughes

Build fix

parent 017ed4ae
...@@ -257,3 +257,7 @@ ...@@ -257,3 +257,7 @@
width: auto; width: auto;
} }
} }
.merge-request-form .select2-container {
width: 250px!important;
}
require 'spec_helper' 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(:user) { create(:user) }
let(:project) { create(:project, :public) } let(:project) { create(:project, :public) }
...@@ -13,9 +13,12 @@ feature 'Create New Merge Request', feature: true, js: false do ...@@ -13,9 +13,12 @@ feature 'Create New Merge Request', feature: true, js: false do
it 'generates a diff for an orphaned branch' do it 'generates a diff for an orphaned branch' do
click_link 'New Merge Request' 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_button "Compare branches"
click_link "Changes"
expect(page).to have_content "README.md" expect(page).to have_content "README.md"
expect(page).to have_content "wm.png" expect(page).to have_content "wm.png"
...@@ -23,6 +26,8 @@ feature 'Create New Merge Request', feature: true, js: false do ...@@ -23,6 +26,8 @@ feature 'Create New Merge Request', feature: true, js: false do
fill_in "merge_request_title", with: "Orphaned MR test" fill_in "merge_request_title", with: "Orphaned MR test"
click_button "Submit merge request" click_button "Submit merge request"
click_link "Check out branch"
expect(page).to have_content 'git checkout -b orphaned-branch origin/orphaned-branch' expect(page).to have_content 'git checkout -b orphaned-branch origin/orphaned-branch'
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment