diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-16 11:57:48 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-16 11:57:48 +0000 |
| commit | 0504f37dbde11e38dd2a08a4c87a3e9974bb59c7 (patch) | |
| tree | 4ef21265e8af74cd05ed6bb8fd8686c9e7e88c3e | |
| parent | 05cedf5b1a1c93e1dd72e28f0e1cb1f530f54510 (diff) | |
| parent | 9fd6440d4af73c8568ef377032d7416b125a53a2 (diff) | |
| download | gitlab-ce-0504f37dbde11e38dd2a08a4c87a3e9974bb59c7.tar.gz | |
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
| -rw-r--r-- | spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git 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 index 98730602863..d21183b668b 100644 --- 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 |