fixing chefspec by catching _autoload

Signed-off-by: Sean OMeara <sean@chef.io>

Berksfile

@@ -8,5 +8,4 @@ group :integration do
   cookbook 'yum-docker'
   cookbook 'etcd'
   cookbook 'docker_test', path: 'test/cookbooks/docker_test'
-  cookbook 'rspec_helper', path: 'test/cookbooks/rspec_helper'
 end

Gemfile

@@ -1,5 +1,9 @@
 source 'https://rubygems.org'
 
+group :docker do
+  gem 'docker-api', '= 1.26.2'
+end
+
 group :rake do
   gem 'rake'
   gem 'tomlrb'

libraries/_autoload.rb

@@ -1,13 +1,11 @@
-run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+begin
+  gem 'docker-api', '= 1.26.2'
+rescue LoadError
+  run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
 
-require 'chef/resource/chef_gem'
+  require 'chef/resource/chef_gem'
 
-excon = Chef::Resource::ChefGem.new('excon', run_context)
-excon.version '=0.45.4'
-excon.run_action(:install)
-docker = Chef::Resource::ChefGem.new('docker-api', run_context)
-docker.version '=1.26'
-docker.run_action(:install)
-json = Chef::Resource::ChefGem.new('json', run_context)
-json.version '=1.8.3'
-json.run_action(:install)
+  docker = Chef::Resource::ChefGem.new('docker-api', run_context)
+  docker.version '= 1.26.2'
+  docker.run_action(:install)
+end

spec/docker_test/container_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'docker_test::container' do
-  cached(:chef_run) { ChefSpec::SoloRunner.converge('rspec_helper', 'docker_test::container') }
+  cached(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   before do
     stub_command("[ ! -z `docker ps -qaf 'name=busybox_ls$'` ]").and_return(false)

spec/docker_test/image_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'docker_test::image' do
-  cached(:chef_run) { ChefSpec::SoloRunner.converge('docker_test::image') }
+  cached(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   before do
     stub_command('/usr/bin/test -f /tmp/registry/tls/ca-key.pem').and_return(true)

spec/docker_test/network_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'docker_test::network' do
-  cached(:chef_run) { ChefSpec::SoloRunner.converge('docker_test::network') }
+  cached(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   context 'creates a network with defaults' do
     it 'creates docke_network_a' do

spec/docker_test/registry_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'docker_test::registry' do
-  cached(:chef_run) { ChefSpec::SoloRunner.converge('docker_test::registry') }
+  cached(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   before do
     stub_command('/usr/bin/test -f /tmp/registry/tls/ca.pem').and_return(false)

spec/docker_test/volume_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'docker_test::volume' do
-  cached(:chef_run) { ChefSpec::SoloRunner.converge('docker_test::volume') }
+  cached(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   context 'testing remove action' do
     it 'executes docker creates volume --name remove_me' do