Merge pull request #444 from puppetlabs/daenney/parse-setting-from-name

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

diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb
index 3a4c381f6746f794ff037c284bb20766a2ba8145..6ca008b4ba8399919d8b368568c90259c46322d2 100644 (file)
--- a/spec/defines/ppa_spec.rb
+++ b/spec/defines/ppa_spec.rb
@@ -16,7 +16,7 @@ describe 'apt::ppa', :type => :define do
     end
 
     let(:title) { 'ppa:needs/such.substitution/wow' }
-    it { is_expected.to contain_package('python-software-properties') }
+    it { is_expected.to_not contain_package('python-software-properties') }
     it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Exec[apt_update]').with({
       'environment' => [],
       'command'     => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow',
@@ -25,11 +25,6 @@ describe 'apt::ppa', :type => :define do
       'logoutput'   => 'on_failure',
     })
     }
-
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-natty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with({
-      'ensure' => 'file',
-    })
-    }
   end
 
   describe 'apt included, no proxy' do
@@ -48,6 +43,7 @@ describe 'apt::ppa', :type => :define do
     let :params do
       {
         'options' => '',
+        'package_manage' => true,
       }
     end
     let(:title) { 'ppa:foo' }
@@ -60,16 +56,11 @@ describe 'apt::ppa', :type => :define do
       'logoutput'   => 'on_failure',
     })
     }
-
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/foo-trusty.list').that_requires('Exec[add-apt-repository-ppa:foo]').with({
-      'ensure' => 'file',
-    })
-    }
   end
 
-  describe 'apt included, proxy' do
+  describe 'apt included, proxy host' do
     let :pre_condition do
-      'class { "apt": proxy_host => "example.com" }'
+      'class { "apt": }'
     end
     let :facts do
       {
@@ -82,27 +73,59 @@ describe 'apt::ppa', :type => :define do
     end
     let :params do
       {
-        'release' => 'lucid',
+        'options' => '',
+        'package_manage' => true,
+        'proxy' => { 'host' => 'localhost', }
       }
     end
     let(:title) { 'ppa:foo' }
     it { is_expected.to contain_package('software-properties-common') }
     it { is_expected.to contain_exec('add-apt-repository-ppa:foo').that_notifies('Exec[apt_update]').with({
-      'environment' => ['http_proxy=http://example.com:8080', 'https_proxy=http://example.com:8080'],
-      'command'     => '/usr/bin/add-apt-repository -y ppa:foo',
-      'unless'      => '/usr/bin/test -s /etc/apt/sources.list.d/foo-lucid.list',
+      'environment' => ['http_proxy=http://localhost:8080', 'https_proxy=http://localhost:8080'],
+      'command'     => '/usr/bin/add-apt-repository  ppa:foo',
+      'unless'      => '/usr/bin/test -s /etc/apt/sources.list.d/foo-trusty.list',
       'user'        => 'root',
       'logoutput'   => 'on_failure',
     })
     }
+  end
 
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/foo-lucid.list').that_requires('Exec[add-apt-repository-ppa:foo]').with({
-      'ensure' => 'file',
+  describe 'apt included, proxy host and port' do
+    let :pre_condition do
+      'class { "apt": }'
+    end
+    let :facts do
+      {
+        :lsbdistrelease  => '14.04',
+        :lsbdistcodename => 'trusty',
+        :operatingsystem => 'Ubuntu',
+        :lsbdistid       => 'Ubuntu',
+        :osfamily        => 'Debian',
+      }
+    end
+    let :params do
+      {
+        'options' => '',
+        'package_manage' => true,
+        'proxy' => { 'host' => 'localhost', 'port' => 8180, }
+      }
+    end
+    let(:title) { 'ppa:foo' }
+    it { is_expected.to contain_package('software-properties-common') }
+    it { is_expected.to contain_exec('add-apt-repository-ppa:foo').that_notifies('Exec[apt_update]').with({
+      'environment' => ['http_proxy=http://localhost:8180', 'https_proxy=http://localhost:8180'],
+      'command'     => '/usr/bin/add-apt-repository  ppa:foo',
+      'unless'      => '/usr/bin/test -s /etc/apt/sources.list.d/foo-trusty.list',
+      'user'        => 'root',
+      'logoutput'   => 'on_failure',
     })
     }
   end
 
   describe 'ensure absent' do
+    let :pre_condition do
+      'class { "apt": }'
+    end
     let :facts do
       {
         :lsbdistrelease  => '14.04',
@@ -137,7 +160,7 @@ describe 'apt::ppa', :type => :define do
       let(:title) { 'ppa:foo' }
       it do
         expect {
-          should compile
+          is_expected.to compile
         }.to raise_error(Puppet::Error, /lsbdistcodename fact not available: release parameter required/)
       end
     end
@@ -155,7 +178,7 @@ describe 'apt::ppa', :type => :define do
       let(:title) { 'ppa:foo' }
       it do
         expect {
-          should compile
+          is_expected.to compile
         }.to raise_error(Puppet::Error, /apt::ppa is currently supported on Ubuntu only./)
       end
     end