X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_backports_spec.rb;h=795344001f1ff2c6527f32a400ec818fd6bf70c0;hb=7e31732abd277c852564c10011099bdf6967dc4f;hp=215faaefecdc5f46507276c5c2d4f72d9cd4537f;hpb=3423414fec223617fafb0806c8147a96ebedc80e;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb
index 215faae..7953440 100644
--- a/spec/classes/apt_backports_spec.rb
+++ b/spec/classes/apt_backports_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apt::backports', type: :class do
@@ -7,17 +9,23 @@ describe 'apt::backports', type: :class do
     context 'with defaults on deb' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          osfamily: 'Debian',
-          lsbdistcodename: 'jessie',
-          puppetversion: Puppet.version,
+          os: {
+            family: 'Debian',
+            name: 'Debian',
+            release: {
+              major: '8',
+              full: '8.0',
+            },
+            distro: {
+              codename: 'jessie',
+              id: 'Debian',
+            },
+          },
         }
       end
 
       it {
         is_expected.to contain_apt__source('backports').with(location: 'http://deb.debian.org/debian',
-                                                             key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
                                                              repos: 'main contrib non-free',
                                                              release: 'jessie-backports',
                                                              pin: { 'priority' => 200, 'release' => 'jessie-backports' })
@@ -26,12 +34,18 @@ describe 'apt::backports', type: :class do
     context 'with defaults on ubuntu' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-          lsbdistid: 'Ubuntu',
-          osfamily: 'Debian',
-          lsbdistcodename: 'xenial',
-          lsbdistrelease: '16.04',
-          puppetversion: Puppet.version,
+          os: {
+            family: 'Debian',
+            name: 'Ubuntu',
+            release: {
+              major: '16',
+              full: '16.04',
+            },
+            distro: {
+              codename: 'xenial',
+              id: 'Ubuntu',
+            },
+          },
         }
       end
 
@@ -46,12 +60,18 @@ describe 'apt::backports', type: :class do
     context 'with everything set' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-          lsbdistid: 'Ubuntu',
-          osfamily: 'Debian',
-          lsbdistcodename: 'xenial',
-          lsbdistrelease: '16.04',
-          puppetversion: Puppet.version,
+          os: {
+            family: 'Debian',
+            name: 'Ubuntu',
+            release: {
+              major: '16',
+              full: '16.04',
+            },
+            distro: {
+              codename: 'xenial',
+              id: 'Ubuntu',
+            },
+          },
         }
       end
       let(:params) do
@@ -75,12 +95,18 @@ describe 'apt::backports', type: :class do
     context 'when set things with hashes' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-          lsbdistid: 'Ubuntu',
-          osfamily: 'Debian',
-          lsbdistcodename: 'xenial',
-          lsbdistrelease: '16.04',
-          puppetversion: Puppet.version,
+          os: {
+            family: 'Debian',
+            name: 'Ubuntu',
+            release: {
+              major: '16',
+              full: '16.04',
+            },
+            distro: {
+              codename: 'xenial',
+              id: 'Ubuntu',
+            },
+          },
         }
       end
       let(:params) do
@@ -103,11 +129,18 @@ describe 'apt::backports', type: :class do
   describe 'mint tests' do
     let(:facts) do
       {
-        os: { family: 'Debian', name: 'Linuxmint', release: { major: '17', full: '17' } },
-        lsbdistid: 'linuxmint',
-        osfamily: 'Debian',
-        lsbdistcodename: 'qiana',
-        puppetversion: Puppet.version,
+        os: {
+          family: 'Debian',
+          name: 'Linuxmint',
+          release: {
+            major: '17',
+            full: '17',
+          },
+          distro: {
+            codename: 'qiana',
+            id: 'linuxmint',
+          },
+        },
       }
     end
 
@@ -185,12 +218,18 @@ describe 'apt::backports', type: :class do
   describe 'validation' do
     let(:facts) do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-        lsbdistid: 'Ubuntu',
-        osfamily: 'Debian',
-        lsbdistcodename: 'xenial',
-        lsbdistrelease: '16.04',
-        puppetversion: Puppet.version,
+        os: {
+          family: 'Debian',
+          name: 'Ubuntu',
+          release: {
+            major: '16',
+            full: '16.04',
+          },
+          distro: {
+            codename: 'xenial',
+            id: 'Ubuntu',
+          },
+        },
       }
     end