From 3ed65c0d1b0af1e95a47440b1c2e32c2e00fbd41 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Tue, 7 Mar 2017 10:25:41 +0000
Subject: (FM-6085) - Unit tests for Data Types

---
 spec/aliases/absolute_path_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'spec/aliases/absolute_path_spec.rb')

diff --git a/spec/aliases/absolute_path_spec.rb b/spec/aliases/absolute_path_spec.rb
index 3fb9d12..eeda76a 100644
--- a/spec/aliases/absolute_path_spec.rb
+++ b/spec/aliases/absolute_path_spec.rb
@@ -15,6 +15,8 @@ if Puppet.version.to_f >= 4.5
         /
         /var/tmp
         /var/opt/../lib/puppet
+        /var/ůťƒ8
+        /var/ネット
       }.each do |value|
         describe value.inspect do
           let(:params) {{ value: value }}
@@ -50,6 +52,8 @@ if Puppet.version.to_f >= 4.5
           etc/puppetlabs/puppet
           opt/puppet/bin
           relative\\windows
+          \var\ůťƒ8
+          \var\ネット
         }.each do |value|
           describe value.inspect do
             let(:params) {{ value: value }}
-- 
cgit v1.2.3


From 318dcfaec6ba6d0e4af1e32e55ea20b721679537 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dominic@cleal.org>
Date: Tue, 14 Mar 2017 11:16:07 +0000
Subject: (MODULES-4528) Use versioncmp to check Puppet version for 4.10.x
 compat

`Puppet.version.to_f` on Puppet 4.10.0 will evaluate to `4.1`, causing
test and behavioural changes when conditionals check that the version is
equal or greater than versions such as `4.3`.

Version comparisons that are vulnerable to this have been changed to use
Puppet's versioncmp implementation, while most others only check for
for major version boundaries which is safe.
---
 spec/aliases/absolute_path_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/aliases/absolute_path_spec.rb')

diff --git a/spec/aliases/absolute_path_spec.rb b/spec/aliases/absolute_path_spec.rb
index eeda76a..0e9798e 100644
--- a/spec/aliases/absolute_path_spec.rb
+++ b/spec/aliases/absolute_path_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-if Puppet.version.to_f >= 4.5
+if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
   describe 'test::absolute_path', type: :class do
     describe 'valid paths handling' do
       %w{
-- 
cgit v1.2.3


From 0bca13947be9f55b7456cc78e2ba979bd7aa1c8c Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dominic@cleal.org>
Date: Wed, 15 Mar 2017 10:24:00 +0000
Subject: Permit double slash in absolute/Unix path types

---
 spec/aliases/absolute_path_spec.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'spec/aliases/absolute_path_spec.rb')

diff --git a/spec/aliases/absolute_path_spec.rb b/spec/aliases/absolute_path_spec.rb
index eeda76a..682c283 100644
--- a/spec/aliases/absolute_path_spec.rb
+++ b/spec/aliases/absolute_path_spec.rb
@@ -15,6 +15,7 @@ if Puppet.version.to_f >= 4.5
         /
         /var/tmp
         /var/opt/../lib/puppet
+        /var/opt//lib/puppet
         /var/ůťƒ8
         /var/ネット
       }.each do |value|
-- 
cgit v1.2.3