diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/models/integrations/campfire_spec.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/models/integrations/campfire_spec.rb')
-rw-r--r-- | spec/models/integrations/campfire_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/integrations/campfire_spec.rb b/spec/models/integrations/campfire_spec.rb index b23edf03e8a..d68f8e0bd4e 100644 --- a/spec/models/integrations/campfire_spec.rb +++ b/spec/models/integrations/campfire_spec.rb @@ -33,8 +33,8 @@ RSpec.describe Integrations::Campfire do let(:project) { create(:project, :repository) } before do - @campfire_service = described_class.new - allow(@campfire_service).to receive_messages( + @campfire_integration = described_class.new + allow(@campfire_integration).to receive_messages( project_id: project.id, project: project, service_hook: true, @@ -62,7 +62,7 @@ RSpec.describe Integrations::Campfire do speak_url = 'https://project-name.campfirenow.com/room/123/speak.json' stub_full_request(speak_url, method: :post).with(basic_auth: @auth) - @campfire_service.execute(@sample_data) + @campfire_integration.execute(@sample_data) expect(WebMock).to have_requested(:get, stubbed_hostname(@rooms_url)).once expect(WebMock).to have_requested(:post, stubbed_hostname(speak_url)) @@ -78,7 +78,7 @@ RSpec.describe Integrations::Campfire do headers: @headers ) - @campfire_service.execute(@sample_data) + @campfire_integration.execute(@sample_data) expect(WebMock).to have_requested(:get, 'https://8.8.8.9/rooms.json').once expect(WebMock).not_to have_requested(:post, '*/room/.*/speak.json') |