summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2016-01-27 12:45:43 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2016-01-27 12:45:43 -0800
commitf3cefaf6b84bf0771f31418f497cc903d80a62db (patch)
tree5e274f89e66df79f5d0266fc2ae4e7dc2fa91a41 /spec
parentec52ff63496d3256fd75886d925687208a88fd0e (diff)
parent75f453a1d7f4adf15d9a52579ac74901dfa26d6b (diff)
downloadchef-f3cefaf6b84bf0771f31418f497cc903d80a62db.tar.gz
Merge pull request #4472 from chef/jdm/fix-fips-filter
Fix inverted filter logic for not_fips rspec filter
Diffstat (limited to 'spec')
-rw-r--r--spec/spec_helper.rb2
-rw-r--r--spec/unit/encrypted_data_bag_item_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 34716e5fd8..f85369b6a6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -169,7 +169,7 @@ RSpec.configure do |config|
config.filter_run_excluding :aes_256_gcm_only => true unless aes_256_gcm?
config.filter_run_excluding :broken => true
config.filter_run_excluding :not_wpar => true unless wpar?
- config.filter_run_excluding :not_fips => true unless fips?
+ config.filter_run_excluding :not_supported_under_fips => true if fips?
running_platform_arch = `uname -m`.strip unless windows?
diff --git a/spec/unit/encrypted_data_bag_item_spec.rb b/spec/unit/encrypted_data_bag_item_spec.rb
index ee69ecfddc..55c8692781 100644
--- a/spec/unit/encrypted_data_bag_item_spec.rb
+++ b/spec/unit/encrypted_data_bag_item_spec.rb
@@ -290,7 +290,7 @@ describe Chef::EncryptedDataBagItem::Decryptor do
end
- context "when decrypting a version 0 (YAML+aes-256-cbc+no iv) encrypted value", :not_fips do
+ context "when decrypting a version 0 (YAML+aes-256-cbc+no iv) encrypted value", :not_supported_under_fips do
let(:encrypted_value) do
Version0Encryptor.encrypt_value(plaintext_data, encryption_key)
end