Merge branch '42340-ci-failing-on-mergerequestdiff-commits_count' into 'master'

Resolve "CI failing on MergeRequestDiff#commits_count="

Closes #42340

See merge request gitlab-org/gitlab-ce!16653

1 files changed, 4 insertions, 0 deletions

diff --git a/spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb b/spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb
index e99257e3481..4cdb679c97f 100644
--- a/spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb
+++ b/spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb
@@ -7,6 +7,10 @@ describe Gitlab::BackgroundMigration::PopulateMergeRequestMetricsWithEventsData,
       .to receive(:commits_count=).and_return(nil)
   end
 
+  after do
+    [MergeRequest, MergeRequestDiff].each(&:reset_column_information)
+  end
+
   describe '#perform' do
     let(:mr_with_event) { create(:merge_request) }
     let!(:merged_event) { create(:event, :merged, target: mr_with_event) }