1 files changed, 46 insertions, 17 deletions
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 04f685aab37..cff4eb398bf 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -576,6 +576,25 @@ describe Gitlab::Database::MigrationHelpers do
 
         model.rename_column_concurrently(:users, :old, :new)
       end
+
+      context 'when default is false' do
+        let(:old_column) do
+          double(:column,
+               type: :boolean,
+               limit: nil,
+               default: false,
+               null: false,
+               precision: nil,
+               scale: nil)
+        end
+
+        it 'copies the default to the new column' do
+          expect(model).to receive(:change_column_default)
+            .with(:users, :new, old_column.default)
+
+          model.rename_column_concurrently(:users, :old, :new)
+        end
+      end
     end
   end
 
@@ -610,13 +629,13 @@ describe Gitlab::Database::MigrationHelpers do
       it 'raises RuntimeError' do
         allow(model).to receive(:transaction_open?).and_return(true)
 
-        expect { model.undo_cleanup_concurrent_column_rename(:users, :old, :new, :integer) }
+        expect { model.undo_cleanup_concurrent_column_rename(:users, :old, :new) }
           .to raise_error(RuntimeError)
       end
     end
 
     context 'outside a transaction' do
-      let(:old_column) do
+      let(:new_column) do
         double(:column,
               type: :integer,
               limit: 8,
@@ -630,6 +649,7 @@ describe Gitlab::Database::MigrationHelpers do
 
       before do
         allow(model).to receive(:transaction_open?).and_return(false)
+        allow(model).to receive(:column_for).and_return(new_column)
       end
 
       it 'reverses the operations of cleanup_concurrent_column_rename' do
@@ -640,12 +660,12 @@ describe Gitlab::Database::MigrationHelpers do
 
         expect(model).to receive(:add_column)
           .with(:users, :old, :integer,
-              limit: old_column.limit,
-              precision: old_column.precision,
-              scale: old_column.scale)
+              limit: new_column.limit,
+              precision: new_column.precision,
+              scale: new_column.scale)
 
         expect(model).to receive(:change_column_default)
-          .with(:users, :old, old_column.default)
+          .with(:users, :old, new_column.default)
 
         expect(model).to receive(:update_column_in_batches)
 
@@ -654,17 +674,26 @@ describe Gitlab::Database::MigrationHelpers do
         expect(model).to receive(:copy_indexes).with(:users, :new, :old)
         expect(model).to receive(:copy_foreign_keys).with(:users, :new, :old)
 
-        model.undo_cleanup_concurrent_column_rename(
-          :users,
-          :old,
-          :new,
-          :integer,
-          limit: old_column.limit,
-          default: old_column.default,
-          null: old_column.null,
-          precision: old_column.precision,
-          scale: old_column.scale
-        )
+        model.undo_cleanup_concurrent_column_rename(:users, :old, :new)
+      end
+
+      context 'when default is false' do
+        let(:new_column) do
+          double(:column,
+               type: :boolean,
+               limit: nil,
+               default: false,
+               null: false,
+               precision: nil,
+               scale: nil)
+        end
+
+        it 'copies the default to the old column' do
+          expect(model).to receive(:change_column_default)
+            .with(:users, :old, new_column.default)
+
+          model.undo_cleanup_concurrent_column_rename(:users, :old, :new)
+        end
       end
     end
   end