chefspec 7.2.1 → 7.3.0

data/Rakefile

@@ -17,13 +17,15 @@ RSpec::Core::RakeTask.new(:unit) do |t|
   end.join(' ')
 end
 
-failed = false
+failed = []
+start_time = nil
 
 namespace :acceptance do |ns|
   Dir.foreach("examples") do |dir|
     next if dir == '.' or dir == '..'
     desc "#{dir} acceptance tests"
     task dir.to_sym do
+      start_time ||= Time.now
       Dir.mktmpdir do |tmp|
         FileUtils.cp_r("examples/#{dir}", tmp)
 
@@ -40,6 +42,8 @@ namespace :acceptance do |ns|
 
           RSpec.configure do |config|
             config.color = true
+            config.run_all_when_everything_filtered = true
+            config.filter_run(:focus)
             config.before(:suite) do
               ChefSpec::ZeroServer.setup!
             end
@@ -51,7 +55,7 @@ namespace :acceptance do |ns|
           RSpec.clear_examples
           exitstatus = RSpec::Core::Runner.run(["spec"])
           RSpec.reset
-          failed = true unless exitstatus == 0
+          failed << dir unless exitstatus == 0
         end
       end
     end
@@ -60,7 +64,8 @@ end
 
 
 task acceptance: Rake.application.tasks.select { |t| t.name.start_with?("acceptance:") } do
-  raise "some tests failed" if failed
+  puts "Acceptance tests took #{Time.now - start_time} seconds"
+  raise "some tests failed: #{failed.join(', ')}" unless failed.empty?
 end
 
 desc 'Run all tests'

data/examples/apt_package/spec/install_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'apt_package::install' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04')
                           .converge(described_recipe)
   end
 

data/examples/apt_package/spec/lock_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'apt_package::lock' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04')
                           .converge(described_recipe)
   end
 

data/examples/apt_package/spec/purge_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'apt_package::purge' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04')
                           .converge(described_recipe)
   end
 

data/examples/apt_package/spec/reconfig_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'apt_package::reconfig' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04')
                           .converge(described_recipe)
   end
 

data/examples/apt_package/spec/remove_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'apt_package::remove' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04')
                           .converge(described_recipe)
   end
 

data/examples/apt_package/spec/unlock_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'apt_package::unlock' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04')
                           .converge(described_recipe)
   end
 

data/examples/apt_package/spec/upgrade_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'apt_package::upgrade' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04')
                           .converge(described_recipe)
   end
 

data/examples/apt_repository/spec/add_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'apt_repository::add' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04')
                           .converge(described_recipe)
   end
 

data/examples/apt_repository/spec/remove_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'apt_repository::remove' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04')
                           .converge(described_recipe)
   end
 

data/examples/apt_update/spec/periodic_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'apt_update::periodic' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04')
                           .converge(described_recipe)
   end
 

data/examples/apt_update/spec/update_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'apt_update::update' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04')
                           .converge(described_recipe)
   end
 

data/examples/attributes/spec/default_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'attributes::default' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04') do |node|
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04') do |node|
       node.automatic['ipaddress'] = '500.500.500.500' # Intentionally not a real IP
       node.normal['attributes']['message'] = 'The new message is here'
     end.converge(described_recipe)

data/examples/batch/spec/run_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'batch::run' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+    ChefSpec::SoloRunner.new(platform: 'windows', version: '2016')
                           .converge(described_recipe)
   end
 

data/examples/cab_package/spec/install_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 if defined?(Chef::Resource::CabPackage)
   describe 'cab_package::install' do
     let(:chef_run) do
-      ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+      ChefSpec::SoloRunner.new(platform: 'windows', version: '2016')
         .converge(described_recipe)
     end
 

data/examples/cab_package/spec/remove_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 if defined?(Chef::Resource::CabPackage)
   describe 'cab_package::remove' do
     let(:chef_run) do
-      ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+      ChefSpec::SoloRunner.new(platform: 'windows', version: '2016')
         .converge(described_recipe)
     end
 

data/examples/cached/spec/default_spec.rb

@@ -6,7 +6,7 @@ RSpec.configure do |config|
 end
 
 describe 'cached::default' do
-  cached(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  cached(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'does not raise an exception' do
     expect { chef_run }.to_not raise_error

data/examples/chef_gem/spec/install_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'chef_gem::install' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'installs a chef_gem with the default action' do
     expect(chef_run).to install_chef_gem('default_action')

data/examples/chef_gem/spec/purge_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'chef_gem::purge' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'purges a chef_gem with an explicit action' do
     expect(chef_run).to purge_chef_gem('explicit_action')

data/examples/chef_gem/spec/reconfig_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'chef_gem::reconfig' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'reconfigs a chef_gem with an explicit action' do
     expect(chef_run).to reconfig_chef_gem('explicit_action')

data/examples/chef_gem/spec/remove_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'chef_gem::remove' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'removes a chef_gem with an explicit action' do
     expect(chef_run).to remove_chef_gem('explicit_action')

data/examples/chef_gem/spec/upgrade_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'chef_gem::upgrade' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'upgrades a chef_gem with an explicit action' do
     expect(chef_run).to upgrade_chef_gem('explicit_action')

data/examples/chocolatey_package/spec/install_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'chocolatey_package::install' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+    ChefSpec::SoloRunner.new(platform: 'windows', version: '2016')
                           .converge(described_recipe)
   end
 

data/examples/chocolatey_package/spec/remove_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'chocolatey_package::remove' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+    ChefSpec::SoloRunner.new(platform: 'windows', version: '2016')
                           .converge(described_recipe)
   end
 

data/examples/chocolatey_package/spec/upgrade_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'chocolatey_package::upgrade' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+    ChefSpec::SoloRunner.new(platform: 'windows', version: '2016')
                           .converge(described_recipe)
   end
 

data/examples/compile_time/spec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'compile_time::default' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'matches without .at_compile_time' do
     expect(chef_run).to install_package('compile_time')

data/examples/cookbook_file/spec/create_if_missing_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cookbook_file::create_if_missing' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'creates a cookbook_file with an explicit action' do
     expect(chef_run).to create_cookbook_file_if_missing('/tmp/explicit_action')

data/examples/cookbook_file/spec/create_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cookbook_file::create' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'creates a cookbook_file with the default action' do
     expect(chef_run).to create_cookbook_file('/tmp/default_action')

data/examples/cookbook_file/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cookbook_file::delete' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'deletes a cookbook_file with an explicit action' do
     expect(chef_run).to delete_cookbook_file('/tmp/explicit_action')

data/examples/cookbook_file/spec/touch_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cookbook_file::touch' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'touches a cookbook_file with an explicit action' do
     expect(chef_run).to touch_cookbook_file('/tmp/explicit_action')

data/examples/core/recipes/default.rb

@@ -0,0 +1 @@
+log 'Hello'

data/examples/core/spec/default_spec.rb

@@ -0,0 +1,7 @@
+require 'chefspec'
+
+describe 'core' do
+  platform 'ubuntu'
+
+  it { is_expected.to write_log('Hello') }
+end

data/examples/core/spec/non_recipe_spec.rb

@@ -0,0 +1,5 @@
+require 'chefspec'
+
+describe 1 do
+  it { is_expected.to eq 1 }
+end

data/examples/cron/spec/create_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cron::create' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'creates a cron with the default action' do
     expect(chef_run).to create_cron('default_action')

data/examples/cron/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cron::delete' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'deletes a cron with an explicit action' do
     expect(chef_run).to delete_cron('explicit_action')

data/examples/custom_matcher/spec/install_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'custom_matcher::install' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'installs a custom_matcher with the default action' do
     expect(chef_run).to install_custom_matcher_thing('default_action')

data/examples/custom_matcher/spec/remove_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'custom_matcher::remove' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'removes a custom_matcher with an explicit action' do
     expect(chef_run).to remove_custom_matcher_thing('explicit_action')

data/examples/custom_resource/spec/default_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'custom_resource::default' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04', step_into: ['custom_resource'])
+    ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04', step_into: ['custom_resource'])
                           .converge(described_recipe)
   end
 

data/examples/custom_resource_block/resources/default.rb

@@ -0,0 +1,3 @@
+action :run do
+  log 'hello world'
+end

data/examples/custom_resource_block/spec/default_spec.rb

@@ -0,0 +1,10 @@
+describe 'custom_resource_block' do
+  platform 'ubuntu', '18.04'
+  step_into :custom_resource_block
+  recipe do
+    custom_resource_block 'name'
+  end
+
+  it { is_expected.to run_custom_resource_block('name') }
+  it { is_expected.to write_log('hello world') }
+end

data/examples/directory/spec/create_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'directory::create' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'creates a directory with the default action' do
     expect(chef_run).to create_directory('/tmp/default_action')

data/examples/directory/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'directory::delete' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge(described_recipe) }
 
   it 'deletes a directory with an explicit action' do
     expect(chef_run).to delete_directory('/tmp/explicit_action')

data/examples/dnf_package/spec/install_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 if defined?(Chef::Resource::DnfPackage)
   describe 'dnf_package::install' do
     let(:chef_run) do
-      ChefSpec::ServerRunner.new(platform: 'fedora', version: '25')
+      ChefSpec::SoloRunner.new(platform: 'fedora')
         .converge(described_recipe)
     end