Merge pull request puppetlabs#1024 from david22swan/MODULES-7827

(MODULES-7827) - Update to pre test logic for puppet 6

Author: eimlav

spec/spec_helper_acceptance.rb

@@ -62,7 +62,7 @@ def psql(psql_cmd, user = 'postgres', exit_codes = [0, 1], &block)
 
   # 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'))
     # Set up selinux if appropriate.
     if fact('osfamily') == 'RedHat' && fact('selinux') == 'true'
       pp = <<-EOS