chefspec 3.4.0 → 4.0.0

data/spec/unit/runner_spec.rb

@@ -2,11 +2,29 @@ require 'spec_helper'
 
 describe ChefSpec::Runner do
   before do
-    ChefSpec::Runner.any_instance.stub(:dry_run?).and_return(true)
+    allow_any_instance_of(ChefSpec::Runner).to receive(:dry_run?).and_return(true)
   end
 
   describe '#initialize' do
     subject {} # need to explicitly control the creation
+    let(:windows_caller_stack) {
+      ["C:/cookbooks/Temp/spec/test_spec.rb:11:in `block (2 levels) in <top (required)>'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/example.rb:114:in `instance_eval'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/example.rb:114:in `block in run'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/example.rb:254:in `with_around_each_hooks'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/example.rb:111:in `run'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/example_group.rb:390:in `block in run_examples'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/example_group.rb:386:in `map'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/example_group.rb:386:in `run_examples'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/example_group.rb:371:in `run'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/command_line.rb:28:in `block (2 levels) in run'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/command_line.rb:28:in `map'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/command_line.rb:28:in `block in run'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/reporter.rb:58:in `report'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/command_line.rb:25:in `run'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/runner.rb:80:in `run'",
+       "C:/Ruby193/lib/ruby/gems/1.9.1/gems/rspec-core-2.14.8/lib/rspec/core/runner.rb:17:in `block in autorun'"]
+    }
 
     it 'defaults the log level to :warn' do
       described_class.new
@@ -23,6 +41,17 @@ describe ChefSpec::Runner do
       expect(Chef::Config.cookbook_path).to eq([File.expand_path('../../../..', __FILE__)])
     end
 
+    it 'defaults the cookbook_path to the calling spec when using windows paths' do
+      runner = described_class.new
+      windows_path = runner.instance_exec(windows_caller_stack) { |callstack|
+        calling_cookbook_path(callstack)
+      }
+      # There's got to be a better way to do this the File.expand_path returns
+      # something like /home/user/repos/chefspec/C:/cookbooks" which is less
+      # than ideal as a robust test
+      expect(windows_path).to end_with("C:/cookbooks")
+    end
+
     it 'sets the cookbook path' do
       described_class.new(cookbook_path: '/tmp/bacon')
       expect(Chef::Config.cookbook_path).to eq(['/tmp/bacon'])
@@ -30,8 +59,9 @@ describe ChefSpec::Runner do
 
     it 'sets the Chef::Config' do
       expect(Chef::Config.cache_type).to eq('Memory')
-      expect(Chef::Config.force_logger).to be_true
-      expect(Chef::Config.solo).to be_true
+      expect(Chef::Config.force_logger).to be_truthy
+      expect(Chef::Config.no_lazy_load).to be_truthy
+      expect(Chef::Config.solo).to be_truthy
     end
 
     it 'yields a block to set node attributes' do
@@ -43,7 +73,7 @@ describe ChefSpec::Runner do
 
       it 'sets the default attributes' do
         expect(hash['os']).to eq('chefspec')
-        expect(hash['languages']['ruby']).to eq('/usr/somewhere')
+        expect(hash['languages']['ruby']['bin_dir']).to eq('/usr/local/bin')
         expect(hash['os_version']).to eq('0.6.1')
         expect(hash['fqdn']).to eq('chefspec.local')
         expect(hash['domain']).to eq('local')
@@ -70,11 +100,11 @@ describe ChefSpec::Runner do
 
     context 'RSpec global configuration' do
       before do
-        RSpec.configuration.stub(:cookbook_path).and_return('./path')
-        RSpec.configuration.stub(:log_level).and_return(:fatal)
-        RSpec.configuration.stub(:path).and_return('ohai.json')
-        RSpec.configuration.stub(:platform).and_return('ubuntu')
-        RSpec.configuration.stub(:version).and_return('12.04')
+        allow(RSpec.configuration).to receive(:cookbook_path).and_return('./path')
+        allow(RSpec.configuration).to receive(:log_level).and_return(:fatal)
+        allow(RSpec.configuration).to receive(:path).and_return('ohai.json')
+        allow(RSpec.configuration).to receive(:platform).and_return('ubuntu')
+        allow(RSpec.configuration).to receive(:version).and_return('12.04')
       end
 
       it 'uses the RSpec values' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.12'
 - !ruby/object:Gem::Dependency
   name: fauxhai
   requirement: !ruby/object:Gem::Requirement
@@ -45,28 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: chef-zero
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -446,12 +432,14 @@ files:
 - examples/server/recipes/data_bag.rb
 - examples/server/recipes/environment.rb
 - examples/server/recipes/node.rb
+- examples/server/recipes/render_with_cached.rb
 - examples/server/recipes/role.rb
 - examples/server/recipes/search.rb
 - examples/server/spec/client_spec.rb
 - examples/server/spec/data_bag_spec.rb
 - examples/server/spec/environment_spec.rb
 - examples/server/spec/node_spec.rb
+- examples/server/spec/render_with_cached_spec.rb
 - examples/server/spec/role_spec.rb
 - examples/server/spec/search_spec.rb
 - examples/service/recipes/disable.rb
@@ -616,11 +604,7 @@ files:
 - features/use_inline_resources.feature
 - features/user.feature
 - features/yum_package.feature
-- gemfiles/chef-11.0.0.gemfile
-- gemfiles/chef-11.2.0.gemfile
-- gemfiles/chef-11.4.4.gemfile
-- gemfiles/chef-11.6.0.gemfile
-- gemfiles/chef-11.8.0.gemfile
+- gemfiles/chef-11.12.0.gemfile
 - gemfiles/chef-master.gemfile
 - lib/chefspec.rb
 - lib/chefspec/api.rb
@@ -686,6 +670,7 @@ files:
 - lib/chefspec/extensions/chef/data_query.rb
 - lib/chefspec/extensions/chef/lwrp_base.rb
 - lib/chefspec/extensions/chef/resource.rb
+- lib/chefspec/extensions/chef/resource/freebsd_package.rb
 - lib/chefspec/extensions/chef/securable.rb
 - lib/chefspec/formatter.rb
 - lib/chefspec/librarian.rb

data/gemfiles/chef-11.2.0.gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'chef', '11.2.0'
-
-gemspec :path => '..'

data/gemfiles/chef-11.4.4.gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'chef', '11.4.4'
-
-gemspec :path => '..'

data/gemfiles/chef-11.6.0.gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'chef', '11.6.0'
-
-gemspec :path => '..'

data/gemfiles/chef-11.8.0.gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'chef', '11.8.0'
-
-gemspec :path => '..'