Updated to Berkshelf 4.0

.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 chef-berksfile-env*.gem
+vendor/

chef-berksfile-env.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "berkshelf", "~> 3.0"
+  spec.add_dependency "berkshelf", "~> 4.0"
   spec.add_dependency "chef", ">= 11.0", "< 13.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"

spec/chef-berksfile-env_spec.rb

@@ -3,8 +3,12 @@
 
 describe Chef::Environment do
 
+  before(:all) do
+    berks_install
+  end
+
   describe "#load_berksfile" do
-   
+
     let(:env) do
       env = Chef::Environment.new
 
@@ -40,7 +44,7 @@
       describe "while executing in root dir of relative path" do
         it "should add the Berksfile dependencies" do
           test_env = Chef::Environment.new
-          test_env.load_berksfile "chef-berksfile-env/spec/resources/environments/test_env/Berksfile"
+          test_env.load_berksfile berksfile_path
 
           expect(test_env.cookbook_versions).to eq env.cookbook_versions
         end
@@ -50,7 +54,7 @@
         it "should add the Berksfile dependencies" do
           Dir.chdir "spec/resources" do
             test_env = Chef::Environment.new
-            test_env.load_berksfile "chef-berksfile-env/spec/resources/environments/test_env/Berksfile"
+            test_env.load_berksfile berksfile_path
 
             expect(test_env.cookbook_versions).to eq env.cookbook_versions
           end
@@ -60,8 +64,8 @@
       describe "whose Berksfile does not exist" do
         it "should raise an error" do
           test_env = Chef::Environment.new
-          expect { test_env.load_berksfile "Berksfile" }.to raise_error
-          
+          expect { test_env.load_berksfile "Berksfile" }.to raise_error RuntimeError
+
         end
       end
 
@@ -78,4 +82,4 @@
 
   end
 
-end
+end

spec/resources/environments/test_env/Berksfile

@@ -1,3 +1,3 @@
-source "https://supermarket.getchef.com"
+source "https://supermarket.chef.io"
 
-cookbook "apache_zookeeper"
+cookbook "apache_zookeeper"

spec/spec_helper.rb

@@ -6,4 +6,12 @@ def test_env_path
     File.expand_path(File.join(File.dirname(__FILE__), "resources/environments/test_env.rb"))
   end
 
-end
+  def berksfile_path
+    'chef-berksfile-env/spec/resources/environments/test_env/Berksfile'
+  end
+
+  def berks_install
+    Berkshelf::Berksfile.from_file('spec/resources/environments/test_env/Berksfile').install
+  end
+
+end