X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fhas_ip_address_spec.rb;h=8fbde610e2d6011f5955f717cc16a475b0a11bb4;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=0df12a7be3444c1b15942c0f3537cfc4e9792fd1;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/has_ip_address_spec.rb b/3rdparty/modules/stdlib/spec/functions/has_ip_address_spec.rb
old mode 100755
new mode 100644
index 0df12a7be..8fbde610e
--- a/3rdparty/modules/stdlib/spec/functions/has_ip_address_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/has_ip_address_spec.rb
@@ -1,39 +1,23 @@
-#!/usr/bin/env ruby -S rspec
 require 'spec_helper'
 
-describe Puppet::Parser::Functions.function(:has_ip_address) do
-
-  let(:scope) do
-    PuppetlabsSpec::PuppetInternals.scope
-  end
-
-  subject do
-    function_name = Puppet::Parser::Functions.function(:has_ip_address)
-    scope.method(function_name)
-  end
-
-  context "On Linux Systems" do
-    before :each do
-      scope.stubs(:lookupvar).with('interfaces').returns('eth0,lo')
-      scope.stubs(:lookupvar).with('ipaddress').returns('10.0.2.15')
-      scope.stubs(:lookupvar).with('ipaddress_eth0').returns('10.0.2.15')
-      scope.stubs(:lookupvar).with('ipaddress_lo').returns('127.0.0.1')
-    end
-
-    it 'should have primary address (10.0.2.15)' do
-      expect(subject.call(['10.0.2.15'])).to be_truthy
-    end
-
-    it 'should have lookupback address (127.0.0.1)' do
-      expect(subject.call(['127.0.0.1'])).to be_truthy
+describe 'has_ip_address' do
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
+  it { is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
+
+  context 'when on Linux Systems' do
+    let(:facts) do
+      {
+        :interfaces => 'eth0,lo',
+        :ipaddress => '10.0.0.1',
+        :ipaddress_lo => '127.0.0.1',
+        :ipaddress_eth0 => '10.0.0.1',
+      }
     end
 
-    it 'should not have other address' do
-      expect(subject.call(['192.1681.1.1'])).to be_falsey
-    end
-
-    it 'should not have "mspiggy" on an interface' do
-      expect(subject.call(['mspiggy'])).to be_falsey
-    end
+    it { is_expected.to run.with_params('127.0.0.1').and_return(true) }
+    it { is_expected.to run.with_params('10.0.0.1').and_return(true) }
+    it { is_expected.to run.with_params('8.8.8.8').and_return(false) }
+    it { is_expected.to run.with_params('invalid').and_return(false) }
   end
 end