X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fsource_spec.rb;h=7fd86b56ff0ff35e98ff8a4e5abd90fdfb31c13b;hb=dc746734f17faa996e8441d176143945e8347330;hp=7dc03e459377b543a52de1df68867862f5453aa0;hpb=396036892d81a10afb59a0cea287e620a60f7555;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index 7dc03e4..7fd86b5 100644
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -11,27 +11,36 @@ describe 'apt::source' do
     'my_source'
   end
 
-  context 'mostly defaults' do
-    let :facts do
-      {
-        :lsbdistid       => 'Debian',
-        :lsbdistcodename => 'wheezy',
-        :osfamily        => 'Debian'
-      }
+  context 'defaults' do
+    context 'without location' do
+      let :facts do
+        {
+          :lsbdistid       => 'Debian',
+          :lsbdistcodename => 'wheezy',
+          :osfamily        => 'Debian'
+        }
+      end
+      it do
+        expect {
+          is_expected.to compile
+        }.to raise_error(Puppet::Error, /source entry without specifying a location/)
+      end
     end
+    context 'with location' do
+      let :facts do
+        {
+          :lsbdistid       => 'Debian',
+          :lsbdistcodename => 'wheezy',
+          :osfamily        => 'Debian'
+        }
+      end
+      let(:params) { { :location => 'hello.there', } }
 
-    let :params do
-      {
-        :include_deb => false,
-        :include_src => true,
+      it { is_expected.to contain_apt__setting('list-my_source').with({
+        :ensure  => 'present',
+      }).without_content(/# my_source\ndeb-src hello.there wheezy main\n/)
       }
     end
-
-    it { is_expected.to contain_apt__setting('list-my_source').with({
-      :ensure => 'present',
-    }).with_content(/# my_source\ndeb-src  wheezy main\n/)
-
-    }
   end
 
   describe 'no defaults' do
@@ -49,11 +58,10 @@ describe 'apt::source' do
           :location          => 'http://debian.mirror.iweb.ca/debian/',
           :release           => 'sid',
           :repos             => 'testing',
-          :include_src       => false,
           :key               => GPG_KEY_ID,
           :pin               => '10',
           :architecture      => 'x86_64',
-          :trusted_source    => true,
+          :allow_unsigned    => true,
         }
       end
 
@@ -83,13 +91,12 @@ describe 'apt::source' do
           :location          => 'http://debian.mirror.iweb.ca/debian/',
           :release           => 'sid',
           :repos             => 'testing',
-          :include_src       => false,
           :key               => { 'id' => GPG_KEY_ID, 'server' => 'pgp.mit.edu',
                                   'content' => 'GPG key content',
                                   'source'  => 'http://apt.puppetlabs.com/pubkey.gpg',},
           :pin               => '10',
           :architecture      => 'x86_64',
-          :trusted_source    => true,
+          :allow_unsigned    => true,
         }
       end
 
@@ -122,11 +129,10 @@ describe 'apt::source' do
           :location       => 'http://debian.mirror.iweb.ca/debian/',
           :release        => 'sid',
           :repos          => 'testing',
-          :include_src    => false,
           :key            => GPG_KEY_ID,
           :pin            => '10',
           :architecture   => 'x86_64',
-          :trusted_source => true,
+          :allow_unsigned => true,
         }
       end
 
@@ -150,7 +156,7 @@ describe 'apt::source' do
     end
   end
 
-  context 'trusted_source true' do
+  context 'allow_unsigned true' do
     let :facts do
       {
         :lsbdistid       => 'Debian',
@@ -160,14 +166,14 @@ describe 'apt::source' do
     end
     let :params do
       {
-        :include_src    => false,
-        :trusted_source => true,
+        :location       => 'hello.there',
+        :allow_unsigned => true,
       }
     end
 
     it { is_expected.to contain_apt__setting('list-my_source').with({
       :ensure => 'present',
-    }).with_content(/# my_source\ndeb \[trusted=yes\]  wheezy main\n/)
+    }).with_content(/# my_source\ndeb \[trusted=yes\] hello.there wheezy main\n/)
     }
   end
 
@@ -181,15 +187,15 @@ describe 'apt::source' do
     end
     let :params do
       {
-        :include_deb  => false,
-        :include_src  => true,
+        :location     => 'hello.there',
+        :include      => {'deb' => false, 'src' => true,},
         :architecture => 'x86_64',
       }
     end
 
     it { is_expected.to contain_apt__setting('list-my_source').with({
       :ensure => 'present',
-    }).with_content(/# my_source\ndeb-src \[arch=x86_64 \]  wheezy main\n/)
+    }).with_content(/# my_source\ndeb-src \[arch=x86_64 \] hello.there wheezy main\n/)
     }
   end
 
@@ -221,6 +227,7 @@ describe 'apt::source' do
           :osfamily        => 'Debian'
         }
       end
+      let(:params) { { :location => 'hello.there', } }
 
       it do
         expect {