From 5247b9904575629121c6ec72e3e6ff3a665bd9a7 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 8 Jun 2017 09:34:45 +0300
Subject: Move tripleo::certmonger::httpd to defines folder and fix suffix

It's a define, not a class. And it also needs the _spec suffix.

Change-Id: Ie5e0cf81d03379d8b791fd77a5c78d12048ebfef
---
 spec/classes/tripleo_certmonger_httpd.rb      | 63 --------------------------
 spec/defines/tripleo_certmonger_httpd_spec.rb | 65 +++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 63 deletions(-)
 delete mode 100644 spec/classes/tripleo_certmonger_httpd.rb
 create mode 100644 spec/defines/tripleo_certmonger_httpd_spec.rb

diff --git a/spec/classes/tripleo_certmonger_httpd.rb b/spec/classes/tripleo_certmonger_httpd.rb
deleted file mode 100644
index da5ce94..0000000
--- a/spec/classes/tripleo_certmonger_httpd.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2017 Red Hat Inc.
-#
-# 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.
-#
-# Unit tests for tripleo
-#
-
-require 'spec_helper'
-
-describe 'tripleo::certmonger::httpd' do
-
-  shared_examples_for 'tripleo::certmonger::httpd' do
-    let :params do
-      {
-        :name                => 'httpd-cert',
-        :hostname            => 'localhost',
-        :service_certificate => '/etc/pki/cert.crt',
-        :service_key         => '/etc/pki/key.pem',
-      }
-    end
-
-    it 'should include the base for using certmonger' do
-      is_expected.to contain_class('certmonger')
-    end
-
-    it 'should include the httpd parameters' do
-      is_expected.to contain_class('apache::params')
-    end
-
-    it 'should request a certificate' do
-      is_expected.to contain_certmonger_certificate('httpd-cert').with(
-        :ensure       => 'present',
-        :certfile     => '/etc/pki/cert.crt',
-        :keyfile      => '/etc/pki/key.pem',
-        :hostname     => 'localhost',
-        :dnsname      => 'localhost',
-        :ca           => 'local',
-        :wait         => true,
-      )
-    end
-  end
-
-  on_supported_os.each do |os, facts|
-    context "on #{os}" do
-      let(:facts) do
-        facts.merge({})
-      end
-
-      it_behaves_like 'tripleo::certmonger::httpd'
-    end
-  end
-end
diff --git a/spec/defines/tripleo_certmonger_httpd_spec.rb b/spec/defines/tripleo_certmonger_httpd_spec.rb
new file mode 100644
index 0000000..f01e594
--- /dev/null
+++ b/spec/defines/tripleo_certmonger_httpd_spec.rb
@@ -0,0 +1,65 @@
+#
+# Copyright (C) 2017 Red Hat Inc.
+#
+# 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.
+#
+# Unit tests for tripleo
+#
+
+require 'spec_helper'
+
+describe 'tripleo::certmonger::httpd' do
+
+  let(:title) { 'httpd-cert' }
+
+  shared_examples_for 'tripleo::certmonger::httpd' do
+    let :params do
+      {
+        :name                => 'httpd-cert',
+        :hostname            => 'localhost',
+        :service_certificate => '/etc/pki/cert.crt',
+        :service_key         => '/etc/pki/key.pem',
+      }
+    end
+
+    it 'should include the base for using certmonger' do
+      is_expected.to contain_class('certmonger')
+    end
+
+    it 'should include the httpd parameters' do
+      is_expected.to contain_class('apache::params')
+    end
+
+    it 'should request a certificate' do
+      is_expected.to contain_certmonger_certificate('httpd-cert').with(
+        :ensure       => 'present',
+        :certfile     => '/etc/pki/cert.crt',
+        :keyfile      => '/etc/pki/key.pem',
+        :hostname     => 'localhost',
+        :dnsname      => 'localhost',
+        :ca           => 'local',
+        :wait         => true,
+      )
+    end
+  end
+
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let(:facts) do
+        facts.merge({})
+      end
+
+      it_behaves_like 'tripleo::certmonger::httpd'
+    end
+  end
+end
-- 
cgit 1.2.3-korg