Convert specs to RSpec 3.1.7 syntax with Transpec

[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..f3c76a3bde3facefa498e71c4a41ced6724a0d12 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,49 +56,12 @@ 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 'ensure absent' do
     let :pre_condition do
-      'class { "apt": proxy_host => "example.com" }'
-    end
-    let :facts do
-      {
-        :lsbdistrelease  => '14.04',
-        :lsbdistcodename => 'trusty',
-        :operatingsystem => 'Ubuntu',
-        :lsbdistid       => 'Ubuntu',
-        :osfamily        => 'Debian',
-      }
-    end
-    let :params do
-      {
-        'release' => 'lucid',
-      }
+      'class { "apt": }'
     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',
-      'user'        => 'root',
-      'logoutput'   => 'on_failure',
-    })
-    }
-
-    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',
-    })
-    }
-  end
-
-  describe 'ensure absent' do
     let :facts do
       {
         :lsbdistrelease  => '14.04',
@@ -137,7 +96,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 +114,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