Fix spec failures

spec/lib/gitlab/import_export/safe_model_attributes.yml

@@ -23,6 +23,7 @@ Issue:
 - weight
 - time_estimate
 - relative_position
+- service_desk_reply_to
 Event:
 - id
 - target_type

spec/models/ee/project_spec.rb

@@ -117,6 +117,11 @@ describe Project, models: true do
   end
 
   describe '#regenerate_service_desk_key' do
+    before do
+      allow_any_instance_of(License).to receive(:add_on?).and_call_original
+      allow_any_instance_of(License).to receive(:add_on?).with('GitLab_ServiceDesk') { true }
+    end
+
     subject { create(:project) }
 
     it 'leaves it blank by default' do

spec/services/ee/notification_service_spec.rb

@@ -3,8 +3,16 @@ require 'spec_helper'
 describe EE::NotificationService do
   let(:subject) { NotificationService.new }
 
+  before do
+    allow(Notify).to receive(:service_desk_new_note_email)
+      .with(kind_of(Integer), kind_of(Integer)).and_return(double(deliver_later: true))
+
+    allow_any_instance_of(License).to receive(:add_on?).and_call_original
+    allow_any_instance_of(License).to receive(:add_on?).with('GitLab_ServiceDesk') { true }
+  end
+
   def should_email!
-    expect(Notify).to receive(:service_desk_new_note_email).with(issue.id, instance_of(Integer))
+    expect(Notify).to receive(:service_desk_new_note_email).with(issue.id, kind_of(Integer))
   end
 
   def should_not_email!
@@ -55,7 +63,7 @@ describe EE::NotificationService do
 
     context 'when the license doesn\'t allow service desk' do
       before do
-        expect(Gitlab::EE::ServiceDesk).to receive(:enabled?).and_return(false)
+        expect(EE::Gitlab::ServiceDesk).to receive(:enabled?).and_return(false)
       end
 
       it_should_not_email!