From 5879bf07e41e1cb5988dee4d6db9d486a7de3cb8 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Fri, 31 Jul 2015 13:47:51 +0300
Subject: [PATCH] fix spinach

---
 app/views/shared/issuable/_form.html.haml | 11 ++++++-----
 features/steps/project/merge_requests.rb  |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 37326e7a18..1084162b5a 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -166,11 +166,12 @@
     $(this).closest("li").remove()
     return false
   $("form.merge-request-form").submit ->
-    approver_ids = $.map $("li.project-approvers").not(".approver-template"), (li, i) ->
-      li.id.replace("user_", "")
-    approvers_input = $(this).find("input#merge_request_approver_ids")
-    approver_ids = approver_ids.concat(approvers_input.val().split(","))
-    approvers_input.val(_.compact(approver_ids).join(","))
+    if $("input#merge_request_approver_ids").length
+      approver_ids = $.map $("li.project-approvers").not(".approver-template"), (li, i) ->
+        li.id.replace("user_", "")
+      approvers_input = $(this).find("input#merge_request_approver_ids")
+      approver_ids = approver_ids.concat(approvers_input.val().split(","))
+      approvers_input.val(_.compact(approver_ids).join(","))
   $(".suggested-approvers a").click ->
     user_id = this.id.replace("user_", "")
     user_name = this.text
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 7e16ace90f..5bfe3992de 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -325,6 +325,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I click the "Target branch" dropdown' do
+    sleep 0.5
     first('.target_branch').click
   end