From 86bf684f5dc95e8bd2445f088f862d0a0539922a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 8 May 2014 16:30:39 +0300 Subject: [PATCH] Minor UI improvements and fixed test --- app/views/projects/merge_requests/_new_compare.html.haml | 6 +++--- app/views/projects/merge_requests/_new_submit.html.haml | 2 +- features/steps/project/merge_requests.rb | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml index 47b8e5c..6f6f54c 100644 --- a/app/views/projects/merge_requests/_new_compare.html.haml +++ b/app/views/projects/merge_requests/_new_compare.html.haml @@ -1,4 +1,4 @@ -%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") diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index e6e0db5..b5479be 100644 --- a/app/views/projects/merge_requests/_new_submit.html.haml +++ b/app/views/projects/merge_requests/_new_submit.html.haml @@ -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 diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index f42eb63..e0aec69 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -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 -- libgit2 0.21.2