diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-05-22 22:55:50 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-05-22 22:55:50 +0300 |
| commit | d24710705ce4f0a263fa88c6e66e69b915ec6931 (patch) | |
| tree | 571b082d75519747252f38b15f801c25b775a002 /spec | |
| parent | 27cff7db3efa6c1987103ae8f93e40036206925d (diff) | |
| parent | 0007e5bde3fdb87982f16eaf530ae0ea7d90f512 (diff) | |
Merge branch 'mr-11396-conflicts' into '9-2-stable'
Fix conflicts for !11396 while picking in 9.2 stable
See merge request !11529
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/database/migration_helpers_spec.rb | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb index 737fac14f92..dfa3ae9142e 100644 --- a/spec/lib/gitlab/database/migration_helpers_spec.rb +++ b/spec/lib/gitlab/database/migration_helpers_spec.rb @@ -382,13 +382,16 @@ describe Gitlab::Database::MigrationHelpers, lib: true do expect(model).to receive(:add_column). with(:users, :new, :integer, limit: old_column.limit, - default: old_column.default, - null: old_column.null, precision: old_column.precision, scale: old_column.scale) + expect(model).to receive(:change_column_default). + with(:users, :new, old_column.default) + expect(model).to receive(:update_column_in_batches) + expect(model).to receive(:change_column_null).with(:users, :new, false) + expect(model).to receive(:copy_indexes).with(:users, :old, :new) expect(model).to receive(:copy_foreign_keys).with(:users, :old, :new) @@ -406,13 +409,16 @@ describe Gitlab::Database::MigrationHelpers, lib: true do expect(model).to receive(:add_column). with(:users, :new, :integer, limit: old_column.limit, - default: old_column.default, - null: old_column.null, precision: old_column.precision, scale: old_column.scale) + expect(model).to receive(:change_column_default). + with(:users, :new, old_column.default) + expect(model).to receive(:update_column_in_batches) + expect(model).to receive(:change_column_null).with(:users, :new, false) + expect(model).to receive(:copy_indexes).with(:users, :old, :new) expect(model).to receive(:copy_foreign_keys).with(:users, :old, :new) |