Unverified Commit 86bf684f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Minor UI improvements and fixed test


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent bbf5fc125664
%h3.page-title Compare changes for new merge request
%h3.page-title Compare branches for new Merge Request
%hr
= form_for [@project, @merge_request], url: new_project_merge_request_path(@project), method: :get, html: { class: "merge-request-form form-inline" } do |f|
......@@ -45,8 +45,8 @@
%span.label-branch #{@merge_request.target_branch}
are the same.
.form-actions
= f.submit 'Compare branches', class: "btn btn-primary"
%hr
= f.submit 'Compare branches', class: "btn btn-primary"
:javascript
var source_branch = $("#merge_request_source_branch")
......
......@@ -51,7 +51,7 @@
= f.hidden_field :target_project_id
= f.hidden_field :target_branch
= f.hidden_field :source_branch
= f.submit 'Submit a merge request', class: "btn btn-create"
= f.submit 'Submit merge request', class: "btn btn-create"
.mr-compare
%div.ui-box
......
......@@ -61,9 +61,10 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I submit new merge request "Wiki Feature"' do
fill_in "merge_request_title", with: "Wiki Feature"
select "master", from: "merge_request_source_branch"
select "notes_refactoring", from: "merge_request_target_branch"
click_button "Compare branches"
fill_in "merge_request_title", with: "Wiki Feature"
click_button "Submit merge request"
end
......
Supports Markdown
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