diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:22 +0000 |
commit | 286fe61013674fe2d245ffc8d2233baf09923e70 (patch) | |
tree | 2037291f5863105e54e75be056b49f7d62007cae /spec/models/concerns | |
parent | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (diff) | |
download | gitlab-ce-286fe61013674fe2d245ffc8d2233baf09923e70.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/concerns')
-rw-r--r-- | spec/models/concerns/bulk_insert_safe_spec.rb | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/spec/models/concerns/bulk_insert_safe_spec.rb b/spec/models/concerns/bulk_insert_safe_spec.rb index 9ebaedcf252..4969327132a 100644 --- a/spec/models/concerns/bulk_insert_safe_spec.rb +++ b/spec/models/concerns/bulk_insert_safe_spec.rb @@ -6,7 +6,19 @@ describe BulkInsertSafe do class BulkInsertItem < ApplicationRecord include BulkInsertSafe - validates :name, presence: true + validates :name, :enum_value, :secret_value, presence: true + + ENUM_VALUES = { + case_1: 1 + }.freeze + + enum enum_value: ENUM_VALUES + + attr_encrypted :secret_value, + mode: :per_attribute_iv, + algorithm: 'aes-256-gcm', + key: Settings.attr_encrypted_db_key_base_32, + insecure_mode: false end module InheritedUnsafeMethods @@ -29,8 +41,13 @@ describe BulkInsertSafe do ActiveRecord::Schema.define do create_table :bulk_insert_items, force: true do |t| t.string :name, null: true + t.integer :enum_value, null: false + t.text :encrypted_secret_value, null: false + t.string :encrypted_secret_value_iv, null: false end end + + BulkInsertItem.reset_column_information end after(:all) do @@ -41,13 +58,21 @@ describe BulkInsertSafe do def build_valid_items_for_bulk_insertion Array.new(10) do |n| - BulkInsertItem.new(name: "item-#{n}") + BulkInsertItem.new( + name: "item-#{n}", + enum_value: 'case_1', + secret_value: "my-secret" + ) end end def build_invalid_items_for_bulk_insertion Array.new(10) do - BulkInsertItem.new # requires `name` to be set + BulkInsertItem.new( + name: nil, # requires `name` to be set + enum_value: 'case_1', + secret_value: "my-secret" + ) end end |