Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 7 deletions

diff --git a/spec/views/shared/milestones/_issuable.html.haml_spec.rb b/spec/views/shared/milestones/_issuable.html.haml_spec.rb
index 3c2b7c6305a..6e81fec79d4 100644
--- a/spec/views/shared/milestones/_issuable.html.haml_spec.rb
+++ b/spec/views/shared/milestones/_issuable.html.haml_spec.rb
@@ -3,19 +3,38 @@
 require 'spec_helper'
 
 describe 'shared/milestones/_issuable.html.haml' do
-  let(:project) { create(:project) }
-  let(:user) { create(:user) }
-  let(:milestone) { create(:milestone, project: project) }
-  let(:issuable) { create(:issue, project: project, assignees: [user]) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:milestone) { create(:milestone, project: project) }
 
   before do
     assign(:project, project)
     assign(:milestone, milestone)
   end
 
-  it 'avatar links to issues page' do
-    render 'shared/milestones/issuable', issuable: issuable, show_project_name: true
+  subject(:rendered) { render 'shared/milestones/issuable', issuable: issuable, show_project_name: true }
 
-    expect(rendered).to have_css("a[href='#{project_issues_path(project, milestone_title: milestone.title, assignee_id: user.id, state: 'all')}']")
+  context 'issue' do
+    let(:issuable) { create(:issue, project: project, assignees: [user]) }
+
+    it 'links to the page for the issue' do
+      expect(rendered).to have_css("a[href='#{project_issue_path(project, issuable)}']", class: 'issue-link')
+    end
+
+    it 'links to issues page for user' do
+      expect(rendered).to have_css("a[href='#{project_issues_path(project, milestone_title: milestone.title, assignee_id: user.id, state: 'all')}']")
+    end
+  end
+
+  context 'merge request' do
+    let(:issuable) { create(:merge_request, source_project: project, target_project: project, assignees: [user]) }
+
+    it 'links to merge requests page for user' do
+      expect(rendered).to have_css("a[href='#{project_merge_requests_path(project, milestone_title: milestone.title, assignee_id: user.id, state: 'all')}']")
+    end
+
+    it 'links to the page for the merge request' do
+      expect(rendered).to have_css("a[href='#{project_merge_request_path(project, issuable)}']", class: 'issue-link')
+    end
   end
 end