From ea8d850ca3a44305c143dbd70420f09895132ed7 Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith@chef.io>
Date: Fri, 24 Aug 2018 13:47:42 -0700
Subject: Fix the openssl unit tests

Rename the fixes
Update the mode tests

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 .../openssl_openssl_x509_certificate_spec.rb       | 71 ---------------------
 .../unit/resource/openssl_openssl_x509_crl_spec.rb | 61 ------------------
 spec/unit/resource/openssl_openssl_x509_request.rb | 67 --------------------
 .../unit/resource/openssl_x509_certificate_spec.rb | 72 ++++++++++++++++++++++
 spec/unit/resource/openssl_x509_crl_spec.rb        | 61 ++++++++++++++++++
 spec/unit/resource/openssl_x509_request.rb         | 68 ++++++++++++++++++++
 6 files changed, 201 insertions(+), 199 deletions(-)
 delete mode 100644 spec/unit/resource/openssl_openssl_x509_certificate_spec.rb
 delete mode 100644 spec/unit/resource/openssl_openssl_x509_crl_spec.rb
 delete mode 100644 spec/unit/resource/openssl_openssl_x509_request.rb
 create mode 100644 spec/unit/resource/openssl_x509_certificate_spec.rb
 create mode 100644 spec/unit/resource/openssl_x509_crl_spec.rb
 create mode 100644 spec/unit/resource/openssl_x509_request.rb

diff --git a/spec/unit/resource/openssl_openssl_x509_certificate_spec.rb b/spec/unit/resource/openssl_openssl_x509_certificate_spec.rb
deleted file mode 100644
index b8e49db164..0000000000
--- a/spec/unit/resource/openssl_openssl_x509_certificate_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright:: Copyright 2018, Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-
-describe Chef::Resource::OpensslX509Certificate do
-
-  let(:resource) { Chef::Resource::OpensslX509Certificate.new("fakey_fakerton") }
-
-  it "has a resource name of :openssl_x509_certificate" do
-    expect(resource.resource_name).to eql(:openssl_x509_certificate)
-  end
-
-  it "the path property is the name_property" do
-    expect(resource.path).to eql("fakey_fakerton")
-  end
-
-  it "sets the default action as :create" do
-    expect(resource.action).to eql([:create])
-  end
-
-  it "supports :create action" do
-    expect { resource.action :create }.not_to raise_error
-  end
-
-  it "has a default expiration of 365" do
-    expect(resource.expire).to eql(365)
-  end
-
-  it "has a default mode of '0644'" do
-    expect(resource.mode).to eql("0644")
-  end
-
-  it "has a default key_type of 'rsa'" do
-    expect(resource.key_type).to eql("rsa")
-  end
-
-  it "only accepts valid key_type values" do
-    expect { resource.key_type "fako" }.to raise_error(ArgumentError)
-  end
-
-  it "has a default key_length of '2048'" do
-    expect(resource.key_length).to eql(2048)
-  end
-
-  it "only accepts valid key_length values" do
-    expect { resource.key_length 1023 }.to raise_error(ArgumentError)
-  end
-
-  it "has a default key_curve of 'prime256v1'" do
-    expect(resource.key_curve).to eql("prime256v1")
-  end
-
-  it "only accepts valid key_curve values" do
-    expect { resource.key_curve "fako" }.to raise_error(ArgumentError)
-  end
-end
diff --git a/spec/unit/resource/openssl_openssl_x509_crl_spec.rb b/spec/unit/resource/openssl_openssl_x509_crl_spec.rb
deleted file mode 100644
index 100bd4e0d9..0000000000
--- a/spec/unit/resource/openssl_openssl_x509_crl_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright:: Copyright 2018, Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-
-describe Chef::Resource::OpensslX509Crl do
-
-  let(:resource) { Chef::Resource::OpensslX509Crl.new("fakey_fakerton") }
-
-  it "has a resource name of :openssl_x509_crl" do
-    expect(resource.resource_name).to eql(:openssl_x509_crl)
-  end
-
-  it "the path property is the name_property" do
-    expect(resource.path).to eql("fakey_fakerton")
-  end
-
-  it "sets the default action as :create" do
-    expect(resource.action).to eql([:create])
-  end
-
-  it "supports :create action" do
-    expect { resource.action :create }.not_to raise_error
-  end
-
-  it "has a default revocation_reason of 0" do
-    expect(resource.revocation_reason).to eql(0)
-  end
-
-  it "has a default expiration of 8" do
-    expect(resource.expire).to eql(8)
-  end
-
-  it "has a default renewal_threshold of 1" do
-    expect(resource.renewal_threshold).to eql(1)
-  end
-
-  it "serial_to_revoke accepts both String and Integer values" do
-    expect { resource.serial_to_revoke "123" }.not_to raise_error
-    expect { resource.serial_to_revoke 123 }.not_to raise_error
-  end
-
-  it "mode accepts both String and Integer values" do
-    expect { resource.serial_to_revoke "644" }.not_to raise_error
-    expect { resource.serial_to_revoke 644 }.not_to raise_error
-  end
-end
diff --git a/spec/unit/resource/openssl_openssl_x509_request.rb b/spec/unit/resource/openssl_openssl_x509_request.rb
deleted file mode 100644
index 59abdc666e..0000000000
--- a/spec/unit/resource/openssl_openssl_x509_request.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright:: Copyright 2018, Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-
-describe Chef::Resource::OpensslX509Request do
-
-  let(:resource) { Chef::Resource::OpensslX509Request.new("fakey_fakerton") }
-
-  it "has a resource name of :openssl_x509_request" do
-    expect(resource.resource_name).to eql(:openssl_x509_request)
-  end
-
-  it "the path property is the name_property" do
-    expect(resource.path).to eql("fakey_fakerton")
-  end
-
-  it "sets the default action as :create" do
-    expect(resource.action).to eql([:create])
-  end
-
-  it "supports :create action" do
-    expect { resource.action :create }.not_to raise_error
-  end
-
-  it "has a default mode of '0644'" do
-    expect(resource.mode).to eql("0644")
-  end
-
-  it "has a default key_type of 'ec'" do
-    expect(resource.key_type).to eql("ec")
-  end
-
-  it "only accepts valid key_type values" do
-    expect { resource.key_type "fako" }.to raise_error(ArgumentError)
-  end
-
-  it "has a default key_length of '2048'" do
-    expect(resource.key_length).to eql(2048)
-  end
-
-  it "only accepts valid key_length values" do
-    expect { resource.key_length 1023 }.to raise_error(ArgumentError)
-  end
-
-  it "has a default key_curve of 'prime256v1'" do
-    expect(resource.key_curve).to eql("prime256v1")
-  end
-
-  it "only accepts valid key_curve values" do
-    expect { resource.key_curve "fako" }.to raise_error(ArgumentError)
-  end
-end
diff --git a/spec/unit/resource/openssl_x509_certificate_spec.rb b/spec/unit/resource/openssl_x509_certificate_spec.rb
new file mode 100644
index 0000000000..795987f569
--- /dev/null
+++ b/spec/unit/resource/openssl_x509_certificate_spec.rb
@@ -0,0 +1,72 @@
+#
+# Copyright:: Copyright 2018, Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::Resource::OpensslX509Certificate do
+
+  let(:resource) { Chef::Resource::OpensslX509Certificate.new("fakey_fakerton") }
+
+  it "has a resource name of :openssl_x509_certificate" do
+    expect(resource.resource_name).to eql(:openssl_x509_certificate)
+  end
+
+  it "the path property is the name_property" do
+    expect(resource.path).to eql("fakey_fakerton")
+  end
+
+  it "sets the default action as :create" do
+    expect(resource.action).to eql([:create])
+  end
+
+  it "supports :create action" do
+    expect { resource.action :create }.not_to raise_error
+  end
+
+  it "has a default expiration of 365" do
+    expect(resource.expire).to eql(365)
+  end
+
+  it "has a default key_type of 'rsa'" do
+    expect(resource.key_type).to eql("rsa")
+  end
+
+  it "only accepts valid key_type values" do
+    expect { resource.key_type "fako" }.to raise_error(ArgumentError)
+  end
+
+  it "has a default key_length of '2048'" do
+    expect(resource.key_length).to eql(2048)
+  end
+
+  it "only accepts valid key_length values" do
+    expect { resource.key_length 1023 }.to raise_error(ArgumentError)
+  end
+
+  it "has a default key_curve of 'prime256v1'" do
+    expect(resource.key_curve).to eql("prime256v1")
+  end
+
+  it "only accepts valid key_curve values" do
+    expect { resource.key_curve "fako" }.to raise_error(ArgumentError)
+  end
+
+  it "mode accepts both String and Integer values" do
+    expect { resource.mode "644" }.not_to raise_error
+    expect { resource.mode 644 }.not_to raise_error
+  end
+end
diff --git a/spec/unit/resource/openssl_x509_crl_spec.rb b/spec/unit/resource/openssl_x509_crl_spec.rb
new file mode 100644
index 0000000000..4f852be0c2
--- /dev/null
+++ b/spec/unit/resource/openssl_x509_crl_spec.rb
@@ -0,0 +1,61 @@
+#
+# Copyright:: Copyright 2018, Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::Resource::OpensslX509Crl do
+
+  let(:resource) { Chef::Resource::OpensslX509Crl.new("fakey_fakerton") }
+
+  it "has a resource name of :openssl_x509_crl" do
+    expect(resource.resource_name).to eql(:openssl_x509_crl)
+  end
+
+  it "the path property is the name_property" do
+    expect(resource.path).to eql("fakey_fakerton")
+  end
+
+  it "sets the default action as :create" do
+    expect(resource.action).to eql([:create])
+  end
+
+  it "supports :create action" do
+    expect { resource.action :create }.not_to raise_error
+  end
+
+  it "has a default revocation_reason of 0" do
+    expect(resource.revocation_reason).to eql(0)
+  end
+
+  it "has a default expiration of 8" do
+    expect(resource.expire).to eql(8)
+  end
+
+  it "has a default renewal_threshold of 1" do
+    expect(resource.renewal_threshold).to eql(1)
+  end
+
+  it "serial_to_revoke accepts both String and Integer values" do
+    expect { resource.serial_to_revoke "123" }.not_to raise_error
+    expect { resource.serial_to_revoke 123 }.not_to raise_error
+  end
+
+  it "mode accepts both String and Integer values" do
+    expect { resource.mode "644" }.not_to raise_error
+    expect { resource.mode 644 }.not_to raise_error
+  end
+end
diff --git a/spec/unit/resource/openssl_x509_request.rb b/spec/unit/resource/openssl_x509_request.rb
new file mode 100644
index 0000000000..28ca4f7345
--- /dev/null
+++ b/spec/unit/resource/openssl_x509_request.rb
@@ -0,0 +1,68 @@
+#
+# Copyright:: Copyright 2018, Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::Resource::OpensslX509Request do
+
+  let(:resource) { Chef::Resource::OpensslX509Request.new("fakey_fakerton") }
+
+  it "has a resource name of :openssl_x509_request" do
+    expect(resource.resource_name).to eql(:openssl_x509_request)
+  end
+
+  it "the path property is the name_property" do
+    expect(resource.path).to eql("fakey_fakerton")
+  end
+
+  it "sets the default action as :create" do
+    expect(resource.action).to eql([:create])
+  end
+
+  it "supports :create action" do
+    expect { resource.action :create }.not_to raise_error
+  end
+
+  it "has a default key_type of 'ec'" do
+    expect(resource.key_type).to eql("ec")
+  end
+
+  it "only accepts valid key_type values" do
+    expect { resource.key_type "fako" }.to raise_error(ArgumentError)
+  end
+
+  it "has a default key_length of '2048'" do
+    expect(resource.key_length).to eql(2048)
+  end
+
+  it "only accepts valid key_length values" do
+    expect { resource.key_length 1023 }.to raise_error(ArgumentError)
+  end
+
+  it "has a default key_curve of 'prime256v1'" do
+    expect(resource.key_curve).to eql("prime256v1")
+  end
+
+  it "only accepts valid key_curve values" do
+    expect { resource.key_curve "fako" }.to raise_error(ArgumentError)
+  end
+
+  it "mode accepts both String and Integer values" do
+    expect { resource.mode "644" }.not_to raise_error
+    expect { resource.mode 644 }.not_to raise_error
+  end
+end
-- 
cgit v1.2.1