Commit 50941ea7 authored by Alex Kalderimis's avatar Alex Kalderimis

Rename pipelines_email_integration association

Rename project association from pipelines_email_service to
pipelines_email_integration.
parent c388ca88
...@@ -48,7 +48,7 @@ class Integration < ApplicationRecord ...@@ -48,7 +48,7 @@ class Integration < ApplicationRecord
flowdock flowdock
hangouts_chat hangouts_chat
irker irker
packagist packagist pipelines_email
].to_set.freeze ].to_set.freeze
def self.renamed?(name) def self.renamed?(name)
......
...@@ -179,7 +179,7 @@ class Project < ApplicationRecord ...@@ -179,7 +179,7 @@ class Project < ApplicationRecord
has_one :microsoft_teams_service, class_name: 'Integrations::MicrosoftTeams' has_one :microsoft_teams_service, class_name: 'Integrations::MicrosoftTeams'
has_one :mock_ci_service, class_name: 'Integrations::MockCi' has_one :mock_ci_service, class_name: 'Integrations::MockCi'
has_one :packagist_integration, class_name: 'Integrations::Packagist' has_one :packagist_integration, class_name: 'Integrations::Packagist'
has_one :pipelines_email_service, class_name: 'Integrations::PipelinesEmail' has_one :pipelines_email_integration, class_name: 'Integrations::PipelinesEmail'
has_one :pivotaltracker_service, class_name: 'Integrations::Pivotaltracker' has_one :pivotaltracker_service, class_name: 'Integrations::Pivotaltracker'
has_one :pushover_service, class_name: 'Integrations::Pushover' has_one :pushover_service, class_name: 'Integrations::Pushover'
has_one :redmine_service, class_name: 'Integrations::Redmine' has_one :redmine_service, class_name: 'Integrations::Redmine'
......
...@@ -173,7 +173,7 @@ FactoryBot.define do ...@@ -173,7 +173,7 @@ FactoryBot.define do
type { 'SlackSlashCommandsService' } type { 'SlackSlashCommandsService' }
end end
factory :pipelines_email_service, class: 'Integrations::PipelinesEmail' do factory :pipelines_email_integration, class: 'Integrations::PipelinesEmail' do
project project
active { true } active { true }
type { 'PipelinesEmailService' } type { 'PipelinesEmailService' }
......
...@@ -367,7 +367,7 @@ project: ...@@ -367,7 +367,7 @@ project:
- discord_integration - discord_integration
- drone_ci_integration - drone_ci_integration
- emails_on_push_integration - emails_on_push_integration
- pipelines_email_service - pipelines_email_integration
- mattermost_slash_commands_service - mattermost_slash_commands_service
- slack_slash_commands_service - slack_slash_commands_service
- irker_integration - irker_integration
......
...@@ -2854,7 +2854,7 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do ...@@ -2854,7 +2854,7 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do
end end
it 'builds hook data once' do it 'builds hook data once' do
create(:pipelines_email_service) create(:pipelines_email_integration)
expect(Gitlab::DataBuilder::Pipeline).to receive(:build).once.and_call_original expect(Gitlab::DataBuilder::Pipeline).to receive(:build).once.and_call_original
......
...@@ -50,7 +50,7 @@ RSpec.describe Project, factory_default: :keep do ...@@ -50,7 +50,7 @@ RSpec.describe Project, factory_default: :keep do
it { is_expected.to have_one(:discord_integration) } it { is_expected.to have_one(:discord_integration) }
it { is_expected.to have_one(:drone_ci_integration) } it { is_expected.to have_one(:drone_ci_integration) }
it { is_expected.to have_one(:emails_on_push_integration) } it { is_expected.to have_one(:emails_on_push_integration) }
it { is_expected.to have_one(:pipelines_email_service) } it { is_expected.to have_one(:pipelines_email_integration) }
it { is_expected.to have_one(:irker_integration) } it { is_expected.to have_one(:irker_integration) }
it { is_expected.to have_one(:pivotaltracker_service) } it { is_expected.to have_one(:pivotaltracker_service) }
it { is_expected.to have_one(:flowdock_integration) } it { is_expected.to have_one(:flowdock_integration) }
......
...@@ -23,8 +23,8 @@ RSpec.describe Integrations::Test::ProjectService do ...@@ -23,8 +23,8 @@ RSpec.describe Integrations::Test::ProjectService do
expect(subject).to eq(success_result) expect(subject).to eq(success_result)
end end
context 'PipelinesEmailService' do context 'with Integrations::PipelinesEmail' do
let(:integration) { create(:pipelines_email_service, project: project) } let(:integration) { create(:pipelines_email_integration, project: project) }
it_behaves_like 'tests for integration with pipeline data' it_behaves_like 'tests for integration with pipeline data'
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment