chefspec 5.0.0 → 5.1.0

data/examples/smartos_package/spec/install_spec.rb

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

data/examples/smartos_package/spec/remove_spec.rb

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

data/examples/smartos_package/spec/upgrade_spec.rb

@@ -1,7 +1,10 @@
 require 'chefspec'
 
 describe 'smartos_package::upgrade' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'smartos', version: '5.11')
+                        .converge(described_recipe)
+  end
 
   it 'upgrades a smartos_package with an explicit action' do
     expect(chef_run).to upgrade_smartos_package('explicit_action')

data/examples/solaris_package/spec/install_spec.rb

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

data/examples/solaris_package/spec/remove_spec.rb

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

data/examples/state_attrs/providers/lwrp.rb

@@ -1,3 +1,2 @@
 action :run do
-
 end

data/examples/state_attrs/spec/default_spec.rb

@@ -3,7 +3,7 @@ require 'chefspec'
 ChefSpec.define_matcher(:state_attrs_lwrp)
 
 describe 'state_attrs::default' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
   let(:lwrp) { chef_run.state_attrs_lwrp('name') }
 
   it 'has the correct state attributes' do

data/examples/step_into/spec/default_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'step_into::default' do
   context 'without :step_into' do
-    let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+    let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
     it 'does not execute the LWRPs action' do
       expect(chef_run).to_not write_log('message')
@@ -15,9 +15,9 @@ describe 'step_into::default' do
 
   context 'with :step_into' do
     let(:chef_run) do
-      ChefSpec::SoloRunner.new(step_into: ['step_into_lwrp', 'provides_this'])
-        .converge(described_recipe)
-      end
+      ChefSpec::ServerRunner.new(step_into: %w(step_into_lwrp provides_this))
+                          .converge(described_recipe)
+    end
 
     it 'executes the LWRPs action' do
       expect(chef_run).to write_log('message')

data/examples/stub_command/spec/default_spec.rb

@@ -1,13 +1,13 @@
 require 'chefspec'
 
 describe 'stub_command::default' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   context 'when the command is not stubbed' do
     it 'raises an exception' do
-      expect {
+      expect do
         chef_run
-      }.to raise_error(ChefSpec::Error::CommandNotStubbed)
+      end.to raise_error(ChefSpec::Error::CommandNotStubbed)
     end
   end
 

data/examples/stub_data_bag/spec/default_spec.rb

@@ -5,9 +5,9 @@ describe 'stub_data_bag::default' do
 
   context 'when the data_bag is not stubbed' do
     it 'raises an exception' do
-      expect {
+      expect do
         chef_run
-      }.to raise_error(ChefSpec::Error::DataBagNotStubbed)
+      end.to raise_error(ChefSpec::Error::DataBagNotStubbed)
     end
   end
 

data/examples/stub_data_bag_item/spec/default_spec.rb

@@ -5,22 +5,22 @@ describe 'stub_data_bag_item::default' do
 
   context 'when the data_bag_item is not stubbed' do
     it 'raises an exception' do
-      expect {
+      expect do
         chef_run
-      }.to raise_error(ChefSpec::Error::DataBagItemNotStubbed)
+      end.to raise_error(ChefSpec::Error::DataBagItemNotStubbed)
     end
   end
 
   context 'as a Symbol' do
     it 'does not raise an exception' do
-      stub_data_bag_item(:users, 'svargo').and_return({ id: 'svargo', name: 'Seth' })
+      stub_data_bag_item(:users, 'svargo').and_return(id: 'svargo', name: 'Seth')
       expect { chef_run }.to_not raise_error
     end
   end
 
   context 'as a String' do
     it 'does not raise an exception' do
-      stub_data_bag_item('users', 'svargo').and_return({ id: 'svargo', name: 'Seth' })
+      stub_data_bag_item('users', 'svargo').and_return(id: 'svargo', name: 'Seth')
       expect { chef_run }.to_not raise_error
     end
   end

data/examples/stub_search/spec/default_spec.rb

@@ -5,22 +5,22 @@ describe 'stub_search::default' do
 
   context 'when the search is not stubbed' do
     it 'raises an exception' do
-      expect {
+      expect do
         chef_run
-      }.to raise_error(ChefSpec::Error::SearchNotStubbed)
+      end.to raise_error(ChefSpec::Error::SearchNotStubbed)
     end
   end
 
   context 'as a String' do
     it 'does not raise an exception' do
-      stub_search(:node, 'name:example.com').and_return([ { name: 'example.com' } ])
+      stub_search(:node, 'name:example.com').and_return([{ name: 'example.com' }])
       expect { chef_run }.to_not raise_error
     end
   end
 
   context 'as a Regexp' do
     it 'does not raise an exception' do
-      stub_search(:node, /name:(.+)/).and_return([ { name: 'example.com' } ])
+      stub_search(:node, /name:(.+)/).and_return([{ name: 'example.com' }])
       expect { chef_run }.to_not raise_error
     end
   end

data/examples/subscribes/spec/before_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'subscribes::before' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
   let(:service) { chef_run.service('receiving_resource') }
 
   it 'subscribes to the template creation' do

data/examples/subscribes/spec/chained_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'subscribes::chained' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
   let(:service)  { chef_run.service('service') }
   let(:log)      { chef_run.log('log') }
 

data/examples/subscribes/spec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'subscribes::default' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
   let(:service)  { chef_run.service('receiving_resource') }
 
   it 'subscribes to the template creation' do
@@ -14,4 +14,3 @@ describe 'subscribes::default' do
     expect(service).to_not subscribe_to('template[/tmp/notifying_resource]').on(:delete)
   end
 end
-

data/examples/subscribes/spec/delayed_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'subscribes::delayed' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
   let(:service) { chef_run.service('receiving_resource') }
 
   it 'subscribes to the template creation' do

data/examples/subscribes/spec/immediately_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'subscribes::immediately' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
   let(:service) { chef_run.service('receiving_resource') }
 
   it 'sends a notification to the service' do

data/examples/subversion/spec/checkout_spec.rb

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

data/examples/subversion/spec/export_spec.rb

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

data/examples/subversion/spec/force_export_spec.rb

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

data/examples/subversion/spec/sync_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'subversion::sync' do
-  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'syncs a subversion with the default action' do
     expect(chef_run).to sync_subversion('/tmp/default_action')

data/examples/template/spec/create_if_missing_spec.rb

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

data/examples/template/spec/create_spec.rb

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

data/examples/template/spec/delete_spec.rb

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

data/examples/template/spec/touch_spec.rb

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

data/examples/use_inline_resources/spec/default_spec.rb

@@ -2,9 +2,9 @@ require 'chefspec'
 
 describe 'use_inline_resources::default' do
   let(:chef_run) do
-    ChefSpec::SoloRunner.new(step_into: ['use_inline_resources_lwrp'])
-      .converge(described_recipe)
-    end
+    ChefSpec::ServerRunner.new(step_into: ['use_inline_resources_lwrp'])
+                        .converge(described_recipe)
+  end
 
   it 'uses the LWRP' do
     expect(chef_run).to run_use_inline_resources_lwrp('resource')

data/examples/user/spec/create_spec.rb

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

data/examples/user/spec/lock_spec.rb

@@ -1,7 +1,10 @@
 require 'chefspec'
 
 describe 'user::lock' do
-  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '14.04').converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '14.04')
+                        .converge(described_recipe)
+  end
 
   it 'locks a user with an explicit action' do
     expect(chef_run).to lock_user('explicit_action')

data/examples/user/spec/manage_spec.rb

@@ -1,7 +1,10 @@
 require 'chefspec'
 
 describe 'user::manage' do
-  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '14.04').converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '14.04')
+                        .converge(described_recipe)
+  end
 
   it 'manages a user with an explicit action' do
     expect(chef_run).to manage_user('explicit_action')

data/examples/user/spec/modify_spec.rb

@@ -1,7 +1,10 @@
 require 'chefspec'
 
 describe 'user::modify' do
-  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '14.04').converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '14.04')
+                        .converge(described_recipe)
+  end
 
   it 'modifys a user with an explicit action' do
     expect(chef_run).to modify_user('explicit_action')

data/examples/user/spec/remove_spec.rb

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

data/examples/user/spec/unlock_spec.rb

@@ -1,7 +1,10 @@
 require 'chefspec'
 
 describe 'user::unlock' do
-  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '14.04').converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '14.04')
+                        .converge(described_recipe)
+  end
 
   it 'unlocks a user with an explicit action' do
     expect(chef_run).to unlock_user('explicit_action')

data/examples/windows_package/spec/install_spec.rb

@@ -1,12 +1,10 @@
 require 'chefspec'
 
-RSpec.configure do |config|
-  config.platform = 'windows'
-  config.version  = '2012R2'
-end
-
 describe 'windows_package::install' 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 'installs a windows_package with an explicit action' do
     expect(chef_run).to install_windows_package('explicit_action')