beaker 4.38.1 → 5.0.0

data/HISTORY.md

@@ -1,3 +1,106 @@
+## [4.38.1](https://github.com/voxpupuli/beaker/tree/4.38.1) (2022-09-21)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.38.0...4.38.1)
+
+**Fixed bugs:**
+
+- Arch Linux: Ensure keyring is up2date [\#1755](https://github.com/voxpupuli/beaker/pull/1755) ([bastelfreak](https://github.com/bastelfreak))
+
+## [4.38.0](https://github.com/voxpupuli/beaker/tree/4.38.0) (2022-08-11)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.37.2...4.38.0)
+
+**Implemented enhancements:**
+
+- Drop pry dependency, allow using debug gem [\#1737](https://github.com/voxpupuli/beaker/pull/1737) ([ekohl](https://github.com/ekohl))
+
+## [4.37.2](https://github.com/voxpupuli/beaker/tree/4.37.2) (2022-07-29)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.37.1...4.37.2)
+
+**Fixed bugs:**
+
+- Use the new scheme for agent versions \>= 6.28 and \< 7 [\#1749](https://github.com/voxpupuli/beaker/pull/1749) ([joshcooper](https://github.com/joshcooper))
+
+## [4.37.1](https://github.com/voxpupuli/beaker/tree/4.37.1) (2022-07-27)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.37.0...4.37.1)
+
+**Fixed bugs:**
+
+- macOS PE tarballs include arch now [\#1747](https://github.com/voxpupuli/beaker/pull/1747) ([joshcooper](https://github.com/joshcooper))
+
+## [4.37.0](https://github.com/voxpupuli/beaker/tree/4.37.0) (2022-06-28)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.36.1...4.37.0)
+
+**Implemented enhancements:**
+
+- Add support for Win32-OpenSSH [\#1744](https://github.com/voxpupuli/beaker/pull/1744) ([joshcooper](https://github.com/joshcooper))
+
+**Fixed bugs:**
+
+- Create ~/.ssh on Windows if it doesn't exist [\#1745](https://github.com/voxpupuli/beaker/pull/1745) ([joshcooper](https://github.com/joshcooper))
+
+## [4.36.1](https://github.com/voxpupuli/beaker/tree/4.36.1) (2022-06-16)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.36.0...4.36.1)
+
+**Implemented enhancements:**
+
+- \(maint\) Remove /etc/environment file for ubuntu2204 [\#1742](https://github.com/voxpupuli/beaker/pull/1742) ([cthorn42](https://github.com/cthorn42))
+
+## [4.36.0](https://github.com/voxpupuli/beaker/tree/4.36.0) (2022-05-30)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.35.0...4.36.0)
+
+**Implemented enhancements:**
+
+- \(PE-33493\) Add Ubuntu 2204 codename [\#1740](https://github.com/voxpupuli/beaker/pull/1740) ([cthorn42](https://github.com/cthorn42))
+
+## [4.35.0](https://github.com/voxpupuli/beaker/tree/4.35.0) (2022-05-13)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.34.0...4.35.0)
+
+**Implemented enhancements:**
+
+- Build gem during CI runs [\#1738](https://github.com/voxpupuli/beaker/pull/1738) ([bastelfreak](https://github.com/bastelfreak))
+- Add Ruby 3.1 support [\#1736](https://github.com/voxpupuli/beaker/pull/1736) ([ekohl](https://github.com/ekohl))
+
+## [4.34.0](https://github.com/voxpupuli/beaker/tree/4.34.0) (2022-01-27)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.33.0...4.34.0)
+
+**Implemented enhancements:**
+
+- Extract a host\_packages method from validate\_host [\#1729](https://github.com/voxpupuli/beaker/pull/1729) ([ekohl](https://github.com/ekohl))
+- Reduce duplication in ssh\_permit\_user\_environment [\#1728](https://github.com/voxpupuli/beaker/pull/1728) ([ekohl](https://github.com/ekohl))
+
+**Fixed bugs:**
+
+- Do not install curl on EL9 [\#1732](https://github.com/voxpupuli/beaker/pull/1732) ([ekohl](https://github.com/ekohl))
+- Drop old Ruby 1.8 compatibility code [\#1730](https://github.com/voxpupuli/beaker/pull/1730) ([ekohl](https://github.com/ekohl))
+
+## [4.33.0](https://github.com/voxpupuli/beaker/tree/4.33.0) (2022-01-21)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.32.0...4.33.0)
+
+**Implemented enhancements:**
+
+- Add ed25519 as runtime dependency [\#1726](https://github.com/voxpupuli/beaker/pull/1726) ([bastelfreak](https://github.com/bastelfreak))
+
+## [4.32.0](https://github.com/voxpupuli/beaker/tree/4.32.0) (2021-12-06)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.31.0...4.32.0)
+
+**Implemented enhancements:**
+
+- Initial EL9 support [\#1719](https://github.com/voxpupuli/beaker/pull/1719) ([ekohl](https://github.com/ekohl))
+
+**Fixed bugs:**
+
+- Arch Linux: install net-tools and openssh [\#1722](https://github.com/voxpupuli/beaker/pull/1722) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [4.31.0](https://github.com/voxpupuli/beaker/tree/4.31.0) (2021-11-02)
 
 ### Fixed

data/Rakefile

@@ -4,7 +4,7 @@ require 'beaker-hostgenerator'
 require 'beaker'
 HOSTS_PRESERVED  = 'log/latest/hosts_preserved.yml'
 
-task :default => [ 'test:spec' ]
+task :default => ['test:spec']
 
 task :test do
   Rake::Task['test:spec'].invoke
@@ -14,9 +14,7 @@ task :spec do
   Rake::Task['test:spec'].invoke
 end
 
-
-task :acceptance => ['test:base', 'test:puppetgit', 'test:hypervisor']
-
+task :acceptance => ['test:base', 'test:hypervisor']
 
 task :yard do
   Rake::Task['docs:gen'].invoke
@@ -28,16 +26,16 @@ end
 
 module HarnessOptions
   defaults = {
-      :tests  => ['tests'],
-      :log_level => 'debug',
-      :preserve_hosts => 'onfail',
+    :tests => ['tests'],
+    :log_level => 'debug',
+    :preserve_hosts => 'onfail',
   }
 
   DEFAULTS = defaults
 
   def self.get_options(file_path)
     puts "Attempting to merge config file: #{file_path}"
-    if File.exists? file_path
+    if File.exist? file_path
       options = eval(File.read(file_path), binding)
     else
       puts "No options file found at #{File.expand_path(file_path)}... skipping"
@@ -60,31 +58,28 @@ module HarnessOptions
     final_options.merge!(intermediary_options)
     final_options.merge!(local_overrides)
   end
-
 end
 
 def hosts_file_env
-  ENV['BEAKER_HOSTS']
+  ENV.fetch('BEAKER_HOSTS', nil)
 end
 
-def hosts_opt(use_preserved_hosts=false)
+def hosts_opt(use_preserved_hosts = false)
   if use_preserved_hosts
     "--hosts=#{HOSTS_PRESERVED}"
+  elsif hosts_file_env
+    "--hosts=#{hosts_file_env}"
   else
-    if hosts_file_env
-      "--hosts=#{hosts_file_env}"
-    else
-      "--hosts=tmp/#{HOSTS_FILE}"
-    end
+    "--hosts=tmp/#{HOSTS_FILE}"
   end
 end
 
 def agent_target
-  ENV['TEST_TARGET'] || 'redhat7-64af'
+  ENV['TEST_TARGET'] || 'centos7-64af'
 end
 
 def master_target
-  ENV['MASTER_TEST_TARGET'] || 'redhat7-64default.mdcal'
+  ENV['MASTER_TEST_TARGET'] || 'centos7-64default.mdcal'
 end
 
 def test_targets
@@ -94,11 +89,10 @@ end
 HOSTS_FILE = "#{test_targets}-#{SecureRandom.uuid}.yaml"
 
 def beaker_test(mode = :base, options = {})
-
   preserved_hosts_mode = options[:hosts] == HOSTS_PRESERVED
   final_options = HarnessOptions.final_options(mode, options)
 
-  options_opt  = ""
+  options_opt = ""
   # preserved hosts can not be used with an options file (BKR-670)
   #   one can still use OPTIONS
 
@@ -106,94 +100,88 @@ def beaker_test(mode = :base, options = {})
     options_file = 'merged_options.rb'
     options_opt  = "--options-file=#{options_file}"
     File.open(options_file, 'w') do |merged|
-      merged.puts <<-EOS
-# Copy this file to local_options.rb and adjust as needed if you wish to run
-# with some local overrides.
+      merged.puts <<~EOS
+        # Copy this file to local_options.rb and adjust as needed if you wish to run
+        # with some local overrides.
       EOS
       merged.puts(final_options)
     end
   end
 
-  tests = ENV['TESTS'] || ENV['TEST']
+  tests = ENV['TESTS'] || ENV.fetch('TEST', nil)
   tests_opt = ""
   tests_opt = "--tests=#{tests}" if tests
 
   overriding_options = ENV['OPTIONS'].to_s
 
-  args = [options_opt, hosts_opt(preserved_hosts_mode), tests_opt,
-          *overriding_options.split(' ')].compact
+  args = [options_opt, hosts_opt(preserved_hosts_mode), tests_opt, *overriding_options.split(' ')].compact
 
   sh("beaker", *args)
 end
 
-
 namespace :test do
-  USAGE = <<-EOS
-You may set BEAKER_HOSTS=config/nodes/foo.yaml or include it in an acceptance-options.rb for Beaker,
-or specify TEST_TARGET in a form beaker-hostgenerator accepts, e.g. ubuntu1504-64a.
-You may override the default master test target by specifying MASTER_TEST_TARGET.
-You may set TESTS=path/to/test,and/more/tests.
-You may set additional Beaker OPTIONS='--more --options'
-If there is a Beaker options hash in a ./acceptance/local_options.rb, it will be included.
-Commandline options set through the above environment variables will override settings in this file.
+  USAGE = <<~EOS
+    You may set BEAKER_HOSTS=config/nodes/foo.yaml or include it in an acceptance-options.rb for Beaker,
+    or specify TEST_TARGET in a form beaker-hostgenerator accepts, e.g. ubuntu1504-64a.
+    You may override the default master test target by specifying MASTER_TEST_TARGET.
+    You may set TESTS=path/to/test,and/more/tests.
+    You may set additional Beaker OPTIONS='--more --options'
+    If there is a Beaker options hash in a ./acceptance/local_options.rb, it will be included.
+    Commandline options set through the above environment variables will override settings in this file.
   EOS
 
   desc 'Run specs and check for deprecation warnings'
   task :spec do
-    original_dir = Dir.pwd
-    Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-    exit_status = 1
-    output = ''
-    Open3.popen3("bundle exec rspec") {|stdin, stdout, stderr, wait_thr|
-      while line = stdout.gets
-        puts line
-      end
-      output = stdout
-      if not wait_thr.value.success?
-        fail "Failed to 'bundle exec rspec' (exit status: #{wait_thr.value})"
+    Dir.chdir(__dir__) do
+      exit_status = 1
+      output = ''
+      Open3.popen3("bundle exec rspec") do |_stdin, stdout, _stderr, wait_thr|
+        while (line = stdout.gets)
+          puts line
+        end
+        output = stdout.to_s
+        fail "Failed to 'bundle exec rspec' (exit status: #{wait_thr.value})" if not wait_thr.value.success?
+
+        exit_status = wait_thr.value
       end
-      exit_status = wait_thr.value
-    }
-    if exit_status != /0/
-      #check for deprecation warnings
-      if output =~ /Deprecation Warnings/
-        fail "DEPRECATION WARNINGS in spec generation, please fix!"
+      if exit_status != /0/
+        # check for deprecation warnings
+        fail "DEPRECATION WARNINGS in spec generation, please fix!" if output.include?('Deprecation Warnings')
       end
     end
-    Dir.chdir( original_dir )
   end
 
-  desc <<-EOS
-Run the base beaker acceptance tests
-#{USAGE}
+  desc <<~EOS
+    Run the base beaker acceptance tests
+    #{USAGE}
   EOS
-  task :base  => 'gen_hosts' do
+  task :base => 'gen_hosts' do
     beaker_test(:base)
   end
 
-  desc <<-EOS
-Run the subcommand beaker acceptance tests
-#{USAGE}
+  desc <<~EOS
+    Run the subcommand beaker acceptance tests
+    #{USAGE}
   EOS
   task :subcommands => 'gen_hosts' do
     beaker_test(:subcommands)
   end
 
-  desc <<-EOS
-Run the hypervisor beaker acceptance tests
-#{USAGE}
+  desc <<~EOS
+    Run the hypervisor beaker acceptance tests
+    #{USAGE}
   EOS
-  task :hypervisor  => 'gen_hosts' do
+  task :hypervisor => 'gen_hosts' do
     beaker_test(:hypervisor)
   end
 
-
   desc 'Generate Beaker Host Config File'
   task :gen_hosts do
-    if hosts_file_env
-      next
-    end
-    cli = BeakerHostGenerator::CLI.new([test_targets])
+    next if hosts_file_env
+
+    arguments = [test_targets]
+    arguments += ['--hypervisor', ENV['BEAKER_HYPERVISOR']] if ENV['BEAKER_HYPERVISOR']
+    cli = BeakerHostGenerator::CLI.new(arguments)
     FileUtils.mkdir_p('tmp') # -p ignores when dir already exists
     File.open("tmp/#{HOSTS_FILE}", 'w') do |fh|
       fh.print(cli.execute)
@@ -201,7 +189,6 @@ Run the hypervisor beaker acceptance tests
   end
 end
 
-
 ###########################################################
 #
 #   History Tasks
@@ -210,16 +197,12 @@ end
 namespace :history do
   desc 'Generate HISTORY.md'
   task :gen do
-    original_dir = Dir.pwd
-    Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-    output = `bundle exec ruby history.rb .`
-    puts output
-    if output !~ /success/
-      raise "History generation failed"
+    Dir.chdir(__dir__) do
+      output = `bundle exec ruby history.rb .`
+      puts output
+      raise "History generation failed" if !output.include?('success')
     end
-    Dir.chdir( original_dir )
   end
-
 end
 
 ###########################################################
@@ -231,62 +214,53 @@ DOCS_DIR = 'yard_docs'
 DOCS_DAEMON = "yard server --reload --daemon --docroot #{DOCS_DIR}"
 FOREGROUND_SERVER = "bundle exec yard server --reload --verbose lib/beaker --docroot #{DOCS_DIR}"
 
-def running?( cmdline )
+def running?(cmdline)
   ps = `ps -ef`
-  found = ps.lines.grep( /#{Regexp.quote( cmdline )}/ )
-  if found.length > 1
-    raise StandardError, "Found multiple YARD Servers. Don't know what to do."
-  end
+  found = ps.lines.grep(/#{Regexp.quote(cmdline)}/)
+  raise StandardError, "Found multiple YARD Servers. Don't know what to do." if found.length > 1
 
   yes = found.empty? ? false : true
   return yes, found.first
 end
 
-def pid_from( output )
+def pid_from(output)
   output.squeeze(' ').strip.split(' ')[1]
 end
 
 desc 'Start the documentation server in the foreground'
 task :docs => 'docs:clear' do
-  original_dir = Dir.pwd
-  Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-  sh FOREGROUND_SERVER
-  Dir.chdir( original_dir )
+  Dir.chdir(__dir__) do
+    sh FOREGROUND_SERVER
+  end
 end
 
 namespace :docs do
-
   desc 'Clear the generated documentation cache'
   task :clear do
-    original_dir = Dir.pwd
-    Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-    sh "rm -rf #{DOCS_DIR}"
-    Dir.chdir( original_dir )
+    Dir.chdir(__dir__) do
+      sh "rm -rf #{DOCS_DIR}"
+    end
   end
 
   desc 'Generate static documentation'
   task :gen => 'docs:clear' do
-    original_dir = Dir.pwd
-    Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-    output = `bundle exec yard doc -o #{DOCS_DIR}`
-    puts output
-    if output =~ /\[warn\]|\[error\]/
-      fail "Errors/Warnings during yard documentation generation"
+    Dir.chdir(__dir__) do
+      output = `bundle exec yard doc -o #{DOCS_DIR}`
+      puts output
+      fail "Errors/Warnings during yard documentation generation" if /\[warn\]|\[error\]/.match?(output)
     end
-    Dir.chdir( original_dir )
   end
 
   desc 'Run the documentation server in the background, alias `bg`'
   task :background => 'docs:clear' do
-    yes, output = running?( DOCS_DAEMON )
+    yes, output = running?(DOCS_DAEMON)
     if yes
       puts "Not starting a new YARD Server..."
-      puts "Found one running with pid #{pid_from( output )}."
+      puts "Found one running with pid #{pid_from(output)}."
     else
-      original_dir = Dir.pwd
-      Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-      sh "bundle exec #{DOCS_DAEMON}"
-      Dir.chdir( original_dir )
+      Dir.chdir(__dir__) do
+        sh "bundle exec #{DOCS_DAEMON}"
+      end
     end
   end
 
@@ -294,9 +268,9 @@ namespace :docs do
 
   desc 'Check the status of the documentation server'
   task :status do
-    yes, output = running?( DOCS_DAEMON )
+    yes, output = running?(DOCS_DAEMON)
     if yes
-      pid = pid_from( output )
+      pid = pid_from(output)
       puts "Found a YARD Server running with pid #{pid}"
     else
       puts "Could not find a running YARD Server."
@@ -305,16 +279,16 @@ namespace :docs do
 
   desc "Stop a running YARD Server"
   task :stop do
-    yes, output = running?( DOCS_DAEMON )
+    yes, output = running?(DOCS_DAEMON)
     if yes
-      pid = pid_from( output )
+      pid = pid_from(output)
       puts "Found a YARD Server running with pid #{pid}"
       `kill #{pid}`
       puts "Stopping..."
-      yes, output = running?( DOCS_DAEMON )
+      yes, _output = running?(DOCS_DAEMON)
       if yes
         `kill -9 #{pid}`
-        yes, output = running?( DOCS_DAEMON )
+        yes, _output = running?(DOCS_DAEMON)
         if yes
           puts "Could not Stop Server!"
         else
@@ -341,4 +315,19 @@ begin
     config.future_release = gem_version
   end
 rescue LoadError
+  # Optional group in bundler
+end
+
+begin
+  require 'rubocop/rake_task'
+rescue LoadError
+  # RuboCop is an optional group
+else
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    # These make the rubocop experience maybe slightly less terrible
+    task.options = ['--display-cop-names', '--display-style-guide', '--extra-details']
+
+    # Use Rubocop's Github Actions formatter if possible
+    task.formatters << 'github' if ENV['GITHUB_ACTIONS'] == 'true'
+  end
 end

data/acceptance/config/acceptance-options.rb

@@ -1,6 +1,6 @@
 {
   :load_path => File.join('acceptance', 'lib'),
   :ssh => {
-    :keys => ["id_rsa_acceptance", "#{ENV['HOME']}/.ssh/id_rsa-acceptance"],
+    :keys => ["id_rsa_acceptance", "#{ENV.fetch('HOME', nil)}/.ssh/id_rsa-acceptance"],
   },
 }

data/acceptance/config/base/acceptance-options.rb

@@ -1,3 +1,3 @@
 {
-    :tests                => 'acceptance/tests/base'
-}.merge(eval File.read('acceptance/config/acceptance-options.rb'))
+  :tests => 'acceptance/tests/base',
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/config/hypervisor/acceptance-options.rb

@@ -1,3 +1,3 @@
 {
-    :tests                => 'acceptance/tests/hypervisor'
-}.merge(eval File.read('acceptance/config/acceptance-options.rb'))
+  :tests => 'acceptance/tests/hypervisor',
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/config/subcommands/acceptance-options.rb

@@ -1,4 +1,4 @@
 {
-    :pre_suite => 'acceptance/pre_suite/subcommands/',
-    :tests => 'acceptance/tests/subcommands/'
+  :pre_suite => 'acceptance/pre_suite/subcommands/',
+  :tests => 'acceptance/tests/subcommands/',
 }.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/fixtures/module/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
 puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
+gem 'facter', '>= 1.7.0'
 gem 'puppet', puppetversion
 gem 'puppetlabs_spec_helper', '>= 0.1.0'
 gem 'puppet-lint', '>= 0.3.2'
-gem 'facter', '>= 1.7.0'
 
 group :system_tests do
   gem 'beaker-rspec', :require => false

data/acceptance/fixtures/module/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send(:disable_80chars)
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
 
 desc "Validate manifests, templates, and ruby files"
@@ -9,8 +9,8 @@ task :validate do
   Dir['manifests/**/*.pp'].each do |manifest|
     sh "puppet parser validate --noop #{manifest}"
   end
-  Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file|
-    sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/
+  Dir['spec/**/*.rb', 'lib/**/*.rb'].each do |ruby_file|
+    sh "ruby -c #{ruby_file}" unless ruby_file.include?('spec/fixtures')
   end
   Dir['templates/**/*.erb'].each do |template|
     sh "erb -P -x -T '-' #{template} | ruby -c"

data/acceptance/fixtures/module/spec/acceptance/demo_spec.rb

@@ -1,55 +1,53 @@
 require 'spec_helper_acceptance'
 
 describe "my tests" do
-
   # an example using the beaker DSL
   # use http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL
-  it "should say hello!" do
-    result = shell( 'echo hello' )
+  it "says hello!" do
+    result = shell('echo hello')
     expect(result.stdout).to match(/hello/)
   end
 
   # an example using Serverspec
   # use http://serverspec.org/resource_types.html
   describe package('puppet') do
-    it { should be_installed }
+    it { is_expected.to be_installed }
   end
 
   it "can create and confirm a file" do
-    shell( 'rm -f demo.txt' )
+    shell('rm -f demo.txt')
     create_remote_file(default, 'demo.txt', 'foo\nfoo\nfoo\n')
-    shell( 'grep foo demo.txt' )
-    shell( 'grep bar demo.txt', :acceptable_exit_codes => [1] )
+    shell('grep foo demo.txt')
+    shell('grep bar demo.txt', :acceptable_exit_codes => [1])
   end
 
-  it "should be able to apply manifests" do
+  it "is able to apply manifests" do
     manifest_1 = "user {'foo':
           ensure => present,}"
     manifest_2 = "user {'foo':
           ensure => absent,}"
     manifest_3 = "user {'root':
           ensure => present,}"
-    apply_manifest( manifest_1, :expect_changes => true )
-    apply_manifest( manifest_2, :expect_changes => true )
-    apply_manifest( manifest_3 )
+    apply_manifest(manifest_1, :expect_changes => true)
+    apply_manifest(manifest_2, :expect_changes => true)
+    apply_manifest(manifest_3)
   end
 
   describe service('sshd') do
-    it { should be_running }
+    it { is_expected.to be_running }
   end
 
   describe user('root') do
-    it { should exist }
+    it { is_expected.to exist }
   end
 
   describe user('foo') do
-    it { should_not exist }
+    it { is_expected.not_to exist }
   end
 
   context "can use both serverspec and Beaker DSL" do
-
     it "can create a file" do
-      shell( 'rm -f /tmp/demo.txt' )
+      shell('rm -f /tmp/demo.txt')
       manifest = "file {'demofile':
         path    => '/tmp/demo.txt',
         ensure  => present,
@@ -60,13 +58,8 @@ describe "my tests" do
     end
 
     describe file('/tmp/demo.txt') do
-      it { should be_file }
-    end
-
-    describe file('/tmp/demo.txt') do
-      it { should contain 'this is my file.' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'this is my file.' }
     end
   end
-
-
 end

data/acceptance/fixtures/module/spec/classes/init_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 describe 'demo' do
-
   context 'with defaults for all parameters' do
-    it { should contain_class('demo') }
+    it { is_expected.to contain_class('demo') }
   end
 end