1 files changed, 10 insertions, 16 deletions

diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
index 994a1ff4f75..38cbb5a1d66 100644
--- a/spec/helpers/issues_helper_spec.rb
+++ b/spec/helpers/issues_helper_spec.rb
@@ -3,21 +3,11 @@
 require 'spec_helper'
 
 RSpec.describe IssuesHelper do
+  include Features::MergeRequestHelpers
+
   let_it_be(:project) { create(:project) }
   let_it_be_with_reload(:issue) { create(:issue, project: project) }
 
-  describe '#work_item_type_icon' do
-    it 'returns icon of all standard base types' do
-      WorkItems::Type.base_types.each do |type|
-        expect(work_item_type_icon(type[0])).to eq "issue-type-#{type[0].to_s.dasherize}"
-      end
-    end
-
-    it 'defaults to issue icon if type is unknown' do
-      expect(work_item_type_icon('invalid')).to eq 'issue-type-issue'
-    end
-  end
-
   describe '#award_user_list' do
     it 'returns a comma-separated list of the first X users' do
       user = build_stubbed(:user, name: 'Joe')
@@ -228,8 +218,8 @@ RSpec.describe IssuesHelper do
     let!(:new_issue) { create(:issue, author: User.support_bot, project: project2) }
 
     before do
-      allow(Gitlab::IncomingEmail).to receive(:enabled?) { true }
-      allow(Gitlab::IncomingEmail).to receive(:supports_wildcard?) { true }
+      allow(Gitlab::Email::IncomingEmail).to receive(:enabled?) { true }
+      allow(Gitlab::Email::IncomingEmail).to receive(:supports_wildcard?) { true }
 
       old_issue.update!(moved_to: new_issue)
     end
@@ -247,10 +237,13 @@ RSpec.describe IssuesHelper do
 
   describe '#issue_header_actions_data' do
     let(:current_user) { create(:user) }
+    let(:merge_request) { create(:merge_request, :opened, source_project: project, author: current_user) }
+    let(:issuable_sidebar_issue) { serialize_issuable_sidebar(current_user, project, merge_request) }
 
     before do
       allow(helper).to receive(:current_user).and_return(current_user)
       allow(helper).to receive(:can?).and_return(true)
+      allow(helper).to receive(:issuable_sidebar).and_return(issuable_sidebar_issue)
     end
 
     it 'returns expected result' do
@@ -269,10 +262,11 @@ RSpec.describe IssuesHelper do
         report_abuse_path: add_category_abuse_reports_path,
         reported_user_id: issue.author.id,
         reported_from_url: issue_url(issue),
-        submit_as_spam_path: mark_as_spam_project_issue_path(project, issue)
+        submit_as_spam_path: mark_as_spam_project_issue_path(project, issue),
+        issuable_email_address: issuable_sidebar_issue[:create_note_email]
       }
 
-      expect(helper.issue_header_actions_data(project, issue, current_user)).to include(expected)
+      expect(helper.issue_header_actions_data(project, issue, current_user, issuable_sidebar_issue)).to include(expected)
     end
   end