X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_spec.rb;h=0c6333ba844a91db2b697956421b565ff1601534;hb=125a45c0ff330f680508f8142a7a81401e6bbf8b;hp=e743a0db67ef99b40f5e13b68f362a0bea030c64;hpb=f610bedc5f33db5fdee2ad49eeda95268ab0b9a5;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index e743a0d..0c6333b 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -1,4 +1,37 @@
 require 'spec_helper'
+
+sources_list = {  ensure: 'file',
+                  path: '/etc/apt/sources.list',
+                  owner: 'root',
+                  group: 'root',
+                  mode: '0644',
+                  notify: 'Class[Apt::Update]' }
+
+sources_list_d = { ensure: 'directory',
+                   path: '/etc/apt/sources.list.d',
+                   owner: 'root',
+                   group: 'root',
+                   mode: '0644',
+                   purge: false,
+                   recurse: false,
+                   notify: 'Class[Apt::Update]' }
+
+preferences = { ensure: 'file',
+                path: '/etc/apt/preferences',
+                owner: 'root',
+                group: 'root',
+                mode: '0644',
+                notify: 'Class[Apt::Update]' }
+
+preferences_d = { ensure: 'directory',
+                  path: '/etc/apt/preferences.d',
+                  owner: 'root',
+                  group: 'root',
+                  mode: '0644',
+                  purge: false,
+                  recurse: false,
+                  notify: 'Class[Apt::Update]' }
+
 describe 'apt' do
   let(:facts) do
     {
@@ -10,51 +43,29 @@ describe 'apt' do
     }
   end
 
-  context 'defaults' do
+  context 'with 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]')
+      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(ensure: 'directory',
-                                                                                                  path: '/etc/apt/sources.list.d',
-                                                                                                  owner: 'root',
-                                                                                                  group: 'root',
-                                                                                                  mode: '0644',
-                                                                                                  purge: false,
-                                                                                                  recurse: false,
-                                                                                                  notify: 'Class[Apt::Update]')
+      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(ensure: 'file',
-                                                                                               path: '/etc/apt/preferences',
-                                                                                               owner: 'root',
-                                                                                               group: 'root',
-                                                                                               mode: '0644',
-                                                                                               notify: 'Class[Apt::Update]')
+      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(ensure: 'directory',
-                                                                                                 path: '/etc/apt/preferences.d',
-                                                                                                 owner: 'root',
-                                                                                                 group: 'root',
-                                                                                                 mode: '0644',
-                                                                                                 purge: false,
-                                                                                                 recurse: false,
-                                                                                                 notify: 'Class[Apt::Update]')
+      is_expected.to contain_file('preferences.d').that_notifies('Class[Apt::Update]').only_with(preferences_d)
     }
 
     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',
                                                                              mode: '0644',
-                                                                             owner: 'root').with_content(/APT::Update::Post-Invoke-Success \{"touch \/var\/lib\/apt\/periodic\/update-success-stamp 2>\/dev\/null \|\| true";\};/) # rubocop:disable Metrics/LineLength
+                                                                             owner: 'root').with_content(
+                                                                               %r{APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};},
+                                                                             )
     end
 
     it {
@@ -65,43 +76,74 @@ describe 'apt' do
   end
 
   describe 'proxy=' do
-    context 'host=localhost' do
+    context 'when 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\/";/,
+          %r{Acquire::http::proxy "http://localhost:8080/";},
         ).without_content(
           %r{Acquire::https::proxy},
         )
       }
     end
 
-    context 'host=localhost and port=8180' do
+    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(
-          /Acquire::http::proxy "http:\/\/localhost:8180\/";/,
+          %r{Acquire::http::proxy "http://localhost:8180/";},
         ).without_content(
           %r{Acquire::https::proxy},
         )
       }
     end
 
-    context 'host=localhost and https=true' do
+    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(
-          /Acquire::http::proxy "http:\/\/localhost:8080\/";/,
+          %r{Acquire::http::proxy "http://localhost:8080/";},
+        ).with_content(
+          %r{Acquire::https::proxy "https://localhost:8080/";},
+        )
+      }
+    end
+
+    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(
-          /Acquire::https::proxy "https:\/\/localhost:8080\/";/,
+          %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 'ensure=absent' do
+    context 'when ensure=absent' do
       let(:params) { { proxy: { 'ensure' => 'absent' } } }
 
       it {
@@ -110,7 +152,7 @@ describe 'apt' do
       }
     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 },
@@ -175,14 +217,14 @@ describe 'apt' do
       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')
     }
 
-    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 precise main$}) }
   end
 
   context 'with confs defined on valid osfamily' do
@@ -310,43 +352,35 @@ describe 'apt' do
   end
 
   describe 'failing tests' do
-    context "purge['sources.list']=>'banana'" do
+    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
+    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
+    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
+    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
   end