Update stdlib and concat to 6.1.0 both

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / spec / functions / is_domain_name_spec.rb

diff --git a/3rdparty/modules/stdlib/spec/functions/is_domain_name_spec.rb b/3rdparty/modules/stdlib/spec/functions/is_domain_name_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index c1bf0e3..16caa8a
--- a/3rdparty/modules/stdlib/spec/functions/is_domain_name_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/is_domain_name_spec.rb
@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'is_domain_name' do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
-  it { is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
+  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) }
   it { is_expected.to run.with_params(1).and_return(false) }
   it { is_expected.to run.with_params([]).and_return(false) }
   it { is_expected.to run.with_params({}).and_return(false) }
@@ -19,24 +19,30 @@ describe 'is_domain_name' do
   it { is_expected.to run.with_params('2foo.example.com.').and_return(true) }
   it { is_expected.to run.with_params('www.2foo.example.com').and_return(true) }
   it { is_expected.to run.with_params('www.2foo.example.com.').and_return(true) }
+  it { is_expected.to run.with_params(true).and_return(false) }
+
   describe 'inputs with spaces' do
     it { is_expected.to run.with_params('invalid domain').and_return(false) }
   end
+
   describe 'inputs with hyphens' do
     it { is_expected.to run.with_params('foo-bar.example.com').and_return(true) }
     it { is_expected.to run.with_params('foo-bar.example.com.').and_return(true) }
     it { is_expected.to run.with_params('www.foo-bar.example.com').and_return(true) }
     it { is_expected.to run.with_params('www.foo-bar.example.com.').and_return(true) }
     it { is_expected.to run.with_params('-foo.example.com').and_return(false) }
-    it { is_expected.to run.with_params('-foo.example.com').and_return(false) }
+    it { is_expected.to run.with_params('-foo.example.com.').and_return(false) }
   end
+
   # Values obtained from Facter values will be frozen strings
   # in newer versions of Facter:
   it { is_expected.to run.with_params('www.example.com'.freeze).and_return(true) }
+
   describe 'top level domain must be alphabetic if there are multiple labels' do
     it { is_expected.to run.with_params('2com').and_return(true) }
     it { is_expected.to run.with_params('www.example.2com').and_return(false) }
   end
+
   describe 'IP addresses are not domain names' do
     it { is_expected.to run.with_params('192.168.1.1').and_return(false) }
   end