Commit 83647361 authored by Alex Kalderimis's avatar Alex Kalderimis

Rename external wiki service association

Renames project association from external_wiki_service to
external_wiki_integration
parent 19b47867
...@@ -168,7 +168,7 @@ class Project < ApplicationRecord ...@@ -168,7 +168,7 @@ class Project < ApplicationRecord
has_one :drone_ci_integration, class_name: 'Integrations::DroneCi' has_one :drone_ci_integration, class_name: 'Integrations::DroneCi'
has_one :emails_on_push_integration, class_name: 'Integrations::EmailsOnPush' has_one :emails_on_push_integration, class_name: 'Integrations::EmailsOnPush'
has_one :ewm_integration, class_name: 'Integrations::Ewm' has_one :ewm_integration, class_name: 'Integrations::Ewm'
has_one :external_wiki_service, class_name: 'Integrations::ExternalWiki' has_one :external_wiki_integration, class_name: 'Integrations::ExternalWiki'
has_one :flowdock_service, class_name: 'Integrations::Flowdock' has_one :flowdock_service, class_name: 'Integrations::Flowdock'
has_one :hangouts_chat_service, class_name: 'Integrations::HangoutsChat' has_one :hangouts_chat_service, class_name: 'Integrations::HangoutsChat'
has_one :irker_service, class_name: 'Integrations::Irker' has_one :irker_service, class_name: 'Integrations::Irker'
......
...@@ -127,7 +127,7 @@ FactoryBot.define do ...@@ -127,7 +127,7 @@ FactoryBot.define do
end end
end end
factory :external_wiki_service, class: 'Integrations::ExternalWiki' do factory :external_wiki_integration, class: 'Integrations::ExternalWiki' do
project project
type { 'ExternalWikiService' } type { 'ExternalWikiService' }
active { true } active { true }
......
...@@ -392,7 +392,7 @@ project: ...@@ -392,7 +392,7 @@ project:
- custom_issue_tracker_integration - custom_issue_tracker_integration
- bugzilla_integration - bugzilla_integration
- ewm_integration - ewm_integration
- external_wiki_service - external_wiki_integration
- mock_ci_service - mock_ci_service
- mock_monitoring_service - mock_monitoring_service
- forked_to_members - forked_to_members
......
...@@ -19,7 +19,7 @@ RSpec.describe Sidebars::Projects::Menus::ExternalWikiMenu do ...@@ -19,7 +19,7 @@ RSpec.describe Sidebars::Projects::Menus::ExternalWikiMenu do
end end
context 'when active external issue tracker' do context 'when active external issue tracker' do
let(:external_wiki) { build(:external_wiki_service, project: project) } let(:external_wiki) { build(:external_wiki_integration, project: project) }
context 'is present' do context 'is present' do
it 'returns true' do it 'returns true' do
......
...@@ -66,7 +66,7 @@ RSpec.describe Project, factory_default: :keep do ...@@ -66,7 +66,7 @@ RSpec.describe Project, factory_default: :keep do
it { is_expected.to have_one(:custom_issue_tracker_integration) } it { is_expected.to have_one(:custom_issue_tracker_integration) }
it { is_expected.to have_one(:bugzilla_integration) } it { is_expected.to have_one(:bugzilla_integration) }
it { is_expected.to have_one(:ewm_integration) } it { is_expected.to have_one(:ewm_integration) }
it { is_expected.to have_one(:external_wiki_service) } it { is_expected.to have_one(:external_wiki_integration) }
it { is_expected.to have_one(:confluence_integration) } it { is_expected.to have_one(:confluence_integration) }
it { is_expected.to have_one(:project_feature) } it { is_expected.to have_one(:project_feature) }
it { is_expected.to have_one(:project_repository) } it { is_expected.to have_one(:project_repository) }
......
...@@ -1061,7 +1061,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do ...@@ -1061,7 +1061,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
let(:service_status) { true } let(:service_status) { true }
before do before do
project.create_external_wiki_service(active: service_status, properties: properties) project.create_external_wiki_integration(active: service_status, properties: properties)
project.reload project.reload
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