X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=spec%2Fclasses%2Fapt_spec.rb;h=51cc7eb459080d331faca4f4d37804a97a8a7cd7;hb=refs%2Fheads%2FCONT-581;hp=65ae50b2aa664a6383613eb362bbab1579923bf8;hpb=4513a5845c2a18aece7e17ad82612ec4da3efaa0;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index 65ae50b..51cc7eb 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -46,13 +46,13 @@ describe 'apt' do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
 
@@ -234,13 +234,13 @@ describe 'apt' do
     end
   end
 
-  context 'with lots of non-defaults' do
+  context 'with lots of non-defaults - one' do
     let :params do
       {
         update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
         purge: { 'sources.list' => false, 'sources.list.d' => false,
                  'preferences' => false, 'preferences.d' => false,
-                 'apt.conf.d' => false },
+                 'apt.conf.d' => false }
       }
     end
 
@@ -274,13 +274,13 @@ describe 'apt' do
     }
   end
 
-  context 'with lots of non-defaults' do
+  context 'with lots of non-defaults - two' 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 },
+                 'apt.conf.d' => true }
       }
     end
 
@@ -319,7 +319,7 @@ describe 'apt' do
       {
         update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
         purge: { 'sources.list' => true },
-        sources_list_force: false,
+        sources_list_force: false
       }
     end
 
@@ -333,7 +333,7 @@ describe 'apt' do
       {
         update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
         purge: { 'sources.list' => true },
-        sources_list_force: true,
+        sources_list_force: true
       }
     end
 
@@ -350,13 +350,13 @@ describe 'apt' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       },
       'Debian 9.0' => {
         os: {
@@ -364,13 +364,13 @@ describe 'apt' do
           name: 'Debian',
           release: {
             major: '9',
-            full: '9.0',
+            full: '9.0'
           },
           distro: {
             codename: 'stretch',
-            id: 'Debian',
-          },
-        },
+            id: 'Debian'
+          }
+        }
       },
       'Debian 10.0' => {
         os: {
@@ -378,18 +378,18 @@ describe 'apt' do
           name: 'Debian',
           release: {
             major: '10',
-            full: '10.0',
+            full: '10.0'
           },
           distro: {
             codename: 'buster',
-            id: 'Debian',
-          },
-        },
-      },
+            id: 'Debian'
+          }
+        }
+      }
     }
 
     facts_hash.each do |os, facts|
-      context "on #{os}" do
+      context "when on #{os}" do
         let(:facts) do
           facts
         end
@@ -399,14 +399,14 @@ describe 'apt' do
               {
                 machine: 'deb.example.net',
                 login: 'foologin',
-                password: 'secret',
+                password: 'secret'
               },
               {
                 machine: 'apt.example.com',
                 login: 'aptlogin',
-                password: 'supersecret',
+                password: 'supersecret'
               },
-            ],
+            ]
           }
         end
 
@@ -415,10 +415,11 @@ describe 'apt' do
             super().merge(manage_auth_conf: true)
           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
-"
+          auth_conf_content = <<~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
+          CONTENT
 
           it {
             expect(subject).to contain_file('/etc/apt/auth.conf').with(ensure: 'present',
@@ -448,14 +449,14 @@ machine apt.example.com login aptlogin password supersecret
               {
                 machinn: 'deb.example.net',
                 username: 'foologin',
-                password: 'secret',
+                password: 'secret'
               },
               {
                 machine: 'apt.example.com',
                 login: 'aptlogin',
-                password: 'supersecret',
+                password: 'supersecret'
               },
-            ],
+            ]
           }
         end
 
@@ -472,13 +473,13 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
@@ -489,13 +490,13 @@ machine apt.example.com login aptlogin password supersecret
           'repos' => 'main contrib non-free',
           'key' => { 'id' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', 'server' => 'subkeys.pgp.net' },
           'pin' => '-10',
-          'include' => { 'src' => true },
+          'include' => { 'src' => true }
         },
         'puppetlabs' => {
           'location' => 'http://apt.puppetlabs.com',
           'repos' => 'main',
-          'key' => { 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu' },
-        },
+          'key' => { 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu' }
+        }
       } }
     end
 
@@ -521,23 +522,23 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { confs: {
         'foo' => {
-          'content' => 'foo',
+          'content' => 'foo'
         },
         'bar' => {
-          'content' => 'bar',
-        },
+          'content' => 'bar'
+        }
       } }
     end
 
@@ -558,23 +559,23 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { keys: {
         '55BE302B' => {
-          'server' => 'subkeys.pgp.net',
+          'server' => 'subkeys.pgp.net'
         },
         'EF8D349F' => {
-          'server' => 'pgp.mit.edu',
-        },
+          'server' => 'pgp.mit.edu'
+        }
       } }
     end
 
@@ -595,19 +596,19 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { ppas: {
         'ppa:drizzle-developers/ppa' => {},
-        'ppa:nginx/stable' => {},
+        'ppa:nginx/stable' => {}
       } }
     end
 
@@ -623,19 +624,19 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { settings: {
         'conf-banana' => { 'content' => 'banana' },
-        'pref-banana' => { 'content' => 'banana' },
+        'pref-banana' => { 'content' => 'banana' }
       } }
     end
 
@@ -651,19 +652,19 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { pins: {
         'stable' => { 'priority' => 600, 'order' => 50 },
-        'testing' => { 'priority' => 700, 'order' => 100 },
+        'testing' => { 'priority' => 700, 'order' => 100 }
       } }
     end