summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-01-23 17:42:37 +0100
committerRémy Coutable <remy@rymai.me>2018-01-23 17:42:37 +0100
commitd8eb961d0b84ef35e1b856869f5ae2a880c4b84a (patch)
tree8d9d0a15e94790f52b61367d4a37a14d161e9a93
parentf74e431b44031f0be13acbe2d2748b7e03390379 (diff)
downloadgitlab-ce-42340-ci-failing-on-mergerequestdiff-commits_count.tar.gz
Fix a migration spec messing up the MergeRequestDiff DB schema42340-ci-failing-on-mergerequestdiff-commits_count
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb4
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) }