diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /spec/models/integrations/flowdock_spec.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'spec/models/integrations/flowdock_spec.rb')
-rw-r--r-- | spec/models/integrations/flowdock_spec.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/spec/models/integrations/flowdock_spec.rb b/spec/models/integrations/flowdock_spec.rb index 189831fa32d..daafb1b3958 100644 --- a/spec/models/integrations/flowdock_spec.rb +++ b/spec/models/integrations/flowdock_spec.rb @@ -3,13 +3,8 @@ require 'spec_helper' RSpec.describe Integrations::Flowdock do - describe "Associations" do - it { is_expected.to belong_to :project } - it { is_expected.to have_one :service_hook } - end - describe 'Validations' do - context 'when service is active' do + context 'when integration is active' do before do subject.active = true end @@ -17,7 +12,7 @@ RSpec.describe Integrations::Flowdock do it { is_expected.to validate_presence_of(:token) } end - context 'when service is inactive' do + context 'when integration is inactive' do before do subject.active = false end @@ -38,7 +33,6 @@ RSpec.describe Integrations::Flowdock do allow(flowdock_integration).to receive_messages( project_id: project.id, project: project, - service_hook: true, token: 'verySecret' ) WebMock.stub_request(:post, api_url) |