From 609da852d69f2e4cbd17c24a2aacad9291bccd70 Mon Sep 17 00:00:00 2001
From: Omar Qunsul <oqunsul@gitlab.com>
Date: Thu, 5 Jan 2023 13:07:50 +0100
Subject: [PATCH] Changing ActiveRecord to ApplicationRecord in spec
Related Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/362031
Changelog: fixed
---
.rubocop_todo/database/multiple_databases.yml | 1 -
ee/spec/services/ee/merge_requests/update_service_spec.rb | 1 -
2 files changed, 2 deletions(-)
diff --git a/.rubocop_todo/database/multiple_databases.yml b/.rubocop_todo/database/multiple_databases.yml
index be91da8aad4fc..1e53f10268332 100644
--- a/.rubocop_todo/database/multiple_databases.yml
+++ b/.rubocop_todo/database/multiple_databases.yml
@@ -4,4 +4,3 @@ Database/MultipleDatabases:
- 'db/post_migrate/20210317104032_set_iteration_cadence_automatic_to_false.rb'
- 'db/post_migrate/20210811122206_update_external_project_bots.rb'
- 'db/post_migrate/20210812013042_remove_duplicate_project_authorizations.rb'
- - 'ee/spec/services/ee/merge_requests/update_service_spec.rb'
diff --git a/ee/spec/services/ee/merge_requests/update_service_spec.rb b/ee/spec/services/ee/merge_requests/update_service_spec.rb
index ebea4aa1fca96..a44eb80352b31 100644
--- a/ee/spec/services/ee/merge_requests/update_service_spec.rb
+++ b/ee/spec/services/ee/merge_requests/update_service_spec.rb
@@ -305,7 +305,6 @@ def update_merge_request(opts)
context 'when called inside an ActiveRecord transaction' do
it 'does not attempt to update code owner approval rules' do
- allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(true)
expect(::MergeRequests::SyncCodeOwnerApprovalRulesWorker).not_to receive(:perform_async)
update_merge_request(title: 'Title')
--
GitLab