Drop temporary tracking table when finished

1 files changed, 42 insertions, 42 deletions

diff --git a/spec/migrations/track_untracked_uploads_spec.rb b/spec/migrations/track_untracked_uploads_spec.rb
index a6e880279b6..a17251ba052 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 do
+describe TrackUntrackedUploads, :migration, :sidekiq, :temp_table_may_drop do
   include TrackUntrackedUploadsHelpers
 
   let(:untracked_files_for_uploads) { table(:untracked_files_for_uploads) }
@@ -18,34 +18,41 @@ describe TrackUntrackedUploads, :migration, :sidekiq do
     end
   end
 
-  it 'correctly schedules the follow-up background migration' do
-    Sidekiq::Testing.fake! do
+  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
       migrate!
 
       expect(described_class::MIGRATION).to be_scheduled_migration
       expect(BackgroundMigrationWorker.jobs.size).to eq(1)
     end
-  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 '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!
+    it 'has a path field long enough for really long paths' do
+      migrate!
 
-    component = 'a'*255
+      component = 'a'*255
 
-    long_path = [
-      'uploads',
-      component, # project.full_path
-      component  # filename
-    ].flatten.join('/')
+      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)
+      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
@@ -77,36 +84,29 @@ describe TrackUntrackedUploads, :migration, :sidekiq do
     end
 
     it 'tracks untracked uploads' do
-      Sidekiq::Testing.inline! do
-        expect do
-          migrate!
-        end.to change { uploads.count }.from(4).to(8)
-
-        expect(appearance.reload.uploads.where("path like '%/header_logo/%'").first.attributes).to include(@appearance_header_logo_attributes)
-        expect(user2.reload.uploads.first.attributes).to include(@user2_avatar_attributes)
-        expect(project2.reload.uploads.first.attributes).to include(@project2_avatar_attributes)
-        expect(project2.uploads.last.attributes).to include(@project2_markdown_attributes)
-      end
+      expect do
+        migrate!
+      end.to change { uploads.count }.from(4).to(8)
+
+      expect(appearance.reload.uploads.where("path like '%/header_logo/%'").first.attributes).to include(@appearance_header_logo_attributes)
+      expect(user2.reload.uploads.first.attributes).to include(@user2_avatar_attributes)
+      expect(project2.reload.uploads.first.attributes).to include(@project2_avatar_attributes)
+      expect(project2.uploads.last.attributes).to include(@project2_markdown_attributes)
     end
 
     it 'ignores already-tracked uploads' do
-      Sidekiq::Testing.inline! do
-        migrate!
+      migrate!
 
-        expect(appearance.reload.uploads.where("path like '%/logo/%'").first.attributes).to include(@appearance_logo_attributes)
-        expect(user1.reload.uploads.first.attributes).to include(@user1_avatar_attributes)
-        expect(project1.reload.uploads.first.attributes).to include(@project1_avatar_attributes)
-        expect(project1.uploads.last.attributes).to include(@project1_markdown_attributes)
-      end
+      expect(appearance.reload.uploads.where("path like '%/logo/%'").first.attributes).to include(@appearance_logo_attributes)
+      expect(user1.reload.uploads.first.attributes).to include(@user1_avatar_attributes)
+      expect(project1.reload.uploads.first.attributes).to include(@project1_avatar_attributes)
+      expect(project1.uploads.last.attributes).to include(@project1_markdown_attributes)
     end
 
-    it 'all untracked_files_for_uploads records are marked as tracked' do
-      Sidekiq::Testing.inline! do
-        migrate!
+    it 'the temporary table untracked_files_for_uploads no longer exists' do
+      migrate!
 
-        expect(untracked_files_for_uploads.count).to eq(8)
-        expect(untracked_files_for_uploads.count).to eq(untracked_files_for_uploads.where(tracked: true).count)
-      end
+      expect(table_exists?(:untracked_files_for_uploads)).to be_falsey
     end
   end
 end