diff options
author | Serdar Sutay <serdar@opscode.com> | 2014-10-20 15:51:34 -0700 |
---|---|---|
committer | Serdar Sutay <serdar@opscode.com> | 2014-10-20 15:51:34 -0700 |
commit | 2fcc10204cc6317b5e9303467ff8afe5e520aa00 (patch) | |
tree | 075f1f808e32e1a5cbcb0d0f1cb47e5e5ed52551 /spec/unit | |
parent | ad6c5532a8faa9e96624d7e6cf74aae587e90fe0 (diff) | |
parent | bad674c731f2243c8f9d9250c19e0afaa956df1f (diff) | |
download | chef-2fcc10204cc6317b5e9303467ff8afe5e520aa00.tar.gz |
Merge pull request #2263 from opscode/sersut/chef-rc-fixes
Misc RC spec fixes that we ran into in CI.
Diffstat (limited to 'spec/unit')
-rw-r--r-- | spec/unit/encrypted_data_bag_item/check_encrypted_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/encrypted_data_bag_item_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/unit/encrypted_data_bag_item/check_encrypted_spec.rb b/spec/unit/encrypted_data_bag_item/check_encrypted_spec.rb index 1da5efb36e..1e2b2a85e8 100644 --- a/spec/unit/encrypted_data_bag_item/check_encrypted_spec.rb +++ b/spec/unit/encrypted_data_bag_item/check_encrypted_spec.rb @@ -83,7 +83,7 @@ describe Chef::EncryptedDataBagItem::CheckEncrypted do end end - context "when encryption version is 3", :ruby_20_only do + context "when encryption version is 3", :aes_256_gcm_only, :ruby_20_only do include_examples "encryption detected" do let(:version) { 3 } let(:encryptor) { Chef::EncryptedDataBagItem::Encryptor::Version3Encryptor } diff --git a/spec/unit/encrypted_data_bag_item_spec.rb b/spec/unit/encrypted_data_bag_item_spec.rb index 9335889ef3..499fabdcf9 100644 --- a/spec/unit/encrypted_data_bag_item_spec.rb +++ b/spec/unit/encrypted_data_bag_item_spec.rb @@ -97,7 +97,7 @@ describe Chef::EncryptedDataBagItem::Encryptor do Chef::Config[:data_bag_encrypt_version] = 3 end - context "on supported platforms", :ruby_gte_20_and_openssl_gte_101 do + context "on supported platforms", :aes_256_gcm_only, :ruby_20_only do it "creates a version 3 encryptor" do encryptor.should be_a_instance_of(Chef::EncryptedDataBagItem::Encryptor::Version3Encryptor) @@ -182,7 +182,7 @@ describe Chef::EncryptedDataBagItem::Decryptor do context "when decrypting a version 3 (JSON+aes-256-gcm+random iv+auth tag) encrypted value" do - context "on supported platforms", :ruby_gte_20_and_openssl_gte_101 do + context "on supported platforms", :aes_256_gcm_only, :ruby_20_only do let(:encrypted_value) do Chef::EncryptedDataBagItem::Encryptor::Version3Encryptor.new(plaintext_data, encryption_key).for_encrypted_item |