Skip to content

Commit 13e0da5

Browse files
c0d1ngm0nk3ynicolasbender
authored andcommitted
Fix rotate database key spec
Co-authored-by: Nicolas Bender <nicolas.bender@sap.com> Co-authored-by: Ralf Pannemans <ralf.pannemans@sap.com>
1 parent 1dfe16c commit 13e0da5

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

spec/unit/lib/cloud_controller/errands/rotate_database_key_spec.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,14 @@ def encrypted_columns(model_klass)
117117
shared_examples 'unencrypted fields' do
118118
it 'do not change their values' do
119119
entity = encrypted_models[klass]
120-
vals = entity.reload.values.except(*encrypted_columns(entity.class))
120+
string_columns_with_nil_value = entity.values.select { |_k, v| v.is_a?(String) && v.nil? }.keys
121+
vals = entity.reload.values.except(*encrypted_columns(entity.class), *string_columns_with_nil_value)
121122
expect(vals.values.all?(&:present?)).to be_truthy, "all fields of #{entity.class} need to have values"
122123

123124
RotateDatabaseKey.perform(batch_size: 1)
124125

125-
expect(entity.reload.values.except(*encrypted_columns(entity.class))).to eq(vals)
126+
expect(entity.reload.values.except(*encrypted_columns(entity.class), *string_columns_with_nil_value)).to eq(vals)
127+
expect(entity.values.select { |k, _v| string_columns_with_nil_value.include?(k) }).to be_all(&:nil?)
126128
end
127129
end
128130

0 commit comments

Comments
 (0)