Merge branch 'master' into snake-casesnake-case

4 files changed, 8 insertions, 8 deletions

diff --git a/spec/features/merge_request/user_awards_emoji_spec.rb b/spec/features/merge_request/user_awards_emoji_spec.rb
index 15a0878fb16..2f24cfbd9e3 100644
--- a/spec/features/merge_request/user_awards_emoji_spec.rb
+++ b/spec/features/merge_request/user_awards_emoji_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe 'Merge request > User awards emoji', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
-  let(:merge_request) { create(:merge_request, source_project: project) }
+  let(:merge_request) { create(:merge_request, source_project: project, author: create(:user)) }
 
   describe 'logged in' do
     before do
diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb
index 61861d33952..19995559fae 100644
--- a/spec/features/merge_request/user_resolves_conflicts_spec.rb
+++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb
@@ -100,12 +100,12 @@ describe 'Merge request > User resolves conflicts', :js do
       end
 
       it 'shows a link to the conflict resolution page' do
-        expect(page).to have_link('conflicts', href: /\/conflicts\Z/)
+        expect(page).to have_link('conflicts', href: %r{/conflicts\Z})
       end
 
       context 'in Inline view mode' do
         before do
-          click_link('conflicts', href: /\/conflicts\Z/)
+          click_link('conflicts', href: %r{/conflicts\Z})
         end
 
         include_examples "conflicts are resolved in Interactive mode"
@@ -114,7 +114,7 @@ describe 'Merge request > User resolves conflicts', :js do
 
       context 'in Parallel view mode' do
         before do
-          click_link('conflicts', href: /\/conflicts\Z/)
+          click_link('conflicts', href: %r{/conflicts\Z})
           click_button 'Side-by-side'
         end
 
@@ -128,7 +128,7 @@ describe 'Merge request > User resolves conflicts', :js do
 
       before do
         visit project_merge_request_path(project, merge_request)
-        click_link('conflicts', href: /\/conflicts\Z/)
+        click_link('conflicts', href: %r{/conflicts\Z})
       end
 
       it 'conflicts can not be resolved in Interactive mode' do
@@ -181,7 +181,7 @@ describe 'Merge request > User resolves conflicts', :js do
       end
 
       it 'does not show a link to the conflict resolution page' do
-        expect(page).not_to have_link('conflicts', href: /\/conflicts\Z/)
+        expect(page).not_to have_link('conflicts', href: %r{/conflicts\Z})
       end
 
       it 'shows an error if the conflicts page is visited directly' do
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
index 590210d44ef..3e83a549682 100644
--- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
+++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
@@ -108,7 +108,7 @@ describe 'Merge request > User resolves diff notes and discussions', :js do
           it 'shows resolved discussion when toggled' do
             find(".timeline-content .discussion[data-discussion-id='#{note.discussion_id}'] .discussion-toggle-button").click
 
-            expect(page.find(".timeline-content #note_#{note.noteable_id}")).to be_visible
+            expect(page.find(".timeline-content #note_#{note.id}")).to be_visible
           end
         end
 
diff --git a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
index fb73ab05f87..dbca279569a 100644
--- a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
+++ b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
@@ -61,7 +61,7 @@ describe 'Merge request > User selects branches for new MR', :js do
     fill_in "merge_request_title", with: "Orphaned MR test"
     click_button "Submit merge request"
 
-    click_link "Check out branch"
+    click_button "Check out branch"
 
     expect(page).to have_content 'git checkout -b orphaned-branch origin/orphaned-branch'
   end