chefspec 4.0.2 → 4.1.0

data/examples/route/spec/add_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'route::add' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.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::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'deletes a route with an explicit action' do
     expect(chef_run).to delete_route('10.0.0.2')

data/examples/rpm_package/spec/install_spec.rb

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

data/examples/rpm_package/spec/remove_spec.rb

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

data/examples/rpm_package/spec/upgrade_spec.rb

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

data/examples/ruby_block/spec/run_spec.rb

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

data/examples/script/spec/run_bash_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'script::run_bash' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'runs a bash script with the default action' do
     expect(chef_run).to run_bash('default_action')

data/examples/script/spec/run_csh_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'script::run_csh' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'runs a csh script with the default action' do
     expect(chef_run).to run_csh('default_action')

data/examples/script/spec/run_perl_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'script::run_perl' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'runs a perl script with the default action' do
     expect(chef_run).to run_perl('default_action')

data/examples/script/spec/run_python_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'script::run_python' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'runs a python script with the default action' do
     expect(chef_run).to run_python('default_action')

data/examples/script/spec/run_ruby_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'script::run_ruby' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'runs a ruby script with the default action' do
     expect(chef_run).to run_ruby('default_action')

data/examples/script/spec/run_script_spec.rb

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

data/examples/server/spec/client_spec.rb

@@ -1,16 +1,17 @@
 require 'chefspec'
-require 'chefspec/server'
 
 describe 'server::client' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new do |node, server|
+      server.create_client('bacon', { name: 'bacon' })
+    end.converge(described_recipe)
+  end
 
   it 'does not raise an exception' do
     expect { chef_run }.to_not raise_error
   end
 
   it 'searches the Chef Server for clients' do
-    ChefSpec::Server.create_client('bacon', { name: 'bacon' })
-
     expect(chef_run).to write_log('clients')
       .with_message('client[bacon], client[chef-validator], client[chef-webui]')
   end

data/examples/server/spec/data_bag_spec.rb

@@ -1,15 +1,9 @@
 require 'chefspec'
-require 'chefspec/server'
 
 describe 'server::data_bag' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
-
-  # it 'does not raise an exception' do
-  #   expect { chef_run }.to_not raise_error
-  # end
-
-  it 'searches the Chef Server for the data bag' do
-    ChefSpec::Server.create_data_bag('accounts', {
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new do |node, server|
+      server.create_data_bag('accounts', {
       'github' => {
         'username' => 'sethvargo',
         'password' => 'p@ssW0rd!',
@@ -19,7 +13,14 @@ describe 'server::data_bag' do
         'password' => '0th3r',
       },
     })
+    end.converge(described_recipe)
+  end
 
+  it 'does not raise an exception' do
+    expect { chef_run }.to_not raise_error
+  end
+
+  it 'searches the Chef Server for the data bag' do
     expect(chef_run).to write_log('accounts')
       .with_message('data_bag_item[github], data_bag_item[twitter]')
   end

data/examples/server/spec/environment_spec.rb

@@ -1,16 +1,17 @@
 require 'chefspec'
-require 'chefspec/server'
 
 describe 'server::environment' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new do |node, server|
+      server.create_environment('production')
+    end.converge(described_recipe)
+  end
 
   it 'does not raise an exception' do
     expect { chef_run }.to_not raise_error
   end
 
   it 'searches the Chef Server for environments' do
-    ChefSpec::Server.create_environment('production')
-
     expect(chef_run).to write_log('environments')
       .with_message('_default, production')
   end

data/examples/server/spec/node_spec.rb

@@ -1,28 +1,31 @@
 require 'chefspec'
-require 'chefspec/server'
 
 describe 'server::node' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new do |node, server|
+      server.create_node('bacon', { name: 'bacon' })
+    end.converge(described_recipe)
+  end
 
   it 'does not raise an exception' do
     expect { chef_run }.to_not raise_error
   end
 
   it 'searches the Chef Server for nodes' do
-    ChefSpec::Server.create_node('bacon', { name: 'bacon' })
-
     expect(chef_run).to write_log('nodes')
       .with_message('node[bacon], node[chefspec]')
   end
 
   context 'with custom Ohai data' do
-    it 'has the node data' do
-      ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04')
+    let(:chef_run) do
+      ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '12.04')
         .converge(described_recipe)
+    end
 
-      expect(ChefSpec::Server).to have_node('chefspec')
+    it 'has the node data' do
+      expect(chef_run).to have_node('chefspec')
 
-      node = ChefSpec::Server.node('chefspec')
+      node = chef_run.get_node('chefspec')
       expect(node['kernel']['name']).to eq('Linux')
       expect(node['kernel']['release']).to eq('3.2.0-26-generic')
       expect(node['kernel']['machine']).to eq('x86_64')
@@ -30,14 +33,17 @@ describe 'server::node' do
   end
 
   context 'with overridden node data' do
-    it 'has the node data' do
-      ChefSpec::Runner.new { |node| node.set['breakfast']['bacon'] = true }
-        .converge(described_recipe)
+    let(:chef_run) do
+      ChefSpec::ServerRunner.new do |node, server|
+        node.set['breakfast']['bacon'] = true
+      end.converge(described_recipe)
+    end
 
-      expect(ChefSpec::Server).to have_node('chefspec')
+    it 'has the node data' do
+      expect(chef_run).to have_node('chefspec')
 
-      node = ChefSpec::Server.node('chefspec')
-      expect(node['breakfast']['bacon']).to be_truthy
+      node = chef_run.get_node('chefspec')
+      expect(node['breakfast']['bacon']).to be true
     end
   end
 end

data/examples/server/spec/render_with_cached_spec.rb

@@ -1,13 +1,12 @@
 require 'chefspec'
 require 'chefspec/cacher'
-require 'chefspec/server'
 
 RSpec.configure do |config|
   config.extend(ChefSpec::Cacher)
 end
 
 describe 'server::render_with_cached' do
-  cached(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  cached(:chef_run) { ChefSpec::ServerRunner.converge(described_recipe) }
 
   it 'does not cache file requests' do
     expect(chef_run).to render_file('/tmp/file')

data/examples/server/spec/role_spec.rb

@@ -1,16 +1,17 @@
 require 'chefspec'
-require 'chefspec/server'
 
 describe 'server::role' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new do |node, server|
+      server.create_role('webserver')
+    end.converge(described_recipe)
+  end
 
   it 'does not raise an exception' do
     expect { chef_run }.to_not raise_error
   end
 
   it 'searches the Chef Server for roles' do
-    ChefSpec::Server.create_role('webserver')
-
     expect(chef_run).to write_log('roles')
       .with_message('role[webserver]')
   end

data/examples/server/spec/search_spec.rb

@@ -1,9 +1,6 @@
 require 'chefspec'
-require 'chefspec/server'
 
 describe 'server::search' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
-
   let(:node_1) do
     stub_node('node_1') do |node|
       node.automatic['hostname'] = 'node_1'
@@ -35,11 +32,13 @@ describe 'server::search' do
     end
   end
 
-  before do
-    ChefSpec::Server.create_node(node_1)
-    ChefSpec::Server.create_node(node_2)
-    ChefSpec::Server.create_node(node_3)
-    ChefSpec::Server.create_node(node_4)
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new do |node, server|
+      server.create_node(node_1)
+      server.create_node(node_2)
+      server.create_node(node_3)
+      server.create_node(node_4)
+    end.converge(described_recipe)
   end
 
   it 'finds all nodes with the bar attribute' do

data/examples/service/spec/disable_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'service::disable' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'disables a service with an explicit action' do
     expect(chef_run).to disable_service('explicit_action')

data/examples/service/spec/enable_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'service::enable' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'enables a service with an explicit action' do
     expect(chef_run).to enable_service('explicit_action')

data/examples/service/spec/reload_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'service::reload' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'reloads a service with an explicit action' do
     expect(chef_run).to reload_service('explicit_action')

data/examples/service/spec/restart_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'service::restart' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'restarts a service with an explicit action' do
     expect(chef_run).to restart_service('explicit_action')

data/examples/service/spec/start_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'service::start' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'starts a service with an explicit action' do
     expect(chef_run).to start_service('explicit_action')

data/examples/service/spec/stop_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'service::stop' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'stops a service with an explicit action' do
     expect(chef_run).to stop_service('explicit_action')

data/examples/smartos_package/spec/install_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'smartos_package::install' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   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,7 @@
 require 'chefspec'
 
 describe 'smartos_package::remove' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   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,7 @@
 require 'chefspec'
 
 describe 'smartos_package::upgrade' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   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,7 @@
 require 'chefspec'
 
 describe 'solaris_package::install' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   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,7 @@
 require 'chefspec'
 
 describe 'solaris_package::remove' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'removes a solaris_package with an explicit action' do
     expect(chef_run).to remove_solaris_package('explicit_action')