From 469a50879c1085ec77c95d650b7f135fee2c9e13 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 8 Jan 2021 00:32:37 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-7-stable-ee --- spec/lib/gitlab/database/migration_helpers_spec.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'spec/lib/gitlab/database') diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb index ff6e5437559..a763dc08b73 100644 --- a/spec/lib/gitlab/database/migration_helpers_spec.rb +++ b/spec/lib/gitlab/database/migration_helpers_spec.rb @@ -992,7 +992,8 @@ RSpec.describe Gitlab::Database::MigrationHelpers do temp_undo_cleanup_column, type: :string, batch_column_name: :id, - type_cast_function: nil + type_cast_function: nil, + limit: nil ).and_return(true) expect(model).to receive(:rename_column) @@ -1007,7 +1008,7 @@ RSpec.describe Gitlab::Database::MigrationHelpers do model.undo_cleanup_concurrent_column_type_change(:users, :old, :string) end - it 'passes the type_cast_function and batch_column_name' do + it 'passes the type_cast_function, batch_column_name and limit' do expect(model).to receive(:column_exists?).with(:users, :other_batch_column).and_return(true) expect(model).to receive(:check_trigger_permissions!).with(:users) @@ -1017,7 +1018,8 @@ RSpec.describe Gitlab::Database::MigrationHelpers do temp_undo_cleanup_column, type: :string, batch_column_name: :other_batch_column, - type_cast_function: :custom_type_cast_function + type_cast_function: :custom_type_cast_function, + limit: 8 ).and_return(true) expect(model).to receive(:rename_column) @@ -1034,7 +1036,8 @@ RSpec.describe Gitlab::Database::MigrationHelpers do :old, :string, type_cast_function: :custom_type_cast_function, - batch_column_name: :other_batch_column + batch_column_name: :other_batch_column, + limit: 8 ) end -- cgit v1.2.3