From: David Schmitt <david.schmitt@puppet.com>
Date: Mon, 25 Sep 2017 09:51:53 +0000 (+0100)
Subject: More acceptance test suite cleanups
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8e5f54c42c73f75c5bcf7683469cfc1bbf505299;p=puppet-modules%2Fpuppetlabs-apt.git

More acceptance test suite cleanups
---

diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb
index 0deeb15..ecb3f73 100644
--- a/spec/acceptance/apt_key_provider_spec.rb
+++ b/spec/acceptance/apt_key_provider_spec.rb
@@ -58,26 +58,27 @@ end
         puppet_resource_should_show('fingerprint', fedora[:fingerprint])
         puppet_resource_should_show('long', fedora[:fingerprint][-16..-1])
         puppet_resource_should_show('short', fedora[:short])
-        # puppet_resource_should_show('created', '2017-08-14')
-        pending 'Correctly calculate the created date'
+        puppet_resource_should_show('created', '2017-08-14.*')
         puppet_resource_should_show('expired', 'false')
         puppet_resource_should_show('size', '4096')
         puppet_resource_should_show('type', ':?rsa')
       end
 
-      it 'can be removed' do
-        pp = <<-EOS
-          #{typename} { 'fedora':
-            id     => '#{fedora[:fingerprint]}',
-            ensure => 'absent',
-          }
-        EOS
+      context 'with ensure => absent set' do
+        it 'is removed' do
+          pp = <<-EOS
+            #{typename} { 'fedora':
+              id     => '#{fedora[:fingerprint]}',
+              ensure => 'absent',
+            }
+          EOS
 
-        # Time to remove it using Puppet
-        execute_manifest(pp, trace: true, catch_failures: true)
-        check_key_absent(fedora[:fingerprint])
-        execute_manifest(pp, trace: true, catch_changes: true)
-        check_key_absent(fedora[:fingerprint])
+          # Time to remove it using Puppet
+          execute_manifest(pp, trace: true, catch_failures: true)
+          check_key_absent(fedora[:fingerprint])
+          execute_manifest(pp, trace: true, catch_changes: true)
+          check_key_absent(fedora[:fingerprint])
+        end
       end
     end
 
@@ -122,7 +123,7 @@ end
       end
     end
 
-    fdescribe 'content =>' do
+    describe 'content =>' do
       context 'multiple keys' do
         after(:each) do
           shell_ex("apt-key del #{PUPPETLABS_GPG_KEY_FINGERPRINT} > /dev/null")