Merge pull request #203 from puppetlabs/MODULES-4528

[MODULES-4528] Replace Puppet.version comparison with Puppet::Util::Package.versioncmp
puppetlabs · Mar 21, 2017 · ce20bc5 · ce20bc5
2 parents b9e17b1 + 90bef26
commit ce20bc5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/metadata.json b/metadata.json
@@ -27,10 +27,6 @@
     }
   ],
   "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": ">= 3.7.0 < 2016.4.0"
-    },
     {
       "name": "puppet",
       "version_requirement": ">=3.7.0 < 5.0.0"

diff --git a/spec/defines/login/permissions_spec.rb b/spec/defines/login/permissions_spec.rb
@@ -14,7 +14,7 @@
       } }
       let(:raise_error_check) { 'Login must be between 1 and 128 characters' }
       describe 'missing' do
-        if Puppet.version < '4.3.0'
+        if Puppet::Util::Package.versioncmp(Puppet.version, '4.3.0') < 0
           let(:raise_error_check) { 'Must pass login to Sqlserver::Login::Permissions[myTitle]' }
         else
           let(:raise_error_check) { "expects a value for parameter 'login'" }

diff --git a/spec/defines/user/permissions_spec.rb b/spec/defines/user/permissions_spec.rb
@@ -15,7 +15,7 @@
       } }
       let(:raise_error_check) { 'User must be between 1 and 128 characters' }
       describe 'missing' do
-        if Puppet.version < '4.3.0'
+        if Puppet::Util::Package.versioncmp(Puppet.version, '4.3.0') < 0
           let(:raise_error_check) { 'Must pass user to Sqlserver::User::Permissions[myTitle]' }
         else
           let(:raise_error_check) { "expects a value for parameter 'user'" }