Merge pull request #285 from HelenCampbell/release

Release prep 2.4.0

.gitignore

@@ -1,24 +1,23 @@
-#This file is generated by ModuleSync, do not edit.
-pkg/
-Gemfile.lock
-Gemfile.local
-vendor/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-log/
-junit/
-.vagrant/
-.bundle/
-coverage/
-log/
-.idea/
-.metadata
-*.iml
 .*.sw[op]
+.metadata
 .yardoc
 .yardwarns
-.DS_Store
-tmp/
-vendor/
-doc/
+*.iml
+/.bundle/
+/.idea/
+/.vagrant/
+/coverage/
+/bin/
+/doc/
+/Gemfile.local
+/Gemfile.lock
+/junit/
+/log/
+/log/
+/pkg/
+/spec/fixtures/manifests/
+/spec/fixtures/modules/
+/tmp/
+/vendor/
+/convert_report.txt
 

.rubocop.yml

@@ -1,7 +1,7 @@
 ---
-require:
- - rubocop-rspec
+require: rubocop-rspec
 AllCops:
+  DisplayCopNames: true
   TargetRubyVersion: '2.1'
   Include:
   - "./**/*.rb"
@@ -13,7 +13,6 @@ AllCops:
   - pkg/**/*
   - spec/fixtures/**/*
   - vendor/**/*
-inherit_from: .rubocop_todo.yml
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
@@ -70,6 +69,8 @@ Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
+Layout/EndOfLine:
+  Enabled: false
 Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
@@ -88,8 +89,14 @@ Metrics/PerceivedComplexity:
   Enabled: false
 RSpec/DescribeClass:
   Enabled: false
+RSpec/ExampleLength:
+  Enabled: false
 RSpec/MessageExpectation:
   Enabled: false
+RSpec/MultipleExpectations:
+  Enabled: false
+RSpec/NestedGroups:
+  Enabled: false
 Style/AsciiComments:
   Enabled: false
 Style/IfUnlessModifier:

.sync.yml

@@ -1,9 +1,61 @@
 ---
 appveyor.yml:
-  delete: true
-spec/spec_helper.rb:
-  allow_deprecations: true
+  environment:
+  PUPPET_GEM_VERSION: "~> 4.0"
+  matrix:
+    - RUBY_VERSION: 24-x64
+      CHECK: "syntax lint"
+    - RUBY_VERSION: 24-x64
+      CHECK: metadata_lint
+    - RUBY_VERSION: 24-x64
+      CHECK: rubocop
+    - RUBY_VERSION: 24-x64
+      PUPPET_GEM_VERSION: "~> 5.0"
+      CHECK: spec
+
 .travis.yml:
+  env:
+    - PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
+  bundle_args: --without system_tests
+  docker_sets:
+    - set: docker/centos-7
+      options:
+    - set: docker/ubuntu-14.04
+      options:
+  docker_defaults:
+    bundler_args: ""
+  secure: ""
+  branches:
+    - release
   extras:
-  - rvm: 2.1.9
-    script: bundle exec rake rubocop
+    - rvm: 2.1.9
+      script: "\"bundle exec rake release_checks\""
+
+Gemfile:
+  required:
+    ':system_tests':
+      - gem: 'puppet-module-posix-system-r#{minor_version}'
+        platforms: ruby
+      - gem: 'puppet-module-win-system-r#{minor_version}'
+        platforms:
+          - mswin
+          - mingw
+          - x64_mingw
+      - gem: beaker
+        version: '~> 3.13'
+        from_env: BEAKER_VERSION
+      - gem: beaker-abs
+        from_env: BEAKER_ABS_VERSION
+        version: '~> 0.1'
+      - gem: beaker-pe
+      - gem: beaker-hostgenerator
+        from_env: BEAKER_HOSTGENERATOR_VERSION
+      - gem: beaker-rspec
+        from_env: BEAKER_RSPEC_VERSION
+    ':development':
+      - gem: puppet-blacksmith
+        version: '~> 3.4'
+
+Rakefile:
+  requires:
+    - puppet_blacksmith/rake_tasks

.travis.yml

@@ -1,34 +1,64 @@
-#This file is generated by ModuleSync, do not edit.
 ---
 sudo: false
+dist: trusty
 language: ruby
 cache: bundler
-script: "bundle exec rake release_checks"
-#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
 before_install:
-  - gem update bundler
+  - bundle -v
+  - rm Gemfile.lock || true
+  - gem update --system
+  - gem --version
+  - bundle -v
+script:
+  - 'bundle exec rake $CHECK'
+bundler_args: --without system_tests
+rvm:
+  - 2.4.1
+  - 2.1.9
+env:
+  - PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
+  - PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
 matrix:
   fast_finish: true
   include:
-  - rvm: 2.3.1
-    dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
-    script: bundle exec rake beaker
-    services: docker
-    sudo: required
-  - rvm: 2.3.1
-    dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
-    script: bundle exec rake beaker
-    services: docker
-    sudo: required
-  - rvm: 2.4.1
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 5.0"
-  - rvm: 2.1.9
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0"
-  - rvm: 2.1.9
-    script: bundle exec rake rubocop
+    -
+      bundler_args: 
+      dist: trusty
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
+      rvm: 2.4.1
+      script: bundle exec rake beaker
+      services: docker
+      sudo: required
+    -
+      bundler_args: 
+      dist: trusty
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+      rvm: 2.4.1
+      script: bundle exec rake beaker
+      services: docker
+      sudo: required
+    -
+      env: CHECK=rubocop
+    -
+      env: CHECK="syntax lint"
+    -
+      env: CHECK=metadata_lint
+    -
+      rvm: 2.1.9
+      script: "bundle exec rake release_checks"
+branches:
+  only:
+    - master
+    - /^v\d/
+    - release
 notifications:
   email: false
+deploy:
+  provider: puppetforge
+  user: puppet
+  password:
+    secure: ""
+  on:
+    tags: true
+    all_branches: true
+    condition: "$DEPLOY_TO_FORGE = yes"

CHANGELOG.md

@@ -1,3 +1,14 @@
+## Supported Release [2.4.0]
+### Summary
+This release uses the PDK convert functionality which in return makes the module PDK compliant. Also includes a clean up from Rubocop.
+
+#### Changed
+- 1.3.2 PDK convert has been applied [MODULES-6456](https://tickets.puppetlabs.com/browse/MODULES-6456)
+- The modules has undergone a Rubocop cleanup.
+
+#### Fixed
+- $java_home for SLES 11.4 has been updated to the correct location.
+
 ## Supported Release [2.3.0]
 ### Summary
 This release is in order to implement Rubocop changes into the module.

Gemfile

@@ -1,76 +1,136 @@
-#This file is generated by ModuleSync, do not edit.
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
+def location_for(place_or_version, fake_version = nil)
+  if place_or_version =~ %r{\A(git[:@][^#]*)#(.*)}
+    [fake_version, { git: Regexp.last_match(1), branch: Regexp.last_match(2), require: false }].compact
+  elsif place_or_version =~ %r{\Afile:\/\/(.*)}
+    ['>= 0', { path: File.expand_path(Regexp.last_match(1)), require: false }]
+  else
+    [place_or_version, { require: false }]
+  end
+end
 
-# Determines what type of gem is requested based on place_or_version.
 def gem_type(place_or_version)
-  if place_or_version =~ /^git:/
+  if place_or_version =~ %r{\Agit[:@]}
     :git
-  elsif place_or_version =~ /^file:/
+  elsif !place_or_version.nil? && place_or_version.start_with?('file:')
     :file
   else
     :gem
   end
 end
 
-# Find a location or specific version for a gem. place_or_version can be a
-# version, which is most often used. It can also be git, which is specified as
-# `git://somewhere.git#branch`. You can also use a file source location, which
-# is specified as `file://some/location/on/disk`.
-def location_for(place_or_version, fake_version = nil)
-  if place_or_version =~ /^(git[:@][^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place_or_version =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place_or_version, { :require => false }]
-  end
-end
-
-# Used for gem conditionals
-supports_windows = false
 ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
-minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
+minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "puppet-module-posix-default-r#{minor_version}",    :require => false, :platforms => "ruby"
-  gem "puppet-module-win-default-r#{minor_version}",      :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "puppet-module-posix-dev-r#{minor_version}",        :require => false, :platforms => "ruby"
-  gem "puppet-module-win-dev-r#{minor_version}", '0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "json_pure", '<= 2.0.1',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem "fast_gettext", '1.1.0',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem "fast_gettext",                                     :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
+  gem "fast_gettext", '1.1.0',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
+  gem "fast_gettext",                                  require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
+  gem "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem "json", '= 1.8.1',                               require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
+  gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-blacksmith", '~> 3.4',                   require: false
 end
-
 group :system_tests do
-  gem "puppet-module-posix-system-r#{minor_version}",                            :require => false, :platforms => "ruby"
-  gem "puppet-module-win-system-r#{minor_version}",                              :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')                  
-  gem "beaker-pe",                                                               :require => false
-  gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])                
-  gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
+  gem "puppet-module-posix-system-r#{minor_version}",                            require: false, platforms: [:ruby]
+  gem "puppet-module-win-system-r#{minor_version}",                              require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.13')
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
-  gem "puppet-blacksmith", '~> 3.4',                                             :require => false
+  gem "beaker-pe",                                                               require: false
+  gem "beaker-hostgenerator"
+  gem "beaker-rspec"
 end
 
-gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
+puppet_version = ENV['PUPPET_GEM_VERSION']
+puppet_type = gem_type(puppet_version)
+facter_version = ENV['FACTER_GEM_VERSION']
+hiera_version = ENV['HIERA_GEM_VERSION']
 
-# Only explicitly specify Facter/Hiera if a version has been specified.
-# Otherwise it can lead to strange bundler behavior. If you are seeing weird
-# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable
-# to `1` and then run bundle install.
-gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
-gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']
-
-
-# Evaluate Gemfile.local if it exists
-if File.exists? "#{__FILE__}.local"
-  eval(File.read("#{__FILE__}.local"), binding)
+def puppet_older_than?(version)
+  puppet_version = ENV['PUPPET_GEM_VERSION']
+  !puppet_version.nil? &&
+    Gem::Version.correct?(puppet_version) &&
+    Gem::Requirement.new("< #{version}").satisfied_by?(Gem::Version.new(puppet_version.dup))
 end
 
-# Evaluate ~/.gemfile if it exists
-if File.exists?(File.join(Dir.home, '.gemfile'))
-  eval(File.read(File.join(Dir.home, '.gemfile')), binding)
+gems = {}
+
+gems['puppet'] = location_for(puppet_version)
+
+# If facter or hiera versions have been specified via the environment
+# variables, use those versions. If not, and if the puppet version is < 3.5.0,
+# use known good versions of both for puppet < 3.5.0.
+if facter_version
+  gems['facter'] = location_for(facter_version)
+elsif puppet_type == :gem && puppet_older_than?('3.5.0')
+  gems['facter'] = ['>= 1.6.11', '<= 1.7.5', require: false]
 end
 
-# vim:ft=ruby
+if hiera_version
+  gems['hiera'] = location_for(ENV['HIERA_GEM_VERSION'])
+elsif puppet_type == :gem && puppet_older_than?('3.5.0')
+  gems['hiera'] = ['>= 1.0.0', '<= 1.3.0', require: false]
+end
+
+if Gem.win_platform? && (puppet_type != :gem || puppet_older_than?('3.5.0'))
+  # For Puppet gems < 3.5.0 (tested as far back as 3.0.0) on Windows
+  if puppet_type == :gem
+    gems['ffi'] =            ['1.9.0',                require: false]
+    gems['minitar'] =        ['0.5.4',                require: false]
+    gems['win32-eventlog'] = ['0.5.3',    '<= 0.6.5', require: false]
+    gems['win32-process'] =  ['0.6.5',    '<= 0.7.5', require: false]
+    gems['win32-security'] = ['~> 0.1.2', '<= 0.2.5', require: false]
+    gems['win32-service'] =  ['0.7.2',    '<= 0.8.8', require: false]
+  else
+    gems['ffi'] =            ['~> 1.9.0',             require: false]
+    gems['minitar'] =        ['~> 0.5.4',             require: false]
+    gems['win32-eventlog'] = ['~> 0.5',   '<= 0.6.5', require: false]
+    gems['win32-process'] =  ['~> 0.6',   '<= 0.7.5', require: false]
+    gems['win32-security'] = ['~> 0.1',   '<= 0.2.5', require: false]
+    gems['win32-service'] =  ['~> 0.7',   '<= 0.8.8', require: false]
+  end
+
+  gems['win32-dir'] = ['~> 0.3', '<= 0.4.9', require: false]
+
+  if RUBY_VERSION.start_with?('1.')
+    gems['win32console'] = ['1.3.2', require: false]
+    # sys-admin was removed in Puppet 3.7.0 and doesn't compile under Ruby 2.x
+    gems['sys-admin'] =    ['1.5.6', require: false]
+  end
+
+  # Puppet < 3.7.0 requires these.
+  # Puppet >= 3.5.0 gem includes these as requirements.
+  # The following versions are tested to work with 3.0.0 <= puppet < 3.7.0.
+  gems['win32-api'] =           ['1.4.8', require: false]
+  gems['win32-taskscheduler'] = ['0.2.2', require: false]
+  gems['windows-api'] =         ['0.4.3', require: false]
+  gems['windows-pr'] =          ['1.2.3', require: false]
+elsif Gem.win_platform?
+  # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
+  # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
+  gems['win32-dir'] =      ['<= 0.4.9', require: false]
+  gems['win32-eventlog'] = ['<= 0.6.5', require: false]
+  gems['win32-process'] =  ['<= 0.7.5', require: false]
+  gems['win32-security'] = ['<= 0.2.5', require: false]
+  gems['win32-service'] =  ['<= 0.8.8', require: false]
+end
+
+gems.each do |gem_name, gem_params|
+  gem gem_name, *gem_params
+end
+
+# Evaluate Gemfile.local and ~/.gemfile if they exist
+extra_gemfiles = [
+  "#{__FILE__}.local",
+  File.join(Dir.home, '.gemfile'),
+]
+
+extra_gemfiles.each do |gemfile|
+  if File.file?(gemfile) && File.readable?(gemfile)
+    eval(File.read(gemfile), binding)
+  end
+end
+# vim: syntax=ruby

NOTICE

@@ -1,6 +1,6 @@
 Puppet Module - puppetlabs-java
 
-Copyright 2017 Puppet, Inc.
+Copyright 2018 Puppet, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

Rakefile

@@ -1,37 +1,3 @@
 require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
-
-PuppetLint.configuration.fail_on_warnings = true
-PuppetLint.configuration.send('relative')
-
-desc 'Generate pooler nodesets'
-task :gen_nodeset do
-  require 'beaker-hostgenerator'
-  require 'securerandom'
-  require 'fileutils'
-
-  agent_target = ENV['TEST_TARGET']
-  if ! agent_target
-    STDERR.puts 'TEST_TARGET environment variable is not set'
-    STDERR.puts 'setting to default value of "redhat-64default."'
-    agent_target = 'redhat-64default.'
-  end
-
-  master_target = ENV['MASTER_TEST_TARGET']
-  if ! master_target
-    STDERR.puts 'MASTER_TEST_TARGET environment variable is not set'
-    STDERR.puts 'setting to default value of "redhat7-64mdcl"'
-    master_target = 'redhat7-64mdcl'
-  end
-
-  targets = "#{master_target}-#{agent_target}"
-  cli = BeakerHostGenerator::CLI.new([targets])
-  nodeset_dir = "tmp/nodesets"
-  nodeset = "#{nodeset_dir}/#{targets}-#{SecureRandom.uuid}.yaml"
-  FileUtils.mkdir_p(nodeset_dir)
-  File.open(nodeset, 'w') do |fh|
-    fh.print(cli.execute)
-  end
-  puts nodeset
-end
+require 'puppet-syntax/tasks/puppet-syntax'
+require 'puppet_blacksmith/rake_tasks'

manifests/params.pp

@@ -224,7 +224,7 @@ class java::params {
           } elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) {
             $jdk_package = 'java-1_7_1-ibm-devel'
             $jre_package = 'java-1_7_1-ibm'
-            $java_home   = '/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/'
+            $java_home   = '/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/'
           } else {
             $jdk_package = 'java-1_6_0-ibm-devel'
             $jre_package = 'java-1_6_0-ibm'

metadata.json

@@ -1,12 +1,22 @@
 {
   "name": "puppetlabs-java",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "author": "puppetlabs",
   "summary": "Installs the correct Java package on various platforms.",
   "license": "Apache-2.0",
   "source": "git://github.com/puppetlabs/puppetlabs-java",
   "project_page": "https://github.com/puppetlabs/puppetlabs-java",
   "issues_url": "https://tickets.puppet.com/CreateIssueDetails!init.jspa?pid=10707&issuetype=1&team=Modules&customfield_14200=14302&labels=triage&customfield_10005=2147&summary=Issue+found+with+module%3A+puppetlabs-java",
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 4.13.1 < 5.0.0"
+    },
+    {
+      "name": "puppet/archive",
+      "version_requirement": ">= 1.1.0 < 3.0.0"
+    }
+  ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -86,14 +96,6 @@
       "version_requirement": ">= 4.7.0 < 6.0.0"
     }
   ],
-  "dependencies": [
-    {
-      "name":"puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 5.0.0"
-    },
-    {
-      "name":"puppet/archive",
-      "version_requirement": ">= 1.1.0 < 3.0.0"
-    }
-  ]
+  "template-url": "https://github.com/puppetlabs/pdk-templates",
+  "template-ref": "1.3.2-0-g07678c8"
 }

spec/acceptance/install_spec.rb

@@ -151,7 +151,7 @@ context 'oracle', if: (
   end
 end
 
-context 'failure cases' do
+context 'with failure cases' do
   # C14711
   # SLES 10 returns an exit code of 0 on zypper failure
   unless fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') < '11'

spec/classes/java_spec.rb

@@ -1,35 +1,35 @@
 require 'spec_helper'
 
 describe 'java', type: :class do
-  context 'select openjdk for Centos 5.8' do
+  context 'when select openjdk for Centos 5.8' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '5.8', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.6.0/') }
   end
 
-  context 'select openjdk for Centos 6.3' do
+  context 'when select openjdk for Centos 6.3' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '6.3', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
   end
 
-  context 'select openjdk for Centos 7.1.1503' do
+  context 'when select openjdk for Centos 7.1.1503' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '7.1.1503', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0/') }
   end
 
-  context 'select openjdk for Centos 6.2' do
+  context 'when select openjdk for Centos 6.2' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '6.2', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
     it { is_expected.not_to contain_exec('update-java-alternatives') }
   end
 
-  context 'select Oracle JRE with alternatives for Centos 6.3' do
+  context 'when select Oracle JRE with alternatives for Centos 6.3' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '6.3', architecture: 'x86_64' } }
     let(:params) { { 'package' => 'jre', 'java_alternative' => '/usr/bin/java', 'java_alternative_path' => '/usr/java/jre1.7.0_67/bin/java' } }
 
@@ -38,21 +38,21 @@ describe 'java', type: :class do
     it { is_expected.to contain_exec('update-java-alternatives').with_command('alternatives --set java /usr/java/jre1.7.0_67/bin/java') }
   end
 
-  context 'select openjdk for Fedora 20' do
+  context 'when select openjdk for Fedora 20' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Fedora', operatingsystemrelease: '20', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
   end
 
-  context 'select openjdk for Fedora 21' do
+  context 'when select openjdk for Fedora 21' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Fedora', operatingsystemrelease: '21', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-x86_64/') }
   end
 
-  context 'select passed value for Fedora 20' do
+  context 'when select passed value for Fedora 20' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Fedora', operatingsystemrelease: '20', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre', 'java_home' => '/usr/local/lib/jre/' } }
 
@@ -60,7 +60,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/local/lib/jre/') }
   end
 
-  context 'select passed value for Fedora 21' do
+  context 'when select passed value for Fedora 21' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Fedora', operatingsystemrelease: '21', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre', 'java_home' => '/usr/local/lib/jre/' } }
 
@@ -68,14 +68,14 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/local/lib/jre/') }
   end
 
-  context 'select passed value for Fedora 21 with yum option' do
+  context 'when select passed value for Fedora 21 with yum option' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Fedora', operatingsystemrelease: '21', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre', 'package_options' => ['--skip-broken'] } }
 
     it { is_expected.to contain_package('java') }
   end
 
-  context 'select passed value for Centos 5.3' do
+  context 'when select passed value for Centos 5.3' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '5.3', architecture: 'x86_64' } }
     let(:params) { { 'package' => 'jdk', 'java_home' => '/usr/local/lib/jre' } }
 
@@ -83,14 +83,14 @@ describe 'java', type: :class do
     it { is_expected.not_to contain_exec('update-java-alternatives') }
   end
 
-  context 'select default for Centos 5.3' do
+  context 'when select default for Centos 5.3' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '5.3', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
     it { is_expected.not_to contain_exec('update-java-alternatives') }
   end
 
-  context 'select default for Debian Wheezy' do
+  context 'when select default for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
 
     it { is_expected.to contain_package('java').with_name('openjdk-7-jdk') }
@@ -98,7 +98,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
   end
 
-  context 'select Oracle JRE for Debian Wheezy' do
+  context 'when select Oracle JRE for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'oracle-jre' } }
 
@@ -107,7 +107,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/j2re1.7-oracle/') }
   end
 
-  context 'select Oracle Java 8 JRE >=u100 for Debian Wheezy' do
+  context 'when select Oracle Java 8 JRE >=u100 for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'oracle-java8-jre' } }
 
@@ -115,7 +115,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set jre-8-oracle-x64 --jre') }
   end
 
-  context 'select Oracle Java 8 JDK >=u100 for Debian Wheezy' do
+  context 'when select Oracle Java 8 JDK >=u100 for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'oracle-java8-jdk' } }
 
@@ -123,7 +123,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set jdk-8-oracle-x64 --jre') }
   end
 
-  context 'select OpenJDK JRE for Debian Wheezy' do
+  context 'when select OpenJDK JRE for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -132,14 +132,14 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
   end
 
-  context 'select default for Debian Squeeze' do
+  context 'when select default for Debian Squeeze' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'squeeze', operatingsystemrelease: '6.0.5', architecture: 'amd64' } }
 
     it { is_expected.to contain_package('java').with_name('openjdk-6-jdk') }
     it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre') }
   end
 
-  context 'select Oracle JRE for Debian Squeeze' do
+  context 'when select Oracle JRE for Debian Squeeze' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'squeeze', operatingsystemrelease: '6.0.5', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'sun-jre' } }
 
@@ -148,7 +148,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-6-sun/jre/') }
   end
 
-  context 'select OpenJDK JRE for Debian Squeeze' do
+  context 'when select OpenJDK JRE for Debian Squeeze' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'squeeze', operatingsystemrelease: '6.0.5', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -157,7 +157,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-6-openjdk/jre/') }
   end
 
-  context 'select random alternative for Debian Wheezy' do
+  context 'when select random alternative for Debian Wheezy' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
     let(:params) { { 'java_alternative' => 'bananafish' } }
 
@@ -165,7 +165,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
   end
 
-  context 'select jdk for Ubuntu Vivid (15.04)' do
+  context 'when select jdk for Ubuntu Vivid (15.04)' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'vivid', operatingsystemrelease: '15.04', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'jdk' } }
 
@@ -173,7 +173,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/') }
   end
 
-  context 'select jre for Ubuntu Vivid (15.04)' do
+  context 'when select jre for Ubuntu Vivid (15.04)' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'vivid', operatingsystemrelease: '15.04', architecture: 'amd64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -181,40 +181,40 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/') }
   end
 
-  context 'select openjdk for Amazon Linux' do
+  context 'when select openjdk for Amazon Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Amazon', operatingsystemrelease: '3.4.43-43.43.amzn1.x86_64', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
   end
 
-  context 'select passed value for Amazon Linux' do
+  context 'when select passed value for Amazon Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Amazon', operatingsystemrelease: '5.3.4.43-43.43.amzn1.x86_64', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
   end
 
-  context 'select openjdk for Oracle Linux' do
+  context 'when select openjdk for Oracle Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.4', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
   end
 
-  context 'select openjdk for Oracle Linux 6.2' do
+  context 'when select openjdk for Oracle Linux 6.2' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.2', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
   end
 
-  context 'select passed value for Oracle Linux' do
+  context 'when select passed value for Oracle Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.3', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
   end
 
-  context 'select passed value for Scientific Linux' do
+  context 'when select passed value for Scientific Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Scientific', operatingsystemrelease: '6.4', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -222,7 +222,7 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
   end
 
-  context 'select passed value for Scientific Linux CERN (SLC)' do
+  context 'when select passed value for Scientific Linux CERN (SLC)' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'SLC', operatingsystemrelease: '6.4', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -230,49 +230,49 @@ describe 'java', type: :class do
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
   end
 
-  context 'select default for OpenSUSE 12.3' do
+  context 'when select default for OpenSUSE 12.3' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'OpenSUSE', operatingsystemrelease: '12.3', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1_7_0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') }
   end
 
-  context 'select default for SLES 11.3' do
+  context 'when select default for SLES 11.3' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.3', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1_6_0-ibm-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.6.0-ibm-1.6.0/') }
   end
 
-  context 'select default for SLES 11.4' do
+  context 'when select default for SLES 11.4' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.4', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1_7_1-ibm-devel') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/') }
   end
 
-  context 'select default for SLES 12.0' do
+  context 'when select default for SLES 12.0' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '12.0', operatingsystemmajrelease: '12', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1_7_0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') }
   end
 
-  context 'select default for SLES 12.1' do
+  context 'when select default for SLES 12.1' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '12.1', operatingsystemmajrelease: '12', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('java-1_8_0-openjdk-devel') }
     it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/') }
   end
 
-  context 'select jdk for OpenBSD' do
+  context 'when select jdk for OpenBSD' do
     let(:facts) { { osfamily: 'OpenBSD', architecture: 'x86_64' } }
 
     it { is_expected.to contain_package('java').with_name('jdk') }
     it { is_expected.not_to contain_file_line('java-home-environment') }
   end
 
-  context 'select jre for OpenBSD' do
+  context 'when select jre for OpenBSD' do
     let(:facts) { { osfamily: 'OpenBSD', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -282,7 +282,7 @@ describe 'java', type: :class do
   describe 'custom java package' do
     let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'jessie', operatingsystemrelease: '8.6', architecture: 'amd64' } }
 
-    context 'all params provided' do
+    context 'when all params provided' do
       let(:params) do
         {
           'distribution' => 'custom',
@@ -297,7 +297,7 @@ describe 'java', type: :class do
       it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/opt/custom_jdk') }
       it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-custom_jdk --jre') }
     end
-    context 'missing parameters' do
+    context 'with missing parameters' do
       let(:params) do
         {
           'distribution' => 'custom',

spec/defines/oracle_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz'
 
 describe 'java::oracle', type: :define do
-  context 'On CentOS 64-bit' do
+  context 'with CentOS 64-bit' do
     let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
 
-    context 'Oracle Java SE 6 JDK' do
+    context 'when Oracle Java SE 6 JDK' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } }
       let(:title) { 'jdk6' }
 
@@ -15,7 +15,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-x64-rpm.bin]') }
     end
 
-    context 'Oracle Java SE 7 JDK' do
+    context 'when Oracle Java SE 7 JDK' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } }
       let(:title) { 'jdk7' }
 
@@ -24,7 +24,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 7').that_requires('Archive[/tmp/jdk-7u80-linux-x64.rpm]') }
     end
 
-    context 'Oracle Java SE 8 JDK' do
+    context 'when Oracle Java SE 8 JDK' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
       let(:title) { 'jdk8' }
 
@@ -33,7 +33,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-x64.rpm]') }
     end
 
-    context 'Oracle Java SE 6 JRE' do
+    context 'when Oracle Java SE 6 JRE' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } }
       let(:title) { 'jre6' }
 
@@ -42,7 +42,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 6').that_requires('Archive[/tmp/jre-6u45-linux-x64-rpm.bin]') }
     end
 
-    context 'Oracle Java SE 7 JRE' do
+    context 'when Oracle Java SE 7 JRE' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } }
       let(:title) { 'jre7' }
 
@@ -51,7 +51,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 7').that_requires('Archive[/tmp/jre-7u80-linux-x64.rpm]') }
     end
 
-    context 'select Oracle Java SE 8 JRE' do
+    context 'when select Oracle Java SE 8 JRE' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
       let(:title) { 'jre8' }
 
@@ -60,7 +60,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u131-linux-x64.rpm]') }
     end
 
-    context 'Pass URL to url parameter' do
+    context 'when passing URL to url parameter' do
       let(:params) do
         {
           ensure: 'present',
@@ -79,7 +79,7 @@ describe 'java::oracle', type: :define do
       }
     end
 
-    context 'Pass a hash to url_hash parameter' do
+    context 'when passing a hash to url_hash parameter' do
       let(:params) do
         {
           ensure: 'present',
@@ -95,10 +95,10 @@ describe 'java::oracle', type: :define do
     end
   end
 
-  context 'On CentOS 32-bit' do
+  context 'when on CentOS 32-bit' do
     let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'i386', name: 'CentOS', release: { full: '6.6' } } } }
 
-    context 'select Oracle Java SE 6 JDK on RedHat family, 32-bit' do
+    context 'when selecting Oracle Java SE 6 JDK on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } }
       let(:title) { 'jdk6' }
 
@@ -107,7 +107,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-i586-rpm.bin]') }
     end
 
-    context 'select Oracle Java SE 7 JDK on RedHat family, 32-bit' do
+    context 'when selecting Oracle Java SE 7 JDK on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } }
       let(:title) { 'jdk7' }
 
@@ -116,7 +116,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 7').that_requires('Archive[/tmp/jdk-7u80-linux-i586.rpm]') }
     end
 
-    context 'select Oracle Java SE 8 JDK on RedHat family, 32-bit' do
+    context 'when selecting Oracle Java SE 8 JDK on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
       let(:title) { 'jdk8' }
 
@@ -125,7 +125,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-i586.rpm]') }
     end
 
-    context 'select Oracle Java SE 6 JRE on RedHat family, 32-bit' do
+    context 'when selecting Oracle Java SE 6 JRE on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } }
       let(:title) { 'jdk6' }
 
@@ -134,7 +134,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 6').that_requires('Archive[/tmp/jre-6u45-linux-i586-rpm.bin]') }
     end
 
-    context 'select Oracle Java SE 7 JRE on RedHat family, 32-bit' do
+    context 'when select Oracle Java SE 7 JRE on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } }
       let(:title) { 'jdk7' }
 
@@ -143,7 +143,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 7').that_requires('Archive[/tmp/jre-7u80-linux-i586.rpm]') }
     end
 
-    context 'select Oracle Java SE 8 JRE on RedHat family, 32-bit' do
+    context 'when select Oracle Java SE 8 JRE on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
       let(:title) { 'jdk8' }
 
@@ -153,10 +153,10 @@ describe 'java::oracle', type: :define do
     end
   end
 
-  context 'On Ubuntu 64-bit' do
+  context 'with Ubuntu 64-bit' do
     let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
 
-    context 'Oracle Java SE 6 JDK' do
+    context 'when Oracle Java SE 6 JDK' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } }
       let(:title) { 'jdk6' }
 
@@ -165,7 +165,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 7 JDK' do
+    context 'with Oracle Java SE 7 JDK' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } }
       let(:title) { 'jdk7' }
 
@@ -174,7 +174,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 7').that_requires('Archive[/tmp/jdk-7u80-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 8 JDK' do
+    context 'with Oracle Java SE 8 JDK' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
       let(:title) { 'jdk8' }
 
@@ -183,7 +183,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 6 JRE' do
+    context 'with Oracle Java SE 6 JRE' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } }
       let(:title) { 'jre6' }
 
@@ -192,7 +192,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 6').that_requires('Archive[/tmp/jre-6u45-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 7 JRE' do
+    context 'when Oracle Java SE 7 JRE' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } }
       let(:title) { 'jre7' }
 
@@ -201,7 +201,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 7').that_requires('Archive[/tmp/jre-7u80-linux-x64.tar.gz]') }
     end
 
-    context 'select Oracle Java SE 8 JRE' do
+    context 'when Oracle Java SE 8 JRE' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
       let(:title) { 'jre8' }
 
@@ -210,7 +210,7 @@ describe 'java::oracle', type: :define do
       it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u131-linux-x64.tar.gz]') }
     end
 
-    context 'Pass URL to url parameter' do
+    context 'when passing URL to url parameter' do
       let(:params) { { ensure: 'present', version_major: '8u131', version_minor: 'b11', java_se: 'jdk', url: oracle_url.to_s } }
       let(:title) { 'jdk8' }
 

spec/spec_helper.rb

@@ -1,9 +1,23 @@
-# This file is generated by ModuleSync, do not edit.
 require 'puppetlabs_spec_helper/module_spec_helper'
+require 'rspec-puppet-facts'
+include RspecPuppetFacts
 
-# put local configuration and setup into spec_helper_local
-begin
-  require 'spec_helper_local'
-rescue LoadError => loaderror
-  puts "Could not require spec_helper_local: #{loaderror.message}"
+default_facts = {
+  puppetversion: Puppet.version,
+  facterversion: Facter.version,
+}
+
+default_facts_path = File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml'))
+default_module_facts_path = File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml'))
+
+if File.exist?(default_facts_path) && File.readable?(default_facts_path)
+  default_facts.merge!(YAML.safe_load(File.read(default_facts_path)))
+end
+
+if File.exist?(default_module_facts_path) && File.readable?(default_module_facts_path)
+  default_facts.merge!(YAML.safe_load(File.read(default_module_facts_path)))
+end
+
+RSpec.configure do |c|
+  c.default_facts = default_facts
 end

spec/unit/facter/java_default_home_spec.rb

@@ -26,7 +26,7 @@ describe 'java_default_home' do
     Facter.fact(:kernel).stubs(:value).returns('Linux')
   end
 
-  context 'returns java home path when java found in PATH' do
+  context 'when java found in PATH' do
     context 'when java is in /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java' do
       it do
         unlink_and_delete('./java_test')
@@ -44,7 +44,7 @@ describe 'java_default_home' do
     end
   end
 
-  context 'returns nil when java not present' do
+  context 'when java not present, return nil' do
     it do
       Facter::Util::Resolution.stubs(:exec)
       Facter::Util::Resolution.expects(:which).with('java').at_least(1).returns(false)

spec/unit/facter/java_libjvm_path_spec.rb

@@ -9,7 +9,7 @@ describe 'java_libjvm_path' do
     Dir.stubs(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").returns(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so'])
   end
 
-  context 'returns libjvm path on Linux' do
+  context 'when on Linux, return libjvm path' do
     it do
       expect(Facter.value(:java_libjvm_path)).to eql '/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server'
     end

spec/unit/facter/java_major_version_spec.rb

@@ -5,7 +5,7 @@ describe 'java_major_version' do
     Facter.clear
   end
 
-  context 'returns major version when java_version fact present' do
+  context 'when java_version fact present, returns major version' do
     before :each do
       Facter.fact(:java_version).stubs(:value).returns('1.7.0_71')
     end
@@ -14,7 +14,7 @@ describe 'java_major_version' do
     end
   end
 
-  context 'returns nil when java not present' do
+  context 'when java not present, returns nil' do
     before :each do
       Facter.fact(:java_version).stubs(:value).returns(nil)
     end

spec/unit/facter/java_patch_level_spec.rb

@@ -5,7 +5,7 @@ describe 'java_patch_level' do
     Facter.clear
   end
 
-  context 'if java is installed returns java patch version extracted from java_version fact' do
+  context 'when java is installed returns java patch version extracted from java_version fact' do
     before :each do
       Facter.fact(:java_version).stubs(:value).returns('1.7.0_71')
     end
@@ -14,7 +14,7 @@ describe 'java_patch_level' do
     end
   end
 
-  context 'if java is not installed returns nil' do
+  context 'when java is not installed returns nil' do
     before :each do
       Facter.fact(:java_version).stubs(:value).returns(nil)
     end

spec/unit/facter/java_version_spec.rb

@@ -15,7 +15,7 @@ describe 'java_version' do
     Facter.clear
   end
 
-  context 'returns java version when java present' do
+  context 'when java present, returns java version' do
     context 'on OpenBSD', with_env: true do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('OpenBSD')
@@ -28,7 +28,7 @@ describe 'java_version' do
         expect(Facter.value(:java_version)).to eq('1.7.0_71')
       end
     end
-    context 'on Darwin' do
+    context 'when on Darwin' do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('Darwin')
       end
@@ -40,7 +40,7 @@ describe 'java_version' do
         expect(Facter.value(:java_version)).to eql '1.7.0_71'
       end
     end
-    context 'on other systems' do
+    context 'when on other systems' do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('MyOS')
       end
@@ -54,7 +54,7 @@ describe 'java_version' do
     end
   end
 
-  context 'returns nil when java not present' do
+  context 'when java not present, returns nil' do
     context 'on OpenBSD', with_env: true do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('OpenBSD')
@@ -66,7 +66,7 @@ describe 'java_version' do
         expect(Facter.value(:java_version)).to be_nil
       end
     end
-    context 'on Darwin' do
+    context 'when on Darwin' do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('Darwin')
       end
@@ -77,7 +77,7 @@ describe 'java_version' do
         expect(Facter.value(:java_version)).to be_nil
       end
     end
-    context 'on other systems' do
+    context 'when on other systems' do
       before(:each) do
         Facter.fact(:operatingsystem).stubs(:value).returns('MyOS')
       end