X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_spec.rb;h=03ca86f52f6c3d4e7f974531907829d48269c230;hb=2e8b93fc83efbf0a6d3c7b8106cc0b54bb249827;hp=8ecf4185e1a4fc13b1dc14e27b93fedfe6f43ef5;hpb=b87e1af3704f5574bda393e36ded542ee7c4be23;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index 8ecf418..03ca86f 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -1,339 +1,607 @@
 require 'spec_helper'
+
+sources_list = {  ensure: 'file',
+                  path: '/etc/apt/sources.list',
+                  owner: 'root',
+                  group: 'root',
+                  notify: 'Class[Apt::Update]' }
+
+sources_list_d = { ensure: 'directory',
+                   path: '/etc/apt/sources.list.d',
+                   owner: 'root',
+                   group: 'root',
+                   purge: false,
+                   recurse: false,
+                   notify: 'Class[Apt::Update]' }
+
+preferences = { ensure: 'file',
+                path: '/etc/apt/preferences',
+                owner: 'root',
+                group: 'root',
+                notify: 'Class[Apt::Update]' }
+
+preferences_d = { ensure: 'directory',
+                  path: '/etc/apt/preferences.d',
+                  owner: 'root',
+                  group: 'root',
+                  purge: false,
+                  recurse: false,
+                  notify: 'Class[Apt::Update]' }
+
+apt_conf_d = {    ensure: 'directory',
+                  path: '/etc/apt/apt.conf.d',
+                  owner: 'root',
+                  group: 'root',
+                  purge: false,
+                  recurse: false,
+                  notify: 'Class[Apt::Update]' }
+
 describe 'apt' do
   let(:facts) do
-  { :lsbdistid       => 'Debian',
-    :osfamily        => 'Debian',
-    :lsbdistcodename => 'wheezy',
-    :puppetversion   => Puppet.version,
-  }
+    {
+      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
+      lsbdistid: 'Debian',
+      osfamily: 'Debian',
+      lsbdistcodename: 'jessie',
+    }
   end
-  context 'defaults' do
-    it { is_expected.to contain_file('sources.list').that_notifies('Class[Apt::Update]').only_with({
-      :ensure  => 'file',
-      :path    => '/etc/apt/sources.list',
-      :owner   => 'root',
-      :group   => 'root',
-      :mode    => '0644',
-      :notify  => 'Class[Apt::Update]',
-    })}
-
-    it { is_expected.to contain_file('sources.list.d').that_notifies('Class[Apt::Update]').only_with({
-      :ensure  => 'directory',
-      :path    => '/etc/apt/sources.list.d',
-      :owner   => 'root',
-      :group   => 'root',
-      :mode    => '0644',
-      :purge   => false,
-      :recurse => false,
-      :notify  => 'Class[Apt::Update]',
-    })}
-
-    it { is_expected.to contain_file('preferences').that_notifies('Class[Apt::Update]').only_with({
-      :ensure  => 'file',
-      :path    => '/etc/apt/preferences',
-      :owner   => 'root',
-      :group   => 'root',
-      :mode    => '0644',
-      :notify  => 'Class[Apt::Update]',
-    })}
-
-    it { is_expected.to contain_file('preferences.d').that_notifies('Class[Apt::Update]').only_with({
-      :ensure  => 'directory',
-      :path    => '/etc/apt/preferences.d',
-      :owner   => 'root',
-      :group   => 'root',
-      :mode    => '0644',
-      :purge   => false,
-      :recurse => false,
-      :notify  => 'Class[Apt::Update]',
-    })}
-
-    it 'should lay down /etc/apt/apt.conf.d/15update-stamp' do
-      is_expected.to contain_file('/etc/apt/apt.conf.d/15update-stamp').with({
-        :group => 'root',
-        :mode  => '0644',
-        :owner => 'root',
-      }).with_content(/APT::Update::Post-Invoke-Success \{"touch \/var\/lib\/apt\/periodic\/update-success-stamp 2>\/dev\/null \|\| true";\};/)
+
+  context 'with defaults' do
+    it {
+      is_expected.to contain_file('sources.list').that_notifies('Class[Apt::Update]').only_with(sources_list)
+    }
+
+    it {
+      is_expected.to contain_file('sources.list.d').that_notifies('Class[Apt::Update]').only_with(sources_list_d)
+    }
+
+    it {
+      is_expected.to contain_file('preferences').that_notifies('Class[Apt::Update]').only_with(preferences)
+    }
+
+    it {
+      is_expected.to contain_file('preferences.d').that_notifies('Class[Apt::Update]').only_with(preferences_d)
+    }
+
+    it {
+      is_expected.to contain_file('apt.conf.d').that_notifies('Class[Apt::Update]').only_with(apt_conf_d)
+    }
+
+    it { is_expected.to contain_file('/etc/apt/auth.conf').with_ensure('absent') }
+
+    it 'lays down /etc/apt/apt.conf.d/15update-stamp' do
+      is_expected.to contain_file('/etc/apt/apt.conf.d/15update-stamp').with(group: 'root',
+                                                                             owner: 'root').with_content(
+                                                                               %r{APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};},
+                                                                             )
     end
 
-    it { is_expected.to contain_exec('apt_update').with({
-      :refreshonly => 'true',
-    })}
+    it {
+      is_expected.to contain_exec('apt_update').with(refreshonly: 'true')
+    }
 
     it { is_expected.not_to contain_apt__setting('conf-proxy') }
   end
 
   describe 'proxy=' do
-    context 'host=localhost' do
-      let(:params) { { :proxy => { 'host' => 'localhost'} } }
-      it { is_expected.to contain_apt__setting('conf-proxy').with({
-        :priority => '01',
-      }).with_content(
-        /Acquire::http::proxy "http:\/\/localhost:8080\/";/
-      ).without_content(
-        /Acquire::https::proxy/
-      )}
+    context 'when host=localhost' do
+      let(:params) { { proxy: { 'host' => 'localhost' } } }
+
+      it {
+        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+          %r{Acquire::http::proxy "http://localhost:8080/";},
+        ).without_content(
+          %r{Acquire::https::proxy},
+        )
+      }
     end
 
-    context 'host=localhost and port=8180' do
-      let(:params) { { :proxy => { 'host' => 'localhost', 'port' => 8180} } }
-      it { is_expected.to contain_apt__setting('conf-proxy').with({
-        :priority => '01',
-      }).with_content(
-        /Acquire::http::proxy "http:\/\/localhost:8180\/";/
-      ).without_content(
-        /Acquire::https::proxy/
-      )}
+    context 'when host=localhost and port=8180' do
+      let(:params) { { proxy: { 'host' => 'localhost', 'port' => 8180 } } }
+
+      it {
+        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+          %r{Acquire::http::proxy "http://localhost:8180/";},
+        ).without_content(
+          %r{Acquire::https::proxy},
+        )
+      }
     end
 
-    context 'host=localhost and https=true' do
-      let(:params) { { :proxy => { 'host' => 'localhost', 'https' => true} } }
-      it { is_expected.to contain_apt__setting('conf-proxy').with({
-        :priority => '01',
-      }).with_content(
-        /Acquire::http::proxy "http:\/\/localhost:8080\/";/
-      ).with_content(
-        /Acquire::https::proxy "https:\/\/localhost:8080\/";/
-      )}
+    context 'when host=localhost and https=true' do
+      let(:params) { { proxy: { 'host' => 'localhost', 'https' => true } } }
+
+      it {
+        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+          %r{Acquire::http::proxy "http://localhost:8080/";},
+        ).with_content(
+          %r{Acquire::https::proxy "https://localhost:8080/";},
+        )
+      }
     end
 
-    context 'ensure=absent' do
-      let(:params) { { :proxy => { 'ensure' => 'absent'} } }
-      it { is_expected.to contain_apt__setting('conf-proxy').with({
-        :ensure   => 'absent',
-        :priority => '01',
-      })}
+    context 'when host=localhost and direct=true' do
+      let(:params) { { proxy: { 'host' => 'localhost', 'direct' => true } } }
+
+      it {
+        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+          %r{Acquire::http::proxy "http://localhost:8080/";},
+        ).with_content(
+          %r{Acquire::https::proxy "DIRECT";},
+        )
+      }
+    end
+
+    context 'when host=localhost and https=true and direct=true' do
+      let(:params) { { proxy: { 'host' => 'localhost', 'https' => true, 'direct' => true } } }
+
+      it {
+        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+          %r{Acquire::http::proxy "http://localhost:8080/";},
+        ).with_content(
+          %r{Acquire::https::proxy "https://localhost:8080/";},
+        )
+      }
+      it {
+        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+          %r{Acquire::http::proxy "http://localhost:8080/";},
+        ).without_content(
+          %r{Acquire::https::proxy "DIRECT";},
+        )
+      }
+    end
+
+    context 'when ensure=absent' do
+      let(:params) { { proxy: { 'ensure' => 'absent' } } }
+
+      it {
+        is_expected.to contain_apt__setting('conf-proxy').with(ensure: 'absent',
+                                                               priority: '01')
+      }
     end
   end
-  context 'lots of non-defaults' do
+  context 'with lots of non-defaults' do
     let :params do
       {
-        :update => { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
-        :purge  => { 'sources.list' => false, 'sources.list.d' => false,
-                     'preferences' => false, 'preferences.d' => false, },
+        update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
+        purge: { 'sources.list' => false, 'sources.list.d' => false,
+                 'preferences' => false, 'preferences.d' => false,
+                 'apt.conf.d' => false },
       }
     end
 
-    it { is_expected.to contain_file('sources.list').with({
-      :content => nil,
-    })}
+    it {
+      is_expected.to contain_file('sources.list').with(content: nil)
+    }
 
-    it { is_expected.to contain_file('sources.list.d').with({
-      :purge   => false,
-      :recurse => false,
-    })}
+    it {
+      is_expected.to contain_file('sources.list.d').with(purge: false,
+                                                         recurse: false)
+    }
 
-    it { is_expected.to contain_file('preferences').with({
-      :ensure => 'file',
-    })}
+    it {
+      is_expected.to contain_file('preferences').with(ensure: 'file')
+    }
 
-    it { is_expected.to contain_file('preferences.d').with({
-      :purge   => false,
-      :recurse => false,
-    })}
+    it {
+      is_expected.to contain_file('preferences.d').with(purge: false,
+                                                        recurse: false)
+    }
 
-    it { is_expected.to contain_exec('apt_update').with({
-      :refreshonly => false,
-      :timeout     => 1,
-      :tries       => 3,
-    })}
+    it {
+      is_expected.to contain_file('apt.conf.d').with(purge: false,
+                                                     recurse: false)
+    }
 
+    it {
+      is_expected.to contain_exec('apt_update').with(refreshonly: false,
+                                                     timeout: 1,
+                                                     tries: 3)
+    }
   end
 
-  context 'with sources defined on valid osfamily' do
-    let :facts do
-      { :os => { :family => 'Debian', :name => 'Ubuntu', :release => { :major => '12', :full => '12.04' }},
-        :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'Ubuntu',
-        :lsbdistrelease  => '12.04',
-        :puppetversion   => Puppet.version,
+  context 'with lots of non-defaults' do
+    let :params do
+      {
+        update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
+        purge: { 'sources.list' => true, 'sources.list.d' => true,
+                 'preferences' => true, 'preferences.d' => true,
+                 'apt.conf.d' => true },
+      }
+    end
+
+    it {
+      is_expected.to contain_file('sources.list').with(content: "# Repos managed by puppet.\n")
+    }
+
+    it {
+      is_expected.to contain_file('sources.list.d').with(purge: true,
+                                                         recurse: true)
+    }
+
+    it {
+      is_expected.to contain_file('preferences').with(ensure: 'absent')
+    }
+
+    it {
+      is_expected.to contain_file('preferences.d').with(purge: true,
+                                                        recurse: true)
+    }
+
+    it {
+      is_expected.to contain_file('apt.conf.d').with(purge: true,
+                                                     recurse: true)
+    }
+
+    it {
+      is_expected.to contain_exec('apt_update').with(refreshonly: false,
+                                                     timeout: 1,
+                                                     tries: 3)
+    }
+  end
+
+  context 'with defaults for sources_list_force' do
+    let :params do
+      {
+        update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
+        purge: { 'sources.list' => true },
+        sources_list_force: false,
+      }
+    end
+
+    it {
+      is_expected.to contain_file('sources.list').with(content: "# Repos managed by puppet.\n")
+    }
+  end
+
+  context 'with non defaults for sources_list_force' do
+    let :params do
+      {
+        update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
+        purge: { 'sources.list' => true },
+        sources_list_force: true,
       }
     end
-    let(:params) { { :sources => {
-      'debian_unstable' => {
-        'location'          => 'http://debian.mirror.iweb.ca/debian/',
-        'release'           => 'unstable',
-        'repos'             => 'main contrib non-free',
-        'key'               => { 'id' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', 'server' => 'subkeys.pgp.net' },
-        'pin'               => '-10',
-        'include'           => {'src' => true,},
+
+    it {
+      is_expected.to contain_file('sources.list').with(ensure: 'absent')
+    }
+  end
+
+  context 'with entries for /etc/apt/auth.conf' do
+    facts_hash = {
+      'Ubuntu 14.04' => {
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'trusty',
+        lsbdistid: 'Ubuntu',
+        lsbdistrelease: '14.04',
+      },
+      'Ubuntu 16.04' => {
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'xenial',
+        lsbdistid: 'Ubuntu',
+        lsbdistrelease: '16.04',
+      },
+      'Ubuntu 18.04' => {
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '18', full: '18.04' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'bionic',
+        lsbdistid: 'Ubuntu',
+        lsbdistrelease: '18.04',
+      },
+      'Debian 7.0' => {
+        os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+        lsbdistid: 'Debian',
+        osfamily: 'Debian',
+        lsbdistcodename: 'wheezy',
+      },
+      'Debian 8.0' => {
+        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
+        lsbdistid: 'Debian',
+        osfamily: 'Debian',
+        lsbdistcodename: 'jessie',
       },
-      'puppetlabs' => {
-        'location'   => 'http://apt.puppetlabs.com',
-        'repos'      => 'main',
-        'key'        => { 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu' },
+      'Debian 9.0' => {
+        os: { family: 'Debian', name: 'Debian', release: { major: '9', full: '9.0' } },
+        lsbdistid: 'Debian',
+        osfamily: 'Debian',
+        lsbdistcodename: 'stretch',
+      },
+      'Debian 10.0' => {
+        os: { family: 'Debian', name: 'Debian', release: { major: '10', full: '10.0' } },
+        lsbdistid: 'Debian',
+        osfamily: 'Debian',
+        lsbdistcodename: 'buster',
+      },
+    }
+
+    facts_hash.each do |os, facts|
+      context "on #{os}" do
+        let(:facts) do
+          facts
+        end
+        let(:params) do
+          {
+            auth_conf_entries: [
+              {
+                machine: 'deb.example.net',
+                login: 'foologin',
+                password: 'secret',
+              },
+              {
+                machine: 'apt.example.com',
+                login: 'aptlogin',
+                password: 'supersecret',
+              },
+            ],
+          }
+        end
+
+        context 'with manage_auth_conf => true' do
+          let(:params) do
+            super().merge(manage_auth_conf: true)
+          end
+
+          # Going forward starting with Ubuntu 16.04 and Debian 9.0
+          # /etc/apt/auth.conf is owned by _apt. In previous versions it is
+          # root.
+          auth_conf_owner = case os
+                            when 'Ubuntu 14.04', 'Debian 7.0', 'Debian 8.0'
+                              'root'
+                            else
+                              '_apt'
+                            end
+
+          auth_conf_content = "// This file is managed by Puppet. DO NOT EDIT.
+machine deb.example.net login foologin password secret
+machine apt.example.com login aptlogin password supersecret
+"
+
+          it {
+            is_expected.to contain_file('/etc/apt/auth.conf').with(ensure: 'present',
+                                                                   owner: auth_conf_owner,
+                                                                   group: 'root',
+                                                                   mode: '0600',
+                                                                   notify: 'Class[Apt::Update]',
+                                                                   content: sensitive(auth_conf_content))
+          }
+        end
+
+        context 'with manage_auth_conf => false' do
+          let(:params) do
+            super().merge(manage_auth_conf: false)
+          end
+
+          it {
+            is_expected.not_to contain_file('/etc/apt/auth.conf')
+          }
+        end
+      end
+
+      context 'with improperly specified entries for /etc/apt/auth.conf' do
+        let(:params) do
+          {
+            auth_conf_entries: [
+              {
+                machinn: 'deb.example.net',
+                username: 'foologin',
+                password: 'secret',
+              },
+              {
+                machine: 'apt.example.com',
+                login: 'aptlogin',
+                password: 'supersecret',
+              },
+            ],
+          }
+        end
+
+        it { is_expected.to raise_error(Puppet::Error) }
+      end
+    end
+  end
+
+  context 'with sources defined on valid osfamily' do
+    let :facts do
+      {
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'xenial',
+        lsbdistid: 'Ubuntu',
+        lsbdistrelease: '16.04',
       }
-    } } }
+    end
+    let(:params) do
+      { sources: {
+        'debian_unstable' => {
+          'location'          => 'http://debian.mirror.iweb.ca/debian/',
+          'release'           => 'unstable',
+          'repos'             => 'main contrib non-free',
+          'key'               => { 'id' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', 'server' => 'subkeys.pgp.net' },
+          'pin'               => '-10',
+          'include'           => { 'src' => true },
+        },
+        'puppetlabs' => {
+          'location' => 'http://apt.puppetlabs.com',
+          'repos'      => 'main',
+          'key'        => { 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu' },
+        },
+      } }
+    end
 
     it {
-      is_expected.to contain_apt__setting('list-debian_unstable').with({
-        :ensure => 'present',
-      })
+      is_expected.to contain_apt__setting('list-debian_unstable').with(ensure: 'present')
     }
 
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/debian_unstable.list').with_content(/^deb http:\/\/debian.mirror.iweb.ca\/debian\/ unstable main contrib non-free$/) }
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/debian_unstable.list').with_content(/^deb-src http:\/\/debian.mirror.iweb.ca\/debian\/ unstable main contrib non-free$/) }
+    it { is_expected.to contain_file('/etc/apt/sources.list.d/debian_unstable.list').with_content(%r{^deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free$}) }
+    it { is_expected.to contain_file('/etc/apt/sources.list.d/debian_unstable.list').with_content(%r{^deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free$}) }
 
     it {
-      is_expected.to contain_apt__setting('list-puppetlabs').with({
-        :ensure => 'present',
-      })
+      is_expected.to contain_apt__setting('list-puppetlabs').with(ensure: 'present')
     }
 
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(/^deb http:\/\/apt.puppetlabs.com precise main$/) }
+    it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com xenial main$}) }
   end
 
   context 'with confs defined on valid osfamily' do
     let :facts do
-      { :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'Debian',
-        :puppetversion   => Puppet.version,
+      {
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'xenial',
+        lsbdistid: 'Ubuntu',
       }
     end
-    let(:params) { { :confs => {
-      'foo' => {
-        'content' => 'foo',
-      },
-      'bar' => {
-        'content' => 'bar',
-      }
-    } } }
+    let(:params) do
+      { confs: {
+        'foo' => {
+          'content' => 'foo',
+        },
+        'bar' => {
+          'content' => 'bar',
+        },
+      } }
+    end
 
-    it { is_expected.to contain_apt__conf('foo').with({
-        :content => 'foo',
-    })}
+    it {
+      is_expected.to contain_apt__conf('foo').with(content: 'foo')
+    }
 
-    it { is_expected.to contain_apt__conf('bar').with({
-        :content => 'bar',
-    })}
+    it {
+      is_expected.to contain_apt__conf('bar').with(content: 'bar')
+    }
   end
 
   context 'with keys defined on valid osfamily' do
     let :facts do
-      { :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'Debian',
-        :puppetversion   => Puppet.version,
+      {
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'xenial',
+        lsbdistid: 'Ubuntu',
       }
     end
-    let(:params) { { :keys => {
-      '55BE302B' => {
-        'server' => 'subkeys.pgp.net',
-      },
-      'EF8D349F' => {
-        'server' => 'pgp.mit.edu',
-      }
-    } } }
+    let(:params) do
+      { keys: {
+        '55BE302B' => {
+          'server' => 'subkeys.pgp.net',
+        },
+        'EF8D349F' => {
+          'server' => 'pgp.mit.edu',
+        },
+      } }
+    end
 
-    it { is_expected.to contain_apt__key('55BE302B').with({
-        :server => 'subkeys.pgp.net',
-    })}
+    it {
+      is_expected.to contain_apt__key('55BE302B').with(server: 'subkeys.pgp.net')
+    }
 
-    it { is_expected.to contain_apt__key('EF8D349F').with({
-        :server => 'pgp.mit.edu',
-    })}
+    it {
+      is_expected.to contain_apt__key('EF8D349F').with(server: 'pgp.mit.edu')
+    }
   end
 
   context 'with ppas defined on valid osfamily' do
     let :facts do
-      { :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'ubuntu',
-        :lsbdistrelease  => '12.04',
-        :puppetversion   => Puppet.version,
+      {
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'xenial',
+        lsbdistid: 'Ubuntu',
+        lsbdistrelease: '16.04',
       }
     end
-    let(:params) { { :ppas => {
-      'ppa:drizzle-developers/ppa' => {},
-      'ppa:nginx/stable' => {},
-    } } }
+    let(:params) do
+      { ppas: {
+        'ppa:drizzle-developers/ppa' => {},
+        'ppa:nginx/stable' => {},
+      } }
+    end
 
-    it { is_expected.to contain_apt__ppa('ppa:drizzle-developers/ppa')}
-    it { is_expected.to contain_apt__ppa('ppa:nginx/stable')}
+    it { is_expected.to contain_apt__ppa('ppa:drizzle-developers/ppa') }
+    it { is_expected.to contain_apt__ppa('ppa:nginx/stable') }
   end
 
   context 'with settings defined on valid osfamily' do
     let :facts do
-      { :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'Debian',
-        :puppetversion   => Puppet.version,
+      {
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'xenial',
+        lsbdistid: 'Ubuntu',
       }
     end
-    let(:params) { { :settings => {
-      'conf-banana' => { 'content' => 'banana' },
-      'pref-banana' => { 'content' => 'banana' },
-    } } }
+    let(:params) do
+      { settings: {
+        'conf-banana' => { 'content' => 'banana' },
+        'pref-banana' => { 'content' => 'banana' },
+      } }
+    end
 
-    it { is_expected.to contain_apt__setting('conf-banana')}
-    it { is_expected.to contain_apt__setting('pref-banana')}
+    it { is_expected.to contain_apt__setting('conf-banana') }
+    it { is_expected.to contain_apt__setting('pref-banana') }
   end
 
   context 'with pins defined on valid osfamily' do
     let :facts do
-      { :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'Debian',
-        :puppetversion   => Puppet.version,
+      {
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'xenial',
+        lsbdistid: 'Ubuntu',
       }
     end
-    let(:params) { { :pins => {
-      'stable' => { 'priority' => 600, 'order' => 50 },
-      'testing' =>  { 'priority' => 700, 'order' => 100 },
-    } } }
+    let(:params) do
+      { pins: {
+        'stable' => { 'priority' => 600, 'order' => 50 },
+        'testing' =>  { 'priority' => 700, 'order' => 100 },
+      } }
+    end
 
     it { is_expected.to contain_apt__pin('stable') }
     it { is_expected.to contain_apt__pin('testing') }
   end
 
   describe 'failing tests' do
-    context "purge['sources.list']=>'banana'" do
-      let(:params) { { :purge => { 'sources.list' => 'banana' }, } }
+    context "with purge['sources.list']=>'banana'" do
+      let(:params) { { purge: { 'sources.list' => 'banana' } } }
+
       it do
-        expect {
-          subject.call
-        }.to raise_error(Puppet::Error)
+        is_expected.to raise_error(Puppet::Error)
       end
     end
 
-    context "purge['sources.list.d']=>'banana'" do
-      let(:params) { { :purge => { 'sources.list.d' => 'banana' }, } }
+    context "with purge['sources.list.d']=>'banana'" do
+      let(:params) { { purge: { 'sources.list.d' => 'banana' } } }
+
       it do
-        expect {
-          subject.call
-        }.to raise_error(Puppet::Error)
+        is_expected.to raise_error(Puppet::Error)
       end
     end
 
-    context "purge['preferences']=>'banana'" do
-      let(:params) { { :purge => { 'preferences' => 'banana' }, } }
+    context "with purge['preferences']=>'banana'" do
+      let(:params) { { purge: { 'preferences' => 'banana' } } }
+
       it do
-        expect {
-          subject.call
-        }.to raise_error(Puppet::Error)
+        is_expected.to raise_error(Puppet::Error)
       end
     end
 
-    context "purge['preferences.d']=>'banana'" do
-      let(:params) { { :purge => { 'preferences.d' => 'banana' }, } }
+    context "with purge['preferences.d']=>'banana'" do
+      let(:params) { { purge: { 'preferences.d' => 'banana' } } }
+
       it do
-        expect {
-          subject.call
-        }.to raise_error(Puppet::Error)
+        is_expected.to raise_error(Puppet::Error)
       end
     end
 
-    context 'with unsupported osfamily' do
-      let :facts do
-        { :osfamily => 'Darwin', :puppetversion   => Puppet.version,}
-      end
+    context "with purge['apt.conf.d']=>'banana'" do
+      let(:params) { { purge: { 'apt.conf.d' => 'banana' } } }
 
       it do
-        expect {
-          subject.call
-        }.to raise_error(Puppet::Error, /This module only works on Debian or derivatives like Ubuntu/)
+        is_expected.to raise_error(Puppet::Error)
       end
     end
   end