Merge pull request #24 from haus/fix_source_key_tests

[puppet-modules/puppetlabs-apt.git] / spec / defines / source_spec.rb

diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index 333d53460f033b35ab4f69ca7c15982c08f93c55..cc06457ba94a54bb31bead84e7990b003a347096 100644 (file)
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -29,11 +29,16 @@ describe 'apt::source', :type => :define do
       :key_server         => 'keyserver.debian.com',
       :pin                => '600',
       :key_content        => 'ABCD1234'
+    },
+    {
+      :key                => 'key_name',
+      :key_server         => 'keyserver.debian.com',
+      :key_content        => false,
     }
   ].each do |param_set|
     describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
       let :param_hash do
-        param_set == {} ? default_params : params
+        default_params.merge(param_set)
       end
 
       let :params do
@@ -53,73 +58,99 @@ describe 'apt::source', :type => :define do
         content
       end
 
-      it { should contain_class("apt::params") }
+      it { should contain_apt__params }
 
-      it { should contain_file("#{title}.list")\
-        .with_path(filename)\
-        .with_ensure("file")\
-        .with_owner("root")\
-        .with_group("root")\
-        .with_mode(644)\
-        .with_content(content)
+      it { should contain_file("#{title}.list").with({
+          'path'      => filename,
+          'ensure'    => "file",
+          'owner'     => "root",
+          'group'     => "root",
+          'mode'      => 644,
+          'content'   => content
+        })
       }
 
       it {
         if param_hash[:pin]
-          should create_resource("apt::pin", param_hash[:release]).with_param("priority", param_hash[:pin]).with_param("before", "File[#{title}.list]")
+          should contain_apt__pin(param_hash[:release]).with({
+            "priority"  => param_hash[:pin],
+            "before"    => "File[#{title}.list]"
+          })
         else
-          should_not create_resource("apt::pin", param_hash[:release]).with_param("priority", param_hash[:pin]).with_param("before", "File[#{title}.list]")
+          should_not contain_apt__pin(param_hash[:release]).with({
+            "priority"  => param_hash[:pin],
+            "before"    => "File[#{title}.list]"
+          })
         end
       }
 
       it {
-        should contain_exec("#{title} apt update")\
-          .with_command("/usr/bin/apt-get update")\
-          .with_subscribe("File[#{title}.list]")\
-          .with_refreshonly(true)
+        should contain_exec("#{title} apt update").with({
+          "command"     => "/usr/bin/apt-get update",
+          "subscribe"   => "File[#{title}.list]",
+          "refreshonly" => true
+        })
       }
 
       it {
         if param_hash[:required_packages]
-          should contain_exec("/usr/bin/apt-get -y install #{param_hash[:required_packages]}")\
-            .with_subscribe("File[#{title}.list]")\
-            .with_refreshonly(true)
+          should contain_exec("/usr/bin/apt-get -y install #{param_hash[:required_packages]}").with({
+            "subscribe"   => "File[#{title}.list]",
+            "refreshonly" => true
+          })
         else
-          should_not contain_exec("/usr/bin/apt-get -y install #{param_hash[:required_packages]}")\
-            .with_subscribe("File[#{title}.list]")\
-            .with_refreshonly(true)
+          should_not contain_exec("/usr/bin/apt-get -y install #{param_hash[:required_packages]}").with({
+            "subscribe"   => "File[#{title}.list]",
+            "refreshonly" => true
+          })
         end
       }
 
       it {
         if param_hash[:key]
           if param_hash[:key_content]
-            should contain_exec("Add key: #{param_hash[:key]} from content")\
-              .with_command("/bin/echo '#{param_hash[:key_content]}' | /usr/bin/apt-key add -")\
-              .with_unless("/usr/bin/apt-key list | /bin/grep '#{param_hash[:key]}'")\
-              .with_before("File[#{title}.list]")
-            should_not contain_exec("/usr/bin/apt-key adv --keyserver #{param_hash[:key_server]} --recv-keys #{param_hash[:key]}")\
-              .with_unless("/usr/bin/apt-key list | /bin/grep #{param_hash[:key]}")\
-              .with_before("File[#{title}.list]")
-
+            should contain_exec("Add key: #{param_hash[:key]} from content for #{title}").with({
+              "command" => "/bin/echo '#{param_hash[:key_content]}' | /usr/bin/apt-key add -",
+              "unless"  => "/usr/bin/apt-key list | /bin/grep '#{param_hash[:key]}'",
+              "before"  => "File[#{title}.list]"
+            })
           else
-            should contain_exec("/usr/bin/apt-key adv --keyserver #{param_hash[:key_server]} --recv-keys #{param_hash[:key]}")\
-              .with_unless("/usr/bin/apt-key list | /bin/grep #{param_hash[:key]}")\
-              .with_before("File[#{title}.list]")
-            should_not contain_exec("Add key: #{param_hash[:key]} from content")\
-              .with_command("/bin/echo '#{param_hash[:key_content]}' | /usr/bin/apt-key add -")\
-              .with_unless("/usr/bin/apt-key list | /bin/grep '#{param_hash[:key]}'")\
-              .with_before("File[#{title}.list]")
+            should_not contain_exec("Add key: #{param_hash[:key]} from content for #{title}").with({
+                "command" => "/bin/echo '#{param_hash[:key_content]}' | /usr/bin/apt-key add -",
+                "unless"  => "/usr/bin/apt-key list | /bin/grep '#{param_hash[:key]}'",
+                "before"  => "File[#{title}.list]"
+            })
           end
         else
-          should_not contain_exec("Add key: #{param_hash[:key]} from content")\
-            .with_command("/bin/echo '#{param_hash[:key_content]}' | /usr/bin/apt-key add -")\
-            .with_unless("/usr/bin/apt-key list | /bin/grep '#{param_hash[:key]}'")\
-            .with_before("File[#{title}.list]")
-          should_not contain_exec("/usr/bin/apt-key adv --keyserver #{param_hash[:key_server]} --recv-keys #{param_hash[:key]}")\
-              .with_unless("/usr/bin/apt-key list | /bin/grep #{param_hash[:key]}")\
-              .with_before("File[#{title}.list]")
+          should_not contain_exec("Add key: #{param_hash[:key]} from content for #{title}").with({
+            "command"   => "/bin/echo '#{param_hash[:key_content]}' | /usr/bin/apt-key add -",
+            "unless"    => "/usr/bin/apt-key list | /bin/grep '#{param_hash[:key]}'",
+            "before"    => "File[#{title}.list]"
+          })
+        end
+      }
 
+      it {
+        if param_hash[:key]
+          if param_hash[:key_content]
+            should_not contain_exec("Add key: #{param_hash[:key]} from #{param_hash[:key_server]} for #{title}").with({
+                "command" => "/usr/bin/apt-key adv --keyserver #{param_hash[:key_server]} --recv-keys #{param_hash[:key]}",
+                "unless"  => "/usr/bin/apt-key list | /bin/grep #{param_hash[:key]}",
+                "before"  => "File[#{title}.list]"
+            })
+          else
+            should contain_exec("Add key: #{param_hash[:key]} from #{param_hash[:key_server]} for #{title}").with({
+                "command" => "/usr/bin/apt-key adv --keyserver #{param_hash[:key_server]} --recv-keys #{param_hash[:key]}",
+                "unless"  => "/usr/bin/apt-key list | /bin/grep #{param_hash[:key]}",
+                "before"  => "File[#{title}.list]"
+            })
+          end
+        else
+          should_not contain_exec("Add key: #{param_hash[:key]} from #{param_hash[:key_server]} for #{title}").with({
+              "command" => "/usr/bin/apt-key adv --keyserver #{param_hash[:key_server]} --recv-keys #{param_hash[:key]}",
+              "unless"  => "/usr/bin/apt-key list | /bin/grep #{param_hash[:key]}",
+              "before"  => "File[#{title}.list]"
+          })
         end
       }
     end