From 0dbf2df341f6d71218c927e2d5f4ac5cf67794be Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Thu, 7 Apr 2016 16:42:01 +0100
Subject: [PATCH 1/3] fix quick submit missing in edit merge request page

---
 app/views/projects/merge_requests/_form.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 3e4ab09c6d4..1e6724fc92b 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -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

From 451314df964455577e08f653cc17d70fedf3f49b Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Thu, 7 Apr 2016 20:51:16 +0100
Subject: [PATCH 2/3] add test

---
 spec/features/merge_requests/edit_mr_spec.rb | 27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 spec/features/merge_requests/edit_mr_spec.rb

diff --git a/spec/features/merge_requests/edit_mr_spec.rb b/spec/features/merge_requests/edit_mr_spec.rb
new file mode 100644
index 00000000000..27f7bca2af0
--- /dev/null
+++ b/spec/features/merge_requests/edit_mr_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+feature 'Create New 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', js: true do
+    it 'should be able submit with quick_submit' do
+      fill_in "merge_request_title", with: "Orphaned MR test"
+
+      keypress = "var e = $.Event('keydown', { keyCode: 13, ctrlKey: true }); $('.merge-request-form').trigger(e);"
+      page.driver.execute_script(keypress)
+      sleep 2
+
+      expect(find('h2.title')).to have_text('Orphaned MR test')
+    end
+  end
+end
\ No newline at end of file

From 400a1ae04d28388e7dfbd7c03db857d58a7d8776 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Thu, 7 Apr 2016 23:44:59 +0100
Subject: [PATCH 3/3] add some changes to the test

---
 spec/features/merge_requests/edit_mr_spec.rb | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/spec/features/merge_requests/edit_mr_spec.rb b/spec/features/merge_requests/edit_mr_spec.rb
index 27f7bca2af0..9e007ab7635 100644
--- a/spec/features/merge_requests/edit_mr_spec.rb
+++ b/spec/features/merge_requests/edit_mr_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Create New Merge Request', feature: true do
+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) }
@@ -13,15 +13,9 @@ feature 'Create New Merge Request', feature: true do
     visit edit_namespace_project_merge_request_path(project.namespace, project, merge_request)
   end
 
-  context 'editing a MR', js: true do
-    it 'should be able submit with quick_submit' do
-      fill_in "merge_request_title", with: "Orphaned MR test"
-
-      keypress = "var e = $.Event('keydown', { keyCode: 13, ctrlKey: true }); $('.merge-request-form').trigger(e);"
-      page.driver.execute_script(keypress)
-      sleep 2
-
-      expect(find('h2.title')).to have_text('Orphaned MR test')
+  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
\ No newline at end of file
+end