Add latest changes from gitlab-org/gitlab@master

10 files changed, 69 insertions, 8 deletions

diff --git a/spec/models/alert_management/alert_assignee_spec.rb b/spec/models/alert_management/alert_assignee_spec.rb
index c50a3ec0d01..647195380b3 100644
--- a/spec/models/alert_management/alert_assignee_spec.rb
+++ b/spec/models/alert_management/alert_assignee_spec.rb
@@ -5,7 +5,11 @@ require 'spec_helper'
 RSpec.describe AlertManagement::AlertAssignee do
   describe 'associations' do
     it { is_expected.to belong_to(:alert) }
-    it { is_expected.to belong_to(:assignee) }
+
+    it do
+      is_expected.to belong_to(:assignee).class_name('User')
+        .with_foreign_key(:user_id).inverse_of(:alert_assignees)
+    end
   end
 
   describe 'validations' do
diff --git a/spec/models/alert_management/alert_spec.rb b/spec/models/alert_management/alert_spec.rb
index 685ed81ec84..ff77ca2ab64 100644
--- a/spec/models/alert_management/alert_spec.rb
+++ b/spec/models/alert_management/alert_spec.rb
@@ -16,9 +16,13 @@ RSpec.describe AlertManagement::Alert do
     it { is_expected.to belong_to(:prometheus_alert).optional }
     it { is_expected.to belong_to(:environment).optional }
     it { is_expected.to have_many(:assignees).through(:alert_assignees) }
-    it { is_expected.to have_many(:notes) }
-    it { is_expected.to have_many(:ordered_notes) }
-    it { is_expected.to have_many(:user_mentions) }
+    it { is_expected.to have_many(:notes).inverse_of(:noteable) }
+    it { is_expected.to have_many(:ordered_notes).class_name('Note').inverse_of(:noteable) }
+
+    it do
+      is_expected.to have_many(:user_mentions).class_name('AlertManagement::AlertUserMention')
+        .with_foreign_key(:alert_management_alert_id).inverse_of(:alert)
+    end
   end
 
   describe 'validations' do
diff --git a/spec/models/alert_management/alert_user_mention_spec.rb b/spec/models/alert_management/alert_user_mention_spec.rb
index 27c3d290dde..083bf667bea 100644
--- a/spec/models/alert_management/alert_user_mention_spec.rb
+++ b/spec/models/alert_management/alert_user_mention_spec.rb
@@ -4,7 +4,11 @@ require 'spec_helper'
 
 RSpec.describe AlertManagement::AlertUserMention do
   describe 'associations' do
-    it { is_expected.to belong_to(:alert_management_alert) }
+    it do
+      is_expected.to belong_to(:alert).class_name('::AlertManagement::Alert')
+        .with_foreign_key(:alert_management_alert_id).inverse_of(:user_mentions)
+    end
+
     it { is_expected.to belong_to(:note) }
   end
 
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 8de9932a519..de5753bd4e2 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -25,6 +25,20 @@ RSpec.describe ApplicationSetting, feature_category: :not_owned, type: :model do
     it { expect(setting.kroki_formats).to eq({}) }
   end
 
+  describe 'associations' do
+    it do
+      is_expected.to belong_to(:self_monitoring_project).class_name('Project')
+        .with_foreign_key(:instance_administration_project_id)
+        .inverse_of(:application_setting)
+    end
+
+    it do
+      is_expected.to belong_to(:instance_group).class_name('Group')
+        .with_foreign_key(:instance_administrators_group_id)
+        .inverse_of(:application_setting)
+    end
+  end
+
   describe 'validations' do
     let(:http)  { 'http://example.com' }
     let(:https) { 'https://example.com' }
diff --git a/spec/models/audit_event_spec.rb b/spec/models/audit_event_spec.rb
index 9f2724cebee..9e667836b45 100644
--- a/spec/models/audit_event_spec.rb
+++ b/spec/models/audit_event_spec.rb
@@ -3,6 +3,10 @@
 require 'spec_helper'
 
 RSpec.describe AuditEvent do
+  describe 'associations' do
+    it { is_expected.to belong_to(:user).with_foreign_key(:author_id).inverse_of(:audit_events) }
+  end
+
   describe 'validations' do
     include_examples 'validates IP address' do
       let(:attribute) { :ip_address }
diff --git a/spec/models/board_spec.rb b/spec/models/board_spec.rb
index 6017298e85b..f469dee5ba1 100644
--- a/spec/models/board_spec.rb
+++ b/spec/models/board_spec.rb
@@ -8,7 +8,13 @@ RSpec.describe Board do
 
   describe 'relationships' do
     it { is_expected.to belong_to(:project) }
-    it { is_expected.to have_many(:lists).order(list_type: :asc, position: :asc).dependent(:delete_all) }
+
+    it do
+      is_expected.to have_many(:lists).order(list_type: :asc, position: :asc).dependent(:delete_all)
+        .inverse_of(:board)
+    end
+
+    it { is_expected.to have_many(:destroyable_lists).order(list_type: :asc, position: :asc).inverse_of(:board) }
   end
 
   describe 'validations' do
diff --git a/spec/models/bulk_imports/entity_spec.rb b/spec/models/bulk_imports/entity_spec.rb
index 2cb72e74979..db123c00cf6 100644
--- a/spec/models/bulk_imports/entity_spec.rb
+++ b/spec/models/bulk_imports/entity_spec.rb
@@ -6,8 +6,13 @@ RSpec.describe BulkImports::Entity, type: :model, feature_category: :importers d
   describe 'associations' do
     it { is_expected.to belong_to(:bulk_import).required }
     it { is_expected.to belong_to(:parent) }
-    it { is_expected.to belong_to(:group) }
+    it { is_expected.to belong_to(:group).optional.with_foreign_key(:namespace_id).inverse_of(:bulk_import_entities) }
     it { is_expected.to belong_to(:project) }
+
+    it do
+      is_expected.to have_many(:trackers).class_name('BulkImports::Tracker')
+        .with_foreign_key(:bulk_import_entity_id).inverse_of(:entity)
+    end
   end
 
   describe 'validations' do
diff --git a/spec/models/bulk_imports/tracker_spec.rb b/spec/models/bulk_imports/tracker_spec.rb
index 1516ab106cb..a618a12df6b 100644
--- a/spec/models/bulk_imports/tracker_spec.rb
+++ b/spec/models/bulk_imports/tracker_spec.rb
@@ -4,7 +4,10 @@ require 'spec_helper'
 
 RSpec.describe BulkImports::Tracker, type: :model do
   describe 'associations' do
-    it { is_expected.to belong_to(:entity).required }
+    it do
+      is_expected.to belong_to(:entity).required.class_name('BulkImports::Entity')
+        .with_foreign_key(:bulk_import_entity_id).inverse_of(:trackers)
+    end
   end
 
   describe 'validations' do
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 0a05c558d45..882a1f73a03 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -40,7 +40,19 @@ RSpec.describe Group, feature_category: :subgroups do
     it { is_expected.to have_many(:debian_distributions).class_name('Packages::Debian::GroupDistribution').dependent(:destroy) }
     it { is_expected.to have_many(:daily_build_group_report_results).class_name('Ci::DailyBuildGroupReportResult') }
     it { is_expected.to have_many(:group_callouts).class_name('Users::GroupCallout').with_foreign_key(:group_id) }
+
+    it do
+      is_expected.to have_many(:application_setting)
+        .with_foreign_key(:instance_administrators_group_id).inverse_of(:instance_group)
+    end
+
     it { is_expected.to have_many(:bulk_import_exports).class_name('BulkImports::Export') }
+
+    it do
+      is_expected.to have_many(:bulk_import_entities).class_name('BulkImports::Entity')
+        .with_foreign_key(:namespace_id).inverse_of(:group)
+    end
+
     it { is_expected.to have_many(:contacts).class_name('CustomerRelations::Contact') }
     it { is_expected.to have_many(:organizations).class_name('CustomerRelations::Organization') }
     it { is_expected.to have_many(:protected_branches).inverse_of(:group).with_foreign_key(:namespace_id) }
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 360aee8b531..3040fea4178 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -174,6 +174,11 @@ RSpec.describe User, feature_category: :user_profile do
     it { is_expected.to have_many(:revoked_user_achievements).class_name('Achievements::UserAchievement').with_foreign_key('revoked_by_user_id').inverse_of(:revoked_by_user) }
     it { is_expected.to have_many(:achievements).through(:user_achievements).class_name('Achievements::Achievement').inverse_of(:users) }
     it { is_expected.to have_many(:namespace_commit_emails).class_name('Users::NamespaceCommitEmail') }
+    it { is_expected.to have_many(:audit_events).with_foreign_key(:author_id).inverse_of(:user) }
+
+    it do
+      is_expected.to have_many(:alert_assignees).class_name('::AlertManagement::AlertAssignee').inverse_of(:assignee)
+    end
 
     describe 'default values' do
       let(:user) { described_class.new }