X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fppa_spec.rb;h=05718ebc34ca972b570f65410d95880a2bef8c4c;hb=refs%2Fheads%2Ftrusted-contributors;hp=4732350e84d79ffc92327cb77adc723e668210e6;hpb=ec7f4e29c6f57ee9250c65432ee0051282367760;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb
index 4732350..05718eb 100644
--- a/spec/defines/ppa_spec.rb
+++ b/spec/defines/ppa_spec.rb
@@ -23,12 +23,12 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
         puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
@@ -39,7 +39,7 @@ describe 'apt::ppa' do
     it { is_expected.not_to contain_package('python-software-properties') }
 
     it {
-      is_expected.to contain_exec('add-apt-repository-ppa:needs/substitution')
+      expect(subject).to contain_exec('add-apt-repository-ppa:needs/substitution')
         .that_notifies('Class[Apt::Update]')
         .with(*ppa_exec_params('needs', 'substitution'))
     }
@@ -59,13 +59,13 @@ describe 'apt::ppa' do
             name: 'Ubuntu',
             release: {
               major: '18',
-              full: '18.04',
+              full: '18.04'
             },
             distro: {
               codename: 'trusty',
-              id: 'Ubuntu',
-            },
-          },
+              id: 'Ubuntu'
+            }
+          }
         }
       end
 
@@ -92,13 +92,13 @@ describe 'apt::ppa' do
             name: 'Ubuntu',
             release: {
               major: '18',
-              full: '18.04',
+              full: '18.04'
             },
             distro: {
               codename: 'trusty',
-              id: 'Ubuntu',
-            },
-          },
+              id: 'Ubuntu'
+            }
+          }
         }
       end
 
@@ -116,21 +116,21 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '15',
-            full: '15.10',
+            full: '15.10'
           },
           distro: {
             codename: 'wily',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
     let(:title) { 'ppa:user/foo' }
 
     it {
-      is_expected.to contain_exec('add-apt-repository-ppa:user/foo')
+      expect(subject).to contain_exec('add-apt-repository-ppa:user/foo')
         .that_notifies('Class[Apt::Update]')
         .with(*ppa_exec_params('user', 'foo', 'wily'))
     }
@@ -144,7 +144,7 @@ describe 'apt::ppa' do
     let :params do
       {
         package_name: 'software-properties-common',
-        package_manage: true,
+        package_manage: true
       }
     end
 
@@ -155,14 +155,14 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
@@ -171,7 +171,7 @@ describe 'apt::ppa' do
     it { is_expected.to contain_package('software-properties-common') }
 
     it {
-      is_expected.to contain_exec('add-apt-repository-ppa:needs/substitution')
+      expect(subject).to contain_exec('add-apt-repository-ppa:needs/substitution')
         .that_notifies('Class[Apt::Update]')
         .with(*ppa_exec_params('needs', 'substitution'))
     }
@@ -189,20 +189,20 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
     let :params do
       {
-        package_manage: false,
+        package_manage: false
       }
     end
 
@@ -211,7 +211,7 @@ describe 'apt::ppa' do
     it { is_expected.not_to contain_package('python-software-properties') }
 
     it {
-      is_expected.to contain_exec('add-apt-repository-ppa:needs/substitution')
+      expect(subject).to contain_exec('add-apt-repository-ppa:needs/substitution')
         .that_notifies('Class[Apt::Update]')
         .with(*ppa_exec_params('needs', 'substitution'))
     }
@@ -231,21 +231,21 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
     let :params do
       {
         package_manage: true,
-        require: 'Apt::Ppa[ppa:user/foo2]',
+        require: 'Apt::Ppa[ppa:user/foo2]'
       }
     end
 
@@ -255,7 +255,7 @@ describe 'apt::ppa' do
     it { is_expected.to contain_package('software-properties-common') }
 
     it {
-      is_expected.to contain_exec('add-apt-repository-ppa:user/foo')
+      expect(subject).to contain_exec('add-apt-repository-ppa:user/foo')
         .that_notifies('Class[Apt::Update]')
         .with(*ppa_exec_params('user', 'foo'))
     }
@@ -275,20 +275,20 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
     let :params do
       {
-        'package_manage' => true,
+        'package_manage' => true
       }
     end
 
@@ -297,7 +297,7 @@ describe 'apt::ppa' do
     it { is_expected.to contain_package('software-properties-common') }
 
     it {
-      is_expected.to contain_exec('add-apt-repository-ppa:user/foo')
+      expect(subject).to contain_exec('add-apt-repository-ppa:user/foo')
         .that_notifies('Class[Apt::Update]')
         .with(*ppa_exec_params('user', 'foo', 'trusty', ['http_proxy=http://localhost:8080']))
     }
@@ -317,20 +317,20 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
     let :params do
       {
-        package_manage: true,
+        package_manage: true
       }
     end
 
@@ -339,7 +339,7 @@ describe 'apt::ppa' do
     it { is_expected.to contain_package('software-properties-common') }
 
     it {
-      is_expected.to contain_exec('add-apt-repository-ppa:user/foo')
+      expect(subject).to contain_exec('add-apt-repository-ppa:user/foo')
         .that_notifies('Class[Apt::Update]')
         .with(*ppa_exec_params('user', 'foo', 'trusty', ['http_proxy=http://localhost:8180']))
     }
@@ -359,20 +359,20 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
     let :params do
       {
-        package_manage: true,
+        package_manage: true
       }
     end
 
@@ -381,7 +381,7 @@ describe 'apt::ppa' do
     it { is_expected.to contain_package('software-properties-common') }
 
     it {
-      is_expected.to contain_exec('add-apt-repository-ppa:user/foo')
+      expect(subject).to contain_exec('add-apt-repository-ppa:user/foo')
         .that_notifies('Class[Apt::Update]')
         .with(*ppa_exec_params('user', 'foo', 'trusty', ['http_proxy=http://localhost:8180', 'https_proxy=https://localhost:8180']))
     }
@@ -399,14 +399,14 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
@@ -414,15 +414,15 @@ describe 'apt::ppa' do
 
     let :params do
       {
-        ensure: 'absent',
+        ensure: 'absent'
       }
     end
 
     it {
-      is_expected.to contain_tidy("remove-apt-repository-script-#{title}")
+      expect(subject).to contain_tidy("remove-apt-repository-script-#{title}")
         .with('path' => '/opt/puppetlabs/puppet/cache/add-apt-repository-user-ubuntu-foo-trusty.sh')
 
-      is_expected.to contain_tidy("remove-apt-repository-#{title}")
+      expect(subject).to contain_tidy("remove-apt-repository-#{title}")
         .with('path' => '/etc/apt/sources.list.d/user-ubuntu-foo-trusty.list')
         .that_notifies('Class[Apt::Update]')
     }
@@ -437,20 +437,20 @@ describe 'apt::ppa' do
             name: 'Ubuntu',
             release: {
               major: '18',
-              full: '18.04',
+              full: '18.04'
             },
             distro: {
               codename: nil,
-              id: 'Ubuntu',
-            },
-          },
+              id: 'Ubuntu'
+            }
+          }
         }
       end
 
       let(:title) { 'ppa:user/foo' }
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{os.distro.codename fact not available: release parameter required})
+        expect(subject).to raise_error(Puppet::Error, %r{os.distro.codename fact not available: release parameter required})
       end
     end
 
@@ -462,20 +462,20 @@ describe 'apt::ppa' do
             name: 'Debian',
             release: {
               major: '6',
-              full: '6.0.7',
+              full: '6.0.7'
             },
             distro: {
               codename: 'wheezy',
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
 
       let(:title) { 'ppa:user/foo' }
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{not currently supported on Debian})
+        expect(subject).to raise_error(Puppet::Error, %r{not currently supported on Debian})
       end
     end
   end