Merge pull request #45 from bkw/chefspec-4.1.0

update to chefspec 4.1.1

Author: chris-rock

Gemfile

@@ -3,11 +3,11 @@
 source 'https://rubygems.org'
 
 gem 'berkshelf',  '~> 3.0'
-gem 'chef',       '~> 11.12'
+gem 'chef',       '>= 11.14'
 
 group :test do
   gem 'rake'
-  gem 'chefspec',   '~> 4.0.2'
+  gem 'chefspec',   '~> 4.1.1'
   gem 'foodcritic', '~> 3.0'
   gem 'thor-foodcritic'
   gem 'rubocop',    '~> 0.26.1'

spec/recipes/client_spec.rb

@@ -21,7 +21,7 @@
 
   # converge
   cached(:chef_run) do
-    ChefSpec::Runner.new.converge(described_recipe)
+    ChefSpec::ServerRunner.new.converge(described_recipe)
   end
 
   it 'installs openssh-client' do
@@ -66,7 +66,7 @@
 
   context 'with weak hmacs enabled' do
     cached(:chef_run) do
-      ChefSpec::Runner.new do |node|
+      ChefSpec::ServerRunner.new do |node|
         node.set['ssh']['weak_hmac'] = true
       end.converge(described_recipe)
     end
@@ -89,7 +89,7 @@
 
   context 'with weak kexs enabled' do
     cached(:chef_run) do
-      ChefSpec::Runner.new do |node|
+      ChefSpec::ServerRunner.new do |node|
         node.set['ssh']['weak_kex'] = true
       end.converge(described_recipe)
     end
@@ -112,7 +112,7 @@
 
   context 'with cbc required' do
     cached(:chef_run) do
-      ChefSpec::Runner.new do |node|
+      ChefSpec::ServerRunner.new do |node|
         node.set['ssh']['cbc_required'] = true
       end.converge(described_recipe)
     end

spec/recipes/default_spec.rb

@@ -19,13 +19,11 @@
 
 describe 'ssh-hardening::default' do
 
-  before(:each) do
-    ChefSpec::Server.create_data_bag('users', 'someuser' => { id: 'someuser' })
-  end
-
   # converge
   cached(:chef_run) do
-    ChefSpec::Runner.new.converge(described_recipe)
+    ChefSpec::ServerRunner.new do |_node, server|
+      server.create_data_bag('users', 'someuser' => { id: 'someuser' })
+    end.converge(described_recipe)
   end
 
   # check that the recipes are executed

spec/recipes/server_spec.rb

@@ -19,13 +19,11 @@
 
 describe 'ssh-hardening::server' do
 
-  before(:each) do
-    ChefSpec::Server.create_data_bag('users', 'someuser' => { id: 'someuser' })
-  end
-
   # converge
   cached(:chef_run) do
-    ChefSpec::Runner.new.converge(described_recipe)
+    ChefSpec::ServerRunner.new do |_node, server|
+      server.create_data_bag('users', 'someuser' => { id: 'someuser' })
+    end.converge(described_recipe)
   end
 
   it 'installs openssh-server' do
@@ -78,7 +76,8 @@
 
   context 'with weak hmacs enabled' do
     cached(:chef_run) do
-      ChefSpec::Runner.new do |node|
+      ChefSpec::ServerRunner.new do |node, server|
+        server.create_data_bag('users', 'someuser' => { id: 'someuser' })
         node.set['ssh']['weak_hmac'] = true
       end.converge(described_recipe)
     end
@@ -101,8 +100,9 @@
 
   context 'with weak kexs enabled' do
     cached(:chef_run) do
-      ChefSpec::Runner.new do |node|
+      ChefSpec::ServerRunner.new do |node, server|
         node.set['ssh']['weak_kex'] = true
+        server.create_data_bag('users', 'someuser' => { id: 'someuser' })
       end.converge(described_recipe)
     end
 
@@ -124,8 +124,9 @@
 
   context 'with cbc required' do
     cached(:chef_run) do
-      ChefSpec::Runner.new do |node|
+      ChefSpec::ServerRunner.new do |node, server|
         node.set['ssh']['cbc_required'] = true
+        server.create_data_bag('users', 'someuser' => { id: 'someuser' })
       end.converge(described_recipe)
     end
 
@@ -180,8 +181,9 @@
 
   context 'with attribute allow_root_with_key' do
     cached(:chef_run) do
-      ChefSpec::Runner.new do |node|
+      ChefSpec::ServerRunner.new do |node, server|
         node.set['ssh']['allow_root_with_key'] = true
+        server.create_data_bag('users', 'someuser' => { id: 'someuser' })
       end.converge(described_recipe)
     end
 
@@ -192,18 +194,16 @@
   end
 
   context 'with users data bag' do
-    before(:each) do
-      ChefSpec::Server.create_data_bag(
+    cached(:chef_run) do
+      ChefSpec::ServerRunner.new do |_node, server|
+        server.create_data_bag(
         'users',
         'user1' => { id: 'user1', ssh_rootkey: 'key-user1' },
         'user2' => { id: 'user2', ssh_rootkey: 'key-user2' },
         'user3' => { id: 'user3', ssh_rootkeys: %w(key1-user3 key2-user3) },
         'user4' => { id: 'user4', ssh_rootkeys: %w(key1-user4) }
       )
-    end
-
-    cached(:chef_run) do
-      ChefSpec::Runner.new.converge(described_recipe)
+      end.converge(described_recipe)
     end
 
     it 'creates authorized_keys for root' do

spec/spec_helper.rb

@@ -18,7 +18,6 @@
 require 'chefspec'
 require 'chefspec/berkshelf'
 require 'chefspec/cacher'
-require 'chefspec/server'
 require 'coveralls'
 
 # coverage report