BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 9fd6440d by Sean McGivern
Options

Prevent background migration spec from polluting later models

If the schema changes after 20171114162227 for any of these models, and specs after this one use factories, then those factories will use the models with outdated column information cached. We shouldn't really use factories in migration specs, but this is a special case because there is a lot of git-related setup code in the model that would be painful to copy to the migration. Instead, we just manually reset the column information for the models we could pollute.
parent 7951acfd
Showing with 4 additions and 0 deletions
spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb
...@@ -15,6 +15,10 @@ describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :t ...@@ -15,6 +15,10 @@ describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :t
.to receive(:commits_count=).and_return(nil) .to receive(:commits_count=).and_return(nil)
end end
after do
[Project, MergeRequest, MergeRequestDiff].each(&:reset_column_information)
end
def diffs_to_hashes(diffs) def diffs_to_hashes(diffs)
diffs.as_json(only: Gitlab::Git::Diff::SERIALIZE_KEYS).map(&:with_indifferent_access) diffs.as_json(only: Gitlab::Git::Diff::SERIALIZE_KEYS).map(&:with_indifferent_access)
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment