From 5bb421ecbbfdf4658c8e3bfb05dc86a84c7e4725 Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Tue, 6 Mar 2018 15:20:20 +0100 Subject: Cleanup after adding MR diff's commit_count (try 2) * processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method --- .../import_export/test_project_export.tar.gz | Bin 341299 -> 343091 bytes spec/fixtures/exported-project.gz | Bin 2306 -> 2560 bytes ...re_commits_count_for_merge_request_diff_spec.rb | 32 +++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb (limited to 'spec') diff --git a/spec/features/projects/import_export/test_project_export.tar.gz b/spec/features/projects/import_export/test_project_export.tar.gz index ecb7651acad..72ab2d71f35 100644 Binary files a/spec/features/projects/import_export/test_project_export.tar.gz and b/spec/features/projects/import_export/test_project_export.tar.gz differ diff --git a/spec/fixtures/exported-project.gz b/spec/fixtures/exported-project.gz index 352384f16c8..bef7e2ff8ee 100644 Binary files a/spec/fixtures/exported-project.gz and b/spec/fixtures/exported-project.gz differ diff --git a/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb b/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb new file mode 100644 index 00000000000..b8c3a3eda4e --- /dev/null +++ b/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb @@ -0,0 +1,32 @@ +require 'spec_helper' +require Rails.root.join('db', 'migrate', '20180425131009_assure_commits_count_for_merge_request_diff.rb') + +describe AssureCommitsCountForMergeRequestDiff, :migration, :sidekiq, :redis do + let(:migration) { spy('migration') } + + before do + allow(Gitlab::BackgroundMigration::AddMergeRequestDiffCommitsCount) + .to receive(:new).and_return(migration) + end + + context 'when there are still unmigrated commit_counts afterwards' do + let(:namespaces) { table('namespaces') } + let(:projects) { table('projects') } + let(:merge_requests) { table('merge_requests') } + let(:diffs) { table('merge_request_diffs') } + + before do + namespace = namespaces.create(name: 'foo', path: 'foo') + project = projects.create!(namespace_id: namespace.id) + merge_request = merge_requests.create!(source_branch: 'x', target_branch: 'y', target_project_id: project.id) + diffs.create!(commits_count: nil, merge_request_id: merge_request.id) + diffs.create!(commits_count: nil, merge_request_id: merge_request.id) + end + + it 'migrates commit_counts sequentially in batches' do + migrate! + + expect(migration).to have_received(:perform).once + end + end +end -- cgit v1.2.3