Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master'

Fix quick submit missing in edit merge request page

closes #14953 

![fix](/uploads/5b80b37330929514c81299b4c8fe3efb/fix.gif)

See merge request !3601
This commit is contained in:
Jacob Schatz 2016-04-12 17:15:52 +00:00
commit e1838980c6
2 changed files with 22 additions and 1 deletions

View File

@ -1,4 +1,4 @@
= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form js-requires-input' } do |f|
= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form js-requires-input js-quick-submit' } do |f|
= render 'shared/issuable/form', f: f, issuable: @merge_request
:javascript

View File

@ -0,0 +1,21 @@
require 'spec_helper'
feature 'Edit Merge Request', feature: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:merge_request) { create(:merge_request, :with_diffs, source_project: project) }
before do
project.team << [user, :master]
login_as user
visit edit_namespace_project_merge_request_path(project.namespace, project, merge_request)
end
context 'editing a MR' do
it 'form should have class js-quick-submit' do
expect(page).to have_selector('.js-quick-submit')
end
end
end