diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-08 00:32:37 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-08 00:32:37 +0000 |
commit | 469a50879c1085ec77c95d650b7f135fee2c9e13 (patch) | |
tree | 0d639a63294b5abdb4e4a7bf1ed5a497d5e6869f /spec/lib | |
parent | aa5ca44f172f02f04cca448b1f9c17d6d933de40 (diff) | |
download | gitlab-ce-469a50879c1085ec77c95d650b7f135fee2c9e13.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-ee
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/database/migration_helpers_spec.rb | 11 | ||||
-rw-r--r-- | spec/lib/gitlab/kubernetes/helm/pod_spec.rb | 2 |
2 files changed, 8 insertions, 5 deletions
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 diff --git a/spec/lib/gitlab/kubernetes/helm/pod_spec.rb b/spec/lib/gitlab/kubernetes/helm/pod_spec.rb index 6d97790fc8b..e3763977add 100644 --- a/spec/lib/gitlab/kubernetes/helm/pod_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/pod_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Gitlab::Kubernetes::Helm::Pod do using RSpec::Parameterized::TableSyntax where(:helm_major_version, :expected_helm_version, :expected_command_env) do - 2 | '2.16.9' | [:TILLER_NAMESPACE] + 2 | '2.17.0' | [:TILLER_NAMESPACE] 3 | '3.2.4' | nil end |