Code Review / puppet-modules / puppetlabs-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 1: 7a52dc6)
Merge pull request #796 from david22swan/MODULES-7827
authorEimhin Laverty <eimlav@users.noreply.github.com>
Thu, 20 Sep 2018 12:54:14 +0000 (13:54 +0100)
committerGitHub <noreply@github.com>
Thu, 20 Sep 2018 12:54:14 +0000 (13:54 +0100)
(MODULES-7827) - Update to i18n test logic to account for puppet 6

spec/spec_helper_acceptance.rb patch | blob | history

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index a7bd4f441ca7be72d6cbfd8f308e601d448edafb..a6f3d853b6115a6f0fbefc97307548f6d7f07607 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -50,7 +50,7 @@ RSpec.configure do |c|
 
   # Configure all nodes in nodeset
   c.before :suite do
-    run_puppet_access_login(user: 'admin') if pe_install? && puppet_version =~ %r{(5\.\d\.\d)}
+    run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
 
     hosts.each do |host|
       # This will be removed, this is temporary to test localisation.