chefspec 7.2.1 → 7.3.0

data/examples/osx_profile/spec/remove_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'osx_profile::remove' do
-  let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'mac_os_x', version: '10.12').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'mac_os_x', version: '10.13').converge(described_recipe) }
 
   it 'removes an osx_profile from the resource name' do
     expect(chef_run).to remove_osx_profile('specifying profile')

data/examples/package/spec/install_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'package::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 package with the default action' do
     expect(chef_run).to install_package('default_action')

data/examples/package/spec/lock_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'package::lock' 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 'locks a package with an explicit action' do
     expect(chef_run).to lock_package('explicit_action')

data/examples/package/spec/purge_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'package::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 package with an explicit action' do
     expect(chef_run).to purge_package('explicit_action')

data/examples/package/spec/reconfig_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'package::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 package with an explicit action' do
     expect(chef_run).to reconfig_package('explicit_action')

data/examples/package/spec/remove_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'package::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 package with an explicit action' do
     expect(chef_run).to remove_package('explicit_action')

data/examples/package/spec/unlock_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'package::unlock' 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 'unlocks a package with an explicit action' do
     expect(chef_run).to unlock_package('explicit_action')

data/examples/package/spec/upgrade_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'package::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 package with an explicit action' do
     expect(chef_run).to upgrade_package('explicit_action')

data/examples/pacman_package/spec/install_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'pacman_package::install' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'arch', version: '4.10.13-1-ARCH')
+    ChefSpec::SoloRunner.new(platform: 'arch', version: '4.10.13-1-ARCH')
                           .converge(described_recipe)
   end
 

data/examples/pacman_package/spec/purge_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'pacman_package::purge' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'arch', version: '4.10.13-1-ARCH')
+    ChefSpec::SoloRunner.new(platform: 'arch', version: '4.10.13-1-ARCH')
                           .converge(described_recipe)
   end
 

data/examples/pacman_package/spec/remove_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'pacman_package::remove' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'arch', version: '4.10.13-1-ARCH')
+    ChefSpec::SoloRunner.new(platform: 'arch', version: '4.10.13-1-ARCH')
                           .converge(described_recipe)
   end
 

data/examples/pacman_package/spec/upgrade_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'pacman_package::upgrade' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'arch', version: '4.10.13-1-ARCH')
+    ChefSpec::SoloRunner.new(platform: 'arch', version: '4.10.13-1-ARCH')
                           .converge(described_recipe)
   end
 

data/examples/paludis_package/spec/install_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'paludis_package::install' do
-  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.6-gentoo-r1').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.95-gentoo').converge(described_recipe) }
 
   it 'installs a paludis_package with the default action' do
     expect(chef_run).to install_paludis_package('default_action')

data/examples/paludis_package/spec/purge_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'paludis_package::purge' do
-  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.6-gentoo-r1').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.95-gentoo').converge(described_recipe) }
 
   it 'purges a paludis_package with an explicit action' do
     expect(chef_run).to purge_paludis_package('explicit_action')

data/examples/paludis_package/spec/remove_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'paludis_package::remove' do
-  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.6-gentoo-r1').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.95-gentoo').converge(described_recipe) }
 
   it 'removes a paludis_package with an explicit action' do
     expect(chef_run).to remove_paludis_package('explicit_action')

data/examples/paludis_package/spec/upgrade_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'paludis_package::upgrade' do
-  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.6-gentoo-r1').converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.95-gentoo').converge(described_recipe) }
 
   it 'upgrades a paludis_package with an explicit action' do
     expect(chef_run).to upgrade_paludis_package('explicit_action')

data/examples/portage_package/spec/install_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'portage_package::install' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'gentoo', version: '4.9.6-gentoo-r1')
+    ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.95-gentoo')
                           .converge(described_recipe)
   end
 

data/examples/portage_package/spec/purge_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'portage_package::purge' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'gentoo', version: '4.9.6-gentoo-r1')
+    ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.95-gentoo')
                           .converge(described_recipe)
   end
 

data/examples/portage_package/spec/remove_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'portage_package::remove' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'gentoo', version: '4.9.6-gentoo-r1')
+    ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.95-gentoo')
                           .converge(described_recipe)
   end
 

data/examples/portage_package/spec/upgrade_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'portage_package::upgrade' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'gentoo', version: '4.9.6-gentoo-r1')
+    ChefSpec::SoloRunner.new(platform: 'gentoo', version: '4.9.95-gentoo')
                           .converge(described_recipe)
   end
 

data/examples/powershell_script/spec/run_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'powershell_script::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/reboot/spec/cancel_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'reboot::cancel' 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 'runs a cancel_reboot' do
     expect(chef_run).to cancel_reboot('explicit cancel')

data/examples/reboot/spec/now_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'reboot::now' 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 'runs a reboot_now when specifying action' do
     expect(chef_run).to now_reboot('explicit_action')

data/examples/reboot/spec/request_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'reboot::request' 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 'runs a request_reboot' do
     expect(chef_run).to request_reboot('explicit_action')

data/examples/recipe_block/metadata.rb

@@ -0,0 +1 @@
+name "recipe_block"

data/examples/recipe_block/spec/recipe_block_spec.rb

@@ -0,0 +1,34 @@
+describe 'recipe block' do
+  platform 'ubuntu', '18.04'
+  recipe do
+    log 'this is a recipe block'
+  end
+
+  it { expect(chef_run).to write_log('this is a recipe block') }
+  it { expect(subject).to write_log('this is a recipe block') }
+  it { is_expected.to write_log('this is a recipe block') }
+end
+
+describe 'complex recipe block' do
+  platform 'ubuntu', '18.04'
+  recipe do
+    package 'apache2' do
+      version '1.2.3'
+    end
+    template '/etc/apache2/apache2.conf' do
+      source 'apache2.conf.erb'
+      owner 'root'
+      variables platform: node['platform']
+    end
+    service 'apache2' do
+      action [:start, :enable]
+      subscribes :restart, 'template[/etc/apache2/apache2.conf]'
+    end
+  end
+
+  it { is_expected.to install_package('apache2').with(version: '1.2.3') }
+  it { is_expected.to render_file('/etc/apache2/apache2.conf').with_content("Hello ubuntu\n") }
+  it { is_expected.to start_service('apache2') }
+  it { is_expected.to enable_service('apache2') }
+  it { expect(chef_run.template('/etc/apache2/apache2.conf')).to notify('service[apache2]') }
+end

data/examples/recipe_block/templates/apache2.conf.erb

@@ -0,0 +1 @@
+Hello <%= @platform %>

data/examples/registry_key/spec/create_if_missing_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'registry_key::create_if_missing' 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/registry_key/spec/create_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'registry_key::create' 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/registry_key/spec/delete_key_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'registry_key::delete_key' 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/registry_key/spec/delete_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'registry_key::delete' 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/remote_directory/spec/create_if_missing_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'remote_directory::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 remote_directory with an explicit action' do
     expect(chef_run).to create_remote_directory_if_missing('/tmp/explicit_action')

data/examples/remote_directory/spec/create_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'remote_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 remote_directory with the default action' do
     expect(chef_run).to create_remote_directory('/tmp/default_action')

data/examples/remote_directory/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'remote_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 remote_directory with an explicit action' do
     expect(chef_run).to delete_remote_directory('/tmp/explicit_action')

data/examples/remote_file/spec/create_if_missing_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'remote_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 remote_file with an explicit action' do
     expect(chef_run).to create_remote_file_if_missing('/tmp/explicit_action')

data/examples/remote_file/spec/create_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'remote_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 remote_file with the default action' do
     expect(chef_run).to create_remote_file('/tmp/default_action')

data/examples/remote_file/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'remote_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 remote_file with an explicit action' do
     expect(chef_run).to delete_remote_file('/tmp/explicit_action')

data/examples/remote_file/spec/touch_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'remote_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 'touchs a remote_file with an explicit action' do
     expect(chef_run).to touch_remote_file('/tmp/explicit_action')

data/examples/render_file/spec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'render_file::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) }
 
   context 'file' do
     it 'renders the file' do
@@ -74,6 +74,17 @@ describe 'render_file::default' do
           end_with('not')
         )
       end
+
+      it 'renders the file with chained content matchers' do
+        expect(chef_run).to render_file('/tmp/cookbook_file')
+          .with_content('This')
+          .with_content('is')
+          .with_content('content!')
+        expect(chef_run).to_not render_file('/tmp/cookbook_file')
+          .with_content('Sparta!')
+          .with_content('is')
+          .with_content('This')
+      end
     end
 
     context 'with a pristine filesystem' do

data/examples/render_file/spec/template_helpers_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'render_file::template_helpers' 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 'renders the file using a helper' do
     expect(chef_run).to render_file('/tmp/template_with_helper')

data/examples/roles/spec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'roles' do
-  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '16.04').converge('role[role]') }
+  let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04').converge('role[role]') }
 
   it 'expands the run_list' do
     expect(chef_run).to include_recipe('roles::default')

data/examples/route/spec/add_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'route::add' 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 'adds a route with the default action' do
     expect(chef_run).to add_route('10.0.0.1')

data/examples/route/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'route::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 route with an explicit action' do
     expect(chef_run).to delete_route('10.0.0.2')