chefspec 5.0.0 → 5.1.0

data/examples/deploy/spec/deploy_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'deploy::deploy' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'deploys a deploy with an explicit action' do
     expect(chef_run).to deploy_deploy('/tmp/explicit_action')

data/examples/deploy/spec/force_deploy_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'deploy::force_deploy' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'force deploys a deploy with an explicit action' do
     expect(chef_run).to force_deploy_deploy('/tmp/explicit_action')

data/examples/deploy/spec/rollback_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'deploy::rollback' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'rollsback deploys a deploy with an explicit action' do
     expect(chef_run).to rollback_deploy('/tmp/explicit_action')

data/examples/directory/spec/create_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'directory::create' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'creates a directory with the default action' do
     expect(chef_run).to create_directory('/tmp/default_action')
@@ -15,17 +15,17 @@ describe 'directory::create' do
   it 'creates a directory with attributes' do
     expect(chef_run).to create_directory('/tmp/with_attributes').with(
       user:   'user',
-      group:  'group',
+      group:  'group'
     )
 
     expect(chef_run).to_not create_directory('/tmp/with_attributes').with(
       user:   'bacon',
-      group:  'fat',
+      group:  'fat'
     )
   end
 
   it 'creates a directory with windows rights' do
-    expect(chef_run).to create_directory('c:\temp\with_windows_rights').with(rights: [{:permissions=>:read_execute, :principals=>"Users", :applies_to_children=>true}])
+    expect(chef_run).to create_directory('c:\temp\with_windows_rights').with(rights: [{ permissions: :read_execute, principals: 'Users', applies_to_children: true }])
   end
 
   it 'creates a directory when specifying the identity attribute' do

data/examples/directory/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'directory::delete' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'deletes a directory with an explicit action' do
     expect(chef_run).to delete_directory('/tmp/explicit_action')
@@ -11,12 +11,12 @@ describe 'directory::delete' do
   it 'deletes a directory with attributes' do
     expect(chef_run).to delete_directory('/tmp/with_attributes').with(
       user:   'user',
-      group:  'group',
+      group:  'group'
     )
 
     expect(chef_run).to_not delete_directory('/tmp/with_attributes').with(
       user:   'bacon',
-      group:  'fat',
+      group:  'fat'
     )
   end
 

data/examples/do_nothing/spec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'do_nothing::default' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'includes the `other` recipe' do
     execute = chef_run.execute('install')

data/examples/dpkg_package/spec/install_spec.rb

@@ -1,12 +1,10 @@
 require 'chefspec'
 
-RSpec.configure do |config|
-  config.platform = 'ubuntu'
-  config.version  = '14.04'
-end
-
 describe 'dpkg_package::install' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+                        .converge(described_recipe)
+  end
 
   it 'installs a dpkg_package with the default action' do
     expect(chef_run).to install_dpkg_package('default_action')

data/examples/dpkg_package/spec/purge_spec.rb

@@ -1,12 +1,10 @@
 require 'chefspec'
 
-RSpec.configure do |config|
-  config.platform = 'ubuntu'
-  config.version  = '14.04'
-end
-
 describe 'dpkg_package::purge' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+                        .converge(described_recipe)
+  end
 
   it 'purges a dpkg_package with an explicit action' do
     expect(chef_run).to purge_dpkg_package('explicit_action')

data/examples/dpkg_package/spec/remove_spec.rb

@@ -1,12 +1,10 @@
 require 'chefspec'
 
-RSpec.configure do |config|
-  config.platform = 'ubuntu'
-  config.version  = '14.04'
-end
-
 describe 'dpkg_package::remove' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
+                        .converge(described_recipe)
+  end
 
   it 'removes a dpkg_package with an explicit action' do
     expect(chef_run).to remove_dpkg_package('explicit_action')

data/examples/dsc_resource/recipes/{default.rb → run.rb}

@@ -1,11 +1,11 @@
 dsc_resource 'archive resource' do
-   resource :archive
-   property :ensure, 'present'
-   property :path, 'C:\Users\Public\Documents\example.zip'
-   property :destination, 'C:\Users\Public\Documents\ExtractionPath'
- end
+  resource :archive
+  property :ensure, 'present'
+  property :path, 'C:\Users\Public\Documents\example.zip'
+  property :destination, 'C:\Users\Public\Documents\ExtractionPath'
+end
 
- dsc_resource 'group resource' do
+dsc_resource 'group resource' do
   resource :group
   property :groupname, 'demo1'
   property :ensure, 'present'

data/examples/dsc_resource/spec/{default_spec.rb → run_spec.rb}

@@ -1,12 +1,10 @@
 require 'chefspec'
 
-RSpec.configure do |config|
-  config.platform = 'windows'
-  config.version  = '2012R2'
-end
-
-describe 'dsc_resource::default' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+describe 'dsc_resource::run' do
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+                        .converge(described_recipe)
+  end
 
   it 'runs dsc_resource with the archive resource' do
     expect(chef_run).to run_dsc_resource('archive resource').with(

data/examples/dsc_script/recipes/run.rb

@@ -0,0 +1,12 @@
+dsc_script 'default_action' do
+  code <<-EOH
+    Something
+  EOH
+end
+
+dsc_script 'explicit_action' do
+  code <<-EOH
+    Another thing
+  EOH
+  action :run
+end

data/examples/dsc_script/spec/run_spec.rb

@@ -0,0 +1,16 @@
+require 'chefspec'
+
+describe 'dsc_script::run' do
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+                        .converge(described_recipe)
+  end
+
+  it 'runs dsc_script with default action' do
+    expect(chef_run).to run_dsc_script('default_action')
+  end
+
+  it 'runs dsc_script with explicit action' do
+    expect(chef_run).to run_dsc_script('explicit_action')
+  end
+end

data/examples/easy_install_package/spec/install_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'easy_install_package::install' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'installs a easy_install_package with the default action' do
     expect(chef_run).to install_easy_install_package('default_action')

data/examples/easy_install_package/spec/purge_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'easy_install_package::purge' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'purges a easy_install_package with an explicit action' do
     expect(chef_run).to purge_easy_install_package('explicit_action')

data/examples/easy_install_package/spec/remove_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'easy_install_package::remove' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'removes a easy_install_package with an explicit action' do
     expect(chef_run).to remove_easy_install_package('explicit_action')

data/examples/easy_install_package/spec/upgrade_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'easy_install_package::upgrade' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'upgrades a easy_install_package with an explicit action' do
     expect(chef_run).to upgrade_easy_install_package('explicit_action')

data/examples/env/spec/create_spec.rb

@@ -1,12 +1,10 @@
 require 'chefspec'
 
-RSpec.configure do |config|
-  config.platform = 'windows'
-  config.version  = '2012R2'
-end
-
 describe 'env::create' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+                        .converge(described_recipe)
+  end
 
   it 'creates a env with the default action' do
     expect(chef_run).to create_env('default_action')

data/examples/env/spec/delete_spec.rb

@@ -1,12 +1,10 @@
 require 'chefspec'
 
-RSpec.configure do |config|
-  config.platform = 'windows'
-  config.version  = '2012R2'
-end
-
 describe 'env::delete' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+                        .converge(described_recipe)
+  end
 
   it 'deletes a env with an explicit action' do
     expect(chef_run).to delete_env('explicit_action')

data/examples/env/spec/modify_spec.rb

@@ -1,12 +1,10 @@
 require 'chefspec'
 
-RSpec.configure do |config|
-  config.platform = 'windows'
-  config.version  = '2012R2'
-end
-
 describe 'env::modify' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+                        .converge(described_recipe)
+  end
 
   it 'modifies a env with an explicit action' do
     expect(chef_run).to modify_env('explicit_action')

data/examples/erl_call/spec/run_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'erl_call::run' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'runs a erl_call with the default action' do
     expect(chef_run).to run_erl_call('default_action')

data/examples/execute/spec/run_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'execute::run' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'runs a execute with the default action' do
     expect(chef_run).to run_execute('default_action')

data/examples/expect_exception/spec/compile_error_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'expect_exception::compile_error' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'raises an error' do
     expect(Chef::Formatters::ErrorMapper).to_not receive(:file_load_failed)

data/examples/expect_exception/spec/converge_error_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'expect_exception::converge_error' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'raises an error' do
     expect(Chef::Formatters::ErrorMapper).to_not receive(:file_load_failed)

data/examples/expect_exception/spec/no_error_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'expect_exception::no_error' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'does not raise an error' do
     expect(Chef::Formatters::ErrorMapper).to_not receive(:file_load_failed)

data/examples/file/spec/create_if_missing_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'file::create_if_missing' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'creates a file with an explicit action' do
     expect(chef_run).to create_file_if_missing('/tmp/explicit_action')
@@ -12,13 +12,13 @@ describe 'file::create_if_missing' do
     expect(chef_run).to create_file_if_missing('/tmp/with_attributes').with(
       user:   'user',
       group:  'group',
-      backup: false,
+      backup: false
     )
 
     expect(chef_run).to_not create_file_if_missing('/tmp/with_attributes').with(
       user:   'bacon',
       group:  'fat',
-      backup: true,
+      backup: true
     )
   end
 

data/examples/file/spec/create_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'file::create' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'creates a file with the default action' do
     expect(chef_run).to create_file('/tmp/default_action')
@@ -16,13 +16,13 @@ describe 'file::create' do
     expect(chef_run).to create_file('/tmp/with_attributes').with(
       user:   'user',
       group:  'group',
-      backup: false,
+      backup: false
     )
 
     expect(chef_run).to_not create_file('/tmp/with_attributes').with(
       user:   'bacon',
       group:  'fat',
-      backup: true,
+      backup: true
     )
   end
 

data/examples/file/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'file::delete' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'deletes a file with an explicit action' do
     expect(chef_run).to delete_file('/tmp/explicit_action')

data/examples/file/spec/touch_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'file::touch' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'touches a file with an explicit action' do
     expect(chef_run).to touch_file('/tmp/explicit_action')

data/examples/freebsd_package/spec/install_spec.rb

@@ -1,7 +1,10 @@
 require 'chefspec'
 
 describe 'freebsd_package::install' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'freebsd', version: '10.3')
+                        .converge(described_recipe)
+  end
 
   it 'installs a freebsd_package with the default action' do
     expect(chef_run).to install_freebsd_package('default_action')

data/examples/freebsd_package/spec/remove_spec.rb

@@ -1,7 +1,10 @@
 require 'chefspec'
 
 describe 'freebsd_package::remove' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'freebsd', version: '10.3')
+                        .converge(described_recipe)
+  end
 
   it 'removes a freebsd_package with an explicit action' do
     expect(chef_run).to remove_freebsd_package('explicit_action')