Merge branch '330300-ajk-uwy' into 'master'

Rename project integration associations: UWY [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!64434

app/models/integration.rb

@@ -54,6 +54,9 @@ class Integration < ApplicationRecord
     redmine
     slack slack_slash_commands
     teamcity
+    unify_circuit
+    webex_teams
+    youtrack
   ].to_set.freeze
 
   def self.renamed?(name)

app/models/project.rb

@@ -188,9 +188,9 @@ class Project < ApplicationRecord
   has_one :slack_integration, class_name: 'Integrations::Slack'
   has_one :slack_slash_commands_integration, class_name: 'Integrations::SlackSlashCommands'
   has_one :teamcity_integration, class_name: 'Integrations::Teamcity'
-  has_one :unify_circuit_service, class_name: 'Integrations::UnifyCircuit'
-  has_one :webex_teams_service, class_name: 'Integrations::WebexTeams'
-  has_one :youtrack_service, class_name: 'Integrations::Youtrack'
+  has_one :unify_circuit_integration, class_name: 'Integrations::UnifyCircuit'
+  has_one :webex_teams_integration, class_name: 'Integrations::WebexTeams'
+  has_one :youtrack_integration, class_name: 'Integrations::Youtrack'
 
   has_one :root_of_fork_network,
           foreign_key: 'root_project_id',

spec/factories/integrations.rb

@@ -97,7 +97,7 @@ FactoryBot.define do
     issue_tracker
   end
 
-  factory :youtrack_service, class: 'Integrations::Youtrack' do
+  factory :youtrack_integration, class: 'Integrations::Youtrack' do
     project
     active { true }
     issue_tracker

spec/factories/projects.rb

@@ -402,7 +402,7 @@ FactoryBot.define do
   factory :youtrack_project, parent: :project do
     has_external_issue_tracker { true }
 
-    youtrack_service
+    youtrack_integration
   end
 
   factory :jira_project, parent: :project do

spec/lib/banzai/filter/references/external_issue_reference_filter_spec.rb

@@ -140,7 +140,9 @@ RSpec.describe Banzai::Filter::References::ExternalIssueReferenceFilter do
   end
 
   context "youtrack project" do
-    let_it_be(:service) { create(:youtrack_service, project: project) }
+    before_all do
+      create(:youtrack_integration, project: project)
+    end
 
     before do
       project.update!(issues_enabled: false)

spec/lib/gitlab/import_export/all_models.yml

@@ -381,14 +381,14 @@ project:
 - microsoft_teams_integration
 - mattermost_integration
 - hangouts_chat_integration
-- unify_circuit_service
+- unify_circuit_integration
 - buildkite_integration
 - bamboo_integration
 - teamcity_integration
 - pushover_integration
 - jira_integration
 - redmine_integration
-- youtrack_service
+- youtrack_integration
 - custom_issue_tracker_integration
 - bugzilla_integration
 - ewm_integration
@@ -557,7 +557,7 @@ project:
 - alert_management_alerts
 - repository_storage_moves
 - freeze_periods
-- webex_teams_service
+- webex_teams_integration
 - build_report_results
 - vulnerability_statistic
 - vulnerability_historical_statistics

spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb

@@ -26,11 +26,11 @@ RSpec.describe MigrateIssueTrackersData do
     services.create!(type: 'BugzillaService', properties: properties, category: 'issue_tracker')
   end
 
-  let!(:youtrack_service) do
+  let!(:youtrack_integration) do
     services.create!(type: 'YoutrackService', properties: properties, category: 'issue_tracker')
   end
 
-  let!(:youtrack_service_empty) do
+  let!(:youtrack_integration_empty) do
     services.create!(type: 'YoutrackService', properties: '', category: 'issue_tracker')
   end
 
@@ -56,7 +56,7 @@ RSpec.describe MigrateIssueTrackersData do
         migrate!
 
         expect(migration_name).to be_scheduled_delayed_migration(3.minutes, jira_integration.id, bugzilla_integration.id)
-        expect(migration_name).to be_scheduled_delayed_migration(6.minutes, youtrack_service.id, gitlab_service.id)
+        expect(migration_name).to be_scheduled_delayed_migration(6.minutes, youtrack_integration.id, gitlab_service.id)
         expect(BackgroundMigrationWorker.jobs.size).to eq(2)
       end
     end

spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb

@@ -26,11 +26,11 @@ RSpec.describe RescheduleMigrateIssueTrackersData do
     services.create!(id: 12, type: 'BugzillaService', properties: properties, category: 'issue_tracker')
   end
 
-  let!(:youtrack_service) do
+  let!(:youtrack_integration) do
     services.create!(id: 13, type: 'YoutrackService', properties: properties, category: 'issue_tracker')
   end
 
-  let!(:youtrack_service_empty) do
+  let!(:youtrack_integration_empty) do
     services.create!(id: 14, type: 'YoutrackService', properties: '', category: 'issue_tracker')
   end
 
@@ -57,7 +57,7 @@ RSpec.describe RescheduleMigrateIssueTrackersData do
           migrate!
 
           expect(migration_name).to be_scheduled_delayed_migration(3.minutes, jira_integration.id, bugzilla_integration.id)
-          expect(migration_name).to be_scheduled_delayed_migration(6.minutes, youtrack_service.id, gitlab_service.id)
+          expect(migration_name).to be_scheduled_delayed_migration(6.minutes, youtrack_integration.id, gitlab_service.id)
           expect(BackgroundMigrationWorker.jobs.size).to eq(2)
         end
       end

spec/models/project_spec.rb

@@ -39,8 +39,8 @@ RSpec.describe Project, factory_default: :keep do
     it { is_expected.to have_one(:microsoft_teams_integration) }
     it { is_expected.to have_one(:mattermost_integration) }
     it { is_expected.to have_one(:hangouts_chat_integration) }
-    it { is_expected.to have_one(:unify_circuit_service) }
-    it { is_expected.to have_one(:webex_teams_service) }
+    it { is_expected.to have_one(:unify_circuit_integration) }
+    it { is_expected.to have_one(:webex_teams_integration) }
     it { is_expected.to have_one(:packagist_integration) }
     it { is_expected.to have_one(:pushover_integration) }
     it { is_expected.to have_one(:asana_integration) }
@@ -62,7 +62,7 @@ RSpec.describe Project, factory_default: :keep do
     it { is_expected.to have_one(:teamcity_integration) }
     it { is_expected.to have_one(:jira_integration) }
     it { is_expected.to have_one(:redmine_integration) }
-    it { is_expected.to have_one(:youtrack_service) }
+    it { is_expected.to have_one(:youtrack_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(:ewm_integration) }