Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 1 deletions

diff --git a/spec/models/integrations/campfire_spec.rb b/spec/models/integrations/campfire_spec.rb
index ae923cd38fc..afb0d180673 100644
--- a/spec/models/integrations/campfire_spec.rb
+++ b/spec/models/integrations/campfire_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Integrations::Campfire do
+RSpec.describe Integrations::Campfire, feature_category: :integrations do
   include StubRequests
 
   it_behaves_like Integrations::ResetSecretFields do
@@ -88,4 +88,14 @@ RSpec.describe Integrations::Campfire do
       expect(WebMock).not_to have_requested(:post, '*/room/.*/speak.json')
     end
   end
+
+  describe '#log_error' do
+    subject { described_class.new.log_error('error') }
+
+    it 'logs an error' do
+      expect(Gitlab::IntegrationsLogger).to receive(:error).with(anything).and_call_original
+
+      is_expected.to be_truthy
+    end
+  end
 end