summaryrefslogtreecommitdiff
path: root/spec/migrations
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-11-15 05:19:07 -0800
committerMichael Kozono <mkozono@gmail.com>2017-12-01 15:26:41 -0800
commit87529ce5823036d4b9dd9ca412643befc8e490c3 (patch)
treef6c93c6f7f46eb46a5548a5dc90a56e267ff3492 /spec/migrations
parent10c660be007406533e48d5e3c6485ecf210e051b (diff)
downloadgitlab-ce-87529ce5823036d4b9dd9ca412643befc8e490c3.tar.gz
Move temp table creation into the prepare job
* Hopefully fixes spec failures in which the table doesn’t exist * Decouples the background migration from the post-deploy migration, e.g. we could easily run it again even though the table is dropped when finished.
Diffstat (limited to 'spec/migrations')
-rw-r--r--spec/migrations/track_untracked_uploads_spec.rb34
1 files changed, 3 insertions, 31 deletions
diff --git a/spec/migrations/track_untracked_uploads_spec.rb b/spec/migrations/track_untracked_uploads_spec.rb
index 5632c81f231..11824bebb91 100644
--- a/spec/migrations/track_untracked_uploads_spec.rb
+++ b/spec/migrations/track_untracked_uploads_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
require Rails.root.join('db', 'post_migrate', '20171103140253_track_untracked_uploads')
-describe TrackUntrackedUploads, :migration, :sidekiq, :temp_table_may_drop do
+describe TrackUntrackedUploads, :migration, :sidekiq do
include TrackUntrackedUploadsHelpers
let(:untracked_files_for_uploads) { table(:untracked_files_for_uploads) }
@@ -18,41 +18,13 @@ describe TrackUntrackedUploads, :migration, :sidekiq, :temp_table_may_drop do
end
end
- context 'before running the background migration' do
- around do |example|
- # Especially important so the follow-up migration does not get run
- Sidekiq::Testing.fake! do
- example.run
- end
- end
-
- it 'correctly schedules the follow-up background migration' do
+ it 'correctly schedules the follow-up background migration' do
+ Sidekiq::Testing.fake! do
migrate!
expect(described_class::MIGRATION).to be_scheduled_migration
expect(BackgroundMigrationWorker.jobs.size).to eq(1)
end
-
- it 'ensures the untracked_files_for_uploads table exists' do
- expect do
- migrate!
- end.to change { table_exists?(:untracked_files_for_uploads) }.from(false).to(true)
- end
-
- it 'has a path field long enough for really long paths' do
- migrate!
-
- component = 'a' * 255
-
- long_path = [
- 'uploads',
- component, # project.full_path
- component # filename
- ].flatten.join('/')
-
- record = untracked_files_for_uploads.create!(path: long_path)
- expect(record.reload.path.size).to eq(519)
- end
end
context 'with tracked and untracked uploads' do