Merge branch…

Merge branch '42074-rspec-spec-lib-gitlab-background_migration-deserialize_merge_request_diffs_and_commits_spec-rb-spec-services-system_note_service_spec-rb-fails' into 'master' Resolve "rspec spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb spec/services/system_note_service_spec.rb fails" Closes #42074 See merge request gitlab-org/gitlab-ce!16487

Merge branch…
0504f37d · Rémy Coutable · 05cedf5b · 9fd6440d · 0504f37d
Commit 0504f37d authored Jan 16, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

deserialize_merge_request_diffs_and_commits_spec.rb ...ation/deserialize_merge_request_diffs_and_commits_spec.rb +4 -0

No files found.
--- a/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb
+++ b/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb
@@ -15,6 +15,10 @@ describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :t
        .to receive(:commits_count=).and_return(nil)
    end

+    after do
+      [Project, MergeRequest, MergeRequestDiff].each(&:reset_column_information)
+    end
+
    def diffs_to_hashes(diffs)
      diffs.as_json(only: Gitlab::Git::Diff::SERIALIZE_KEYS).map(&:with_indifferent_access)
    end