1 files changed, 9 insertions, 10 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index dde918e3d41..3b4a8edf976 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -1,4 +1,5 @@
 class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
+  include Select2Helper
   include SharedAuthentication
   include SharedIssuable
   include SharedProject
@@ -34,7 +35,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I click link "Merged"' do
-    find('#state-merged').trigger('click')
+    find('#state-merged').click
   end
 
   step 'I click link "Closed"' do
@@ -327,13 +328,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       find('.more-actions').click
       find('.more-actions .dropdown-menu li', match: :first)
 
-      find('.js-note-delete').click
+      accept_confirm { find('.js-note-delete').click }
     end
   end
 
   step 'I click on the Discussion tab' do
     page.within '.merge-request-tabs' do
-      find('.notes-tab').trigger('click')
+      find('.notes-tab').click
     end
 
     # Waits for load
@@ -353,8 +354,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I should see a discussion by user "John Doe" has started on diff' do
-    # Trigger a refresh of notes
-    execute_script("$(document).trigger('visibilitychange');")
     wait_for_requests
     page.within(".notes .discussion") do
       page.should have_content "#{user_exists("John Doe").name} #{user_exists("John Doe").to_reference} started a discussion"
@@ -417,7 +416,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I click link "Reopen"' do
-    first(:css, '.reopen-mr-link').trigger('click')
+    all(:css, '.reopen-mr-link').last.click
   end
 
   step 'I should see reopened merge request "Bug NS-04"' do
@@ -429,13 +428,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I click link "Hide inline discussion" of the third file' do
     page.within '.files>div:nth-child(3)' do
-      find('.js-toggle-diff-comments').trigger('click')
+      find('.js-toggle-diff-comments').click
     end
   end
 
   step 'I click link "Show inline discussion" of the third file' do
     page.within '.files>div:nth-child(3)' do
-      find('.js-toggle-diff-comments').trigger('click')
+      find('.js-toggle-diff-comments').click
     end
   end
 
@@ -507,7 +506,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I click Side-by-side Diff tab' do
-    find('a', text: 'Side-by-side').trigger('click')
+    find('a', text: 'Side-by-side').click
 
     # Waits for load
     expect(page).to have_css('.parallel')
@@ -533,7 +532,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I select a new target branch' do
-    select "feature", from: "merge_request_target_branch"
+    capybara_select2('feature_conflict')
     click_button 'Save'
   end