chef 12.0.0.alpha.2 → 12.0.0.rc.0

data/spec/unit/resource/smartos_package_spec.rb

@@ -16,23 +16,18 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+require 'spec_helper'
+require 'support/shared/unit/resource/static_provider_resolution'
 
 describe Chef::Resource::SmartosPackage, "initialize" do
 
-  before(:each) do
-    @resource = Chef::Resource::SmartosPackage.new("foo")
-  end
+  static_provider_resolution(
+    resource: Chef::Resource::SmartosPackage,
+    provider: Chef::Provider::Package::SmartOS,
+    name: :smartos_package,
+    action: :install,
+    os: "solaris2",
+    platform_family: "smartos",
+  )
 
-  it "should return a Chef::Resource::SmartosPackage" do
-    @resource.should be_a_kind_of(Chef::Resource::SmartosPackage)
-  end
-
-  it "should set the resource_name to :smartos_package" do
-    @resource.resource_name.should eql(:smartos_package)
-  end
-
-  it "should set the provider to Chef::Provider::Package::SmartOS" do
-    @resource.provider.should eql(Chef::Provider::Package::SmartOS)
-  end
 end

data/spec/unit/resource/solaris_package_spec.rb

@@ -17,41 +17,26 @@
 #
 
 require 'spec_helper'
+require 'support/shared/unit/resource/static_provider_resolution'
 
 describe Chef::Resource::SolarisPackage, "initialize" do
 
-  before(:each) do
-    @resource = Chef::Resource::SolarisPackage.new("foo")
-  end
-
-  it "should return a Chef::Resource::SolarisPackage object" do
-    @resource.should be_a_kind_of(Chef::Resource::SolarisPackage)
+  %w{solaris2 nexentacore}.each do |platform_family|
+    static_provider_resolution(
+      resource: Chef::Resource::SolarisPackage,
+      provider: Chef::Provider::Package::Solaris,
+      name: :solaris_package,
+      action: :install,
+      os: "solaris2",
+      platform_family: platform_family,
+    )
   end
 
-  it "should not raise any Error when valid number of arguments are provided" do
-    expect { Chef::Resource::SolarisPackage.new("foo") }.to_not raise_error
-  end
-
-  it "should raise ArgumentError when incorrect number of arguments are provided" do
-    expect { Chef::Resource::SolarisPackage.new }.to raise_error(ArgumentError)
+  before(:each) do
+    @resource = Chef::Resource::SolarisPackage.new("foo")
   end
 
   it "should set the package_name to the name provided" do
-    @resource.package_name.should eql("foo")
-  end
-
-  it "should set the resource_name to :solaris_package" do
-    @resource.resource_name.should eql(:solaris_package)
-  end
-
-  it "should set the run_context to the run_context provided" do
-    @run_context = double()
-    @run_context.stub(:node)
-    resource = Chef::Resource::SolarisPackage.new("foo", @run_context)
-    resource.run_context.should eql(@run_context)
-  end
-
-  it "should set the provider to Chef::Provider::Package::Solaris" do
-    @resource.provider.should eql(Chef::Provider::Package::Solaris)
+    expect(@resource.package_name).to eql("foo")
   end
 end

data/spec/unit/resource/subversion_spec.rb

@@ -17,47 +17,51 @@
 #
 
 require 'spec_helper'
+require 'support/shared/unit/resource/static_provider_resolution'
 
 describe Chef::Resource::Subversion do
 
+  static_provider_resolution(
+    resource: Chef::Resource::Subversion,
+    provider: Chef::Provider::Subversion,
+    name: :subversion,
+    action: :install,
+  )
+
   before do
     @svn = Chef::Resource::Subversion.new("ohai, svn project!")
   end
 
   it "is a subclass of Resource::Scm" do
-    @svn.should be_an_instance_of(Chef::Resource::Subversion)
-    @svn.should be_a_kind_of(Chef::Resource::Scm)
-  end
-
-  it "uses the subversion provider" do
-    @svn.provider.should eql(Chef::Provider::Subversion)
+    expect(@svn).to be_an_instance_of(Chef::Resource::Subversion)
+    expect(@svn).to be_a_kind_of(Chef::Resource::Scm)
   end
 
   it "allows the force_export action" do
-    @svn.allowed_actions.should include(:force_export)
+    expect(@svn.allowed_actions).to include(:force_export)
   end
 
   it "sets svn info arguments to --no-auth-cache by default" do
-    @svn.svn_info_args.should == '--no-auth-cache'
+    expect(@svn.svn_info_args).to eq('--no-auth-cache')
   end
 
   it "resets svn info arguments to nil when given false in the setter" do
     @svn.svn_info_args(false)
-    @svn.svn_info_args.should be_nil
+    expect(@svn.svn_info_args).to be_nil
   end
 
   it "sets svn arguments to --no-auth-cache by default" do
-    @svn.svn_arguments.should == '--no-auth-cache'
+    expect(@svn.svn_arguments).to eq('--no-auth-cache')
   end
 
   it "resets svn arguments to nil when given false in the setter" do
     @svn.svn_arguments(false)
-    @svn.svn_arguments.should be_nil
+    expect(@svn.svn_arguments).to be_nil
   end
 
   it "hides password from custom exception message" do
     @svn.svn_password "l33th4x0rpa$$w0rd"
     e = @svn.customize_exception(Chef::Exceptions::Exec.new "Exception with password #{@svn.svn_password}")
-    e.message.include?(@svn.svn_password).should be_false
+    expect(e.message.include?(@svn.svn_password)).to be_false
   end
 end

data/spec/unit/resource/template_spec.rb

@@ -26,54 +26,54 @@ describe Chef::Resource::Template do
 
   describe "initialize" do
     it "should create a new Chef::Resource::Template" do
-      @resource.should be_a_kind_of(Chef::Resource)
-      @resource.should be_a_kind_of(Chef::Resource::File)
-      @resource.should be_a_kind_of(Chef::Resource::Template)
+      expect(@resource).to be_a_kind_of(Chef::Resource)
+      expect(@resource).to be_a_kind_of(Chef::Resource::File)
+      expect(@resource).to be_a_kind_of(Chef::Resource::Template)
     end
   end
 
   describe "source" do
     it "should accept a string for the template source" do
       @resource.source "something"
-      @resource.source.should eql("something")
+      expect(@resource.source).to eql("something")
     end
 
     it "should have a default based on the param name with .erb appended" do
-      @resource.source.should eql("fakey_fakerton.erb")
+      expect(@resource.source).to eql("fakey_fakerton.erb")
     end
 
     it "should use only the basename of the file as the default" do
       r = Chef::Resource::Template.new("/tmp/obit/fakey_fakerton")
-      r.source.should eql("fakey_fakerton.erb")
+      expect(r.source).to eql("fakey_fakerton.erb")
     end
   end
 
   describe "variables" do
     it "should accept a hash for the variable list" do
       @resource.variables({ :reluctance => :awkward })
-      @resource.variables.should == { :reluctance => :awkward }
+      expect(@resource.variables).to eq({ :reluctance => :awkward })
     end
   end
 
   describe "cookbook" do
     it "should accept a string for the cookbook name" do
       @resource.cookbook("foo")
-      @resource.cookbook.should == "foo"
+      expect(@resource.cookbook).to eq("foo")
     end
 
     it "should default to nil" do
-      @resource.cookbook.should == nil
+      expect(@resource.cookbook).to eq(nil)
     end
   end
 
   describe "local" do
     it "should accept a boolean for whether a template is local or remote" do
       @resource.local(true)
-      @resource.local.should == true
+      expect(@resource.local).to eq(true)
     end
 
     it "should default to false" do
-      @resource.local.should == false
+      expect(@resource.local).to eq(false)
     end
   end
 
@@ -89,10 +89,10 @@ describe Chef::Resource::Template do
     context "on unix", :unix_only do
       it "describes its state" do
         state = @resource.state
-        state[:owner].should == "root"
-        state[:group].should == "wheel"
-        state[:mode].should == "0644"
-        state[:checksum].should == "1" * 64
+        expect(state[:owner]).to eq("root")
+        expect(state[:group]).to eq("wheel")
+        expect(state[:mode]).to eq("0644")
+        expect(state[:checksum]).to eq("1" * 64)
       end
     end
 
@@ -102,7 +102,7 @@ describe Chef::Resource::Template do
     end
 
     it "returns the file path as its identity" do
-      @resource.identity.should == "/tmp/foo.txt"
+      expect(@resource.identity).to eq("/tmp/foo.txt")
     end
   end
 
@@ -117,19 +117,19 @@ describe Chef::Resource::Template do
     it "collects helper method bodies as blocks" do
       @resource.helper(:example_1) { "example_1" }
       @resource.helper(:example_2) { "example_2" }
-      @resource.inline_helper_blocks[:example_1].call.should == "example_1"
-      @resource.inline_helper_blocks[:example_2].call.should == "example_2"
+      expect(@resource.inline_helper_blocks[:example_1].call).to eq("example_1")
+      expect(@resource.inline_helper_blocks[:example_2].call).to eq("example_2")
     end
 
     it "compiles helper methods into a module" do
       @resource.helper(:example_1) { "example_1" }
       @resource.helper(:example_2) { "example_2" }
       modules = @resource.helper_modules
-      modules.should have(1).module
+      expect(modules.size).to eq(1)
       o = Object.new
       modules.each {|m| o.extend(m)}
-      o.example_1.should == "example_1"
-      o.example_2.should == "example_2"
+      expect(o.example_1).to eq("example_1")
+      expect(o.example_2).to eq("example_2")
     end
 
     it "compiles helper methods with arguments into a module" do
@@ -137,15 +137,15 @@ describe Chef::Resource::Template do
       modules = @resource.helper_modules
       o = Object.new
       modules.each {|m| o.extend(m)}
-      o.shout("shout").should == "SHOUT"
+      expect(o.shout("shout")).to eq("SHOUT")
     end
 
     it "raises an error when attempting to define a helper method without a method body" do
-      lambda { @resource.helper(:example) }.should raise_error(Chef::Exceptions::ValidationFailed)
+      expect { @resource.helper(:example) }.to raise_error(Chef::Exceptions::ValidationFailed)
     end
 
     it "raises an error when attempting to define a helper method with a non-Symbod method name" do
-      lambda { @resource.helper("example") { "fail" } }.should raise_error(Chef::Exceptions::ValidationFailed)
+      expect { @resource.helper("example") { "fail" } }.to raise_error(Chef::Exceptions::ValidationFailed)
     end
 
     it "collects helper module bodies as blocks" do
@@ -155,7 +155,7 @@ describe Chef::Resource::Template do
         end
       end
       module_body = @resource.inline_helper_modules.first
-      module_body.should be_a(Proc)
+      expect(module_body).to be_a(Proc)
     end
 
     it "compiles helper module bodies into modules" do
@@ -165,27 +165,27 @@ describe Chef::Resource::Template do
         end
       end
       modules = @resource.helper_modules
-      modules.should have(1).module
+      expect(modules.size).to eq(1)
       o = Object.new
       modules.each {|m| o.extend(m)}
-      o.example_1.should == "example_1"
+      expect(o.example_1).to eq("example_1")
     end
 
     it "raises an error when no block or module name is given for helpers definition" do
-      lambda { @resource.helpers() }.should raise_error(Chef::Exceptions::ValidationFailed)
+      expect { @resource.helpers() }.to raise_error(Chef::Exceptions::ValidationFailed)
     end
 
     it "raises an error when a non-module is given for helpers definition" do
-      lambda { @resource.helpers("NotAModule") }.should raise_error(Chef::Exceptions::ValidationFailed)
+      expect { @resource.helpers("NotAModule") }.to raise_error(Chef::Exceptions::ValidationFailed)
     end
 
     it "raises an error when a module name and block are both given for helpers definition" do
-      lambda { @resource.helpers(ExampleHelpers) { module_code } }.should raise_error(Chef::Exceptions::ValidationFailed)
+      expect { @resource.helpers(ExampleHelpers) { module_code } }.to raise_error(Chef::Exceptions::ValidationFailed)
     end
 
     it "collects helper modules" do
       @resource.helpers(ExampleHelpers)
-      @resource.helper_modules.should include(ExampleHelpers)
+      expect(@resource.helper_modules).to include(ExampleHelpers)
     end
 
     it "combines all helpers into a set of compiled modules" do
@@ -196,13 +196,13 @@ describe Chef::Resource::Template do
         end
       end
       @resource.helper(:inline_method) { "inline_method" }
-      @resource.should have(3).helper_modules
+      expect(@resource.helper_modules.size).to eq(3)
 
       o = Object.new
       @resource.helper_modules.each {|m| o.extend(m)}
-      o.static_example.should == "static_example"
-      o.inline_module.should == "inline_module"
-      o.inline_method.should == "inline_method"
+      expect(o.static_example).to eq("static_example")
+      expect(o.inline_module).to eq("inline_module")
+      expect(o.inline_method).to eq("inline_method")
     end
 
 

data/spec/unit/resource/timestamped_deploy_spec.rb

@@ -18,11 +18,37 @@
 
 require 'spec_helper'
 
-describe Chef::Resource::TimestampedDeploy do
+describe Chef::Resource::TimestampedDeploy, "initialize" do
 
-  it "defaults to the TimestampedDeploy provider" do
-    @resource = Chef::Resource::TimestampedDeploy.new("stuff")
-    @resource.provider.should == Chef::Provider::Deploy::Timestamped
+  let(:node) {
+    node = Chef::Node.new
+    node.automatic_attrs[:os] = 'linux'
+    node.automatic_attrs[:platform_family] = 'rhel'
+    node
+  }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:provider_resolver) { Chef::ProviderResolver.new(node) }
+  let(:run_context) {
+    run_context = Chef::RunContext.new(node, {}, events)
+    run_context.provider_resolver = provider_resolver
+    run_context
+  }
+  let(:resource) { Chef::Resource::TimestampedDeploy.new("stuff", run_context) }
+
+  it "should return a Chef::Resource::TimestampedDeploy" do
+    expect(resource).to be_a_kind_of(Chef::Resource::TimestampedDeploy)
+  end
+
+  it "should set the resource_name to :timestamped_deploy" do
+    expect(resource.resource_name).to eql(:deploy)
   end
 
+  it "should leave the provider nil" do
+    expect(resource.provider).to eql(nil)
+  end
+
+  it "should resolve to a Chef::Provider::Deploy::Timestamped" do
+    expect(resource.provider_for_action(:install)).to be_a(Chef::Provider::Deploy::Timestamped)
+  end
 end
+

data/spec/unit/resource/user_spec.rb

@@ -24,51 +24,51 @@ describe Chef::Resource::User, "initialize" do
   end
 
   it "should create a new Chef::Resource::User" do
-    @resource.should be_a_kind_of(Chef::Resource)
-    @resource.should be_a_kind_of(Chef::Resource::User)
+    expect(@resource).to be_a_kind_of(Chef::Resource)
+    expect(@resource).to be_a_kind_of(Chef::Resource::User)
   end
 
   it "should set the resource_name to :user" do
-    @resource.resource_name.should eql(:user)
+    expect(@resource.resource_name).to eql(:user)
   end
 
   it "should set the username equal to the argument to initialize" do
-    @resource.username.should eql("adam")
+    expect(@resource.username).to eql("adam")
   end
 
   %w{comment uid gid home shell password}.each do |attrib|
     it "should set #{attrib} to nil" do
-      @resource.send(attrib).should eql(nil)
+      expect(@resource.send(attrib)).to eql(nil)
     end
   end
 
   it "should set action to :create" do
-    @resource.action.should eql(:create)
+    expect(@resource.action).to eql(:create)
   end
 
   it "should set supports[:manage_home] to false" do
-    @resource.supports[:manage_home].should eql(false)
+    expect(@resource.supports[:manage_home]).to eql(false)
   end
 
   it "should set supports[:non_unique] to false" do
-    @resource.supports[:non_unique].should eql(false)
+    expect(@resource.supports[:non_unique]).to eql(false)
   end
 
   it "should set force to false" do
-    @resource.force.should eql(false)
+    expect(@resource.force).to eql(false)
   end
 
   %w{create remove modify manage lock unlock}.each do |action|
     it "should allow action #{action}" do
-      @resource.allowed_actions.detect { |a| a == action.to_sym }.should eql(action.to_sym)
+      expect(@resource.allowed_actions.detect { |a| a == action.to_sym }).to eql(action.to_sym)
     end
   end
 
   it "should accept domain users (@ or \ separator) on non-windows" do
-    lambda { @resource.username "domain\@user" }.should_not raise_error
-    @resource.username.should == "domain\@user"
-    lambda { @resource.username "domain\\user" }.should_not raise_error
-    @resource.username.should  == "domain\\user"
+    expect { @resource.username "domain\@user" }.not_to raise_error
+    expect(@resource.username).to eq("domain\@user")
+    expect { @resource.username "domain\\user" }.not_to raise_error
+    expect(@resource.username).to  eq("domain\\user")
   end
 end
 
@@ -80,11 +80,11 @@ end
 
     it "should allow a string" do
       @resource.send(attrib, "adam")
-      @resource.send(attrib).should eql("adam")
+      expect(@resource.send(attrib)).to eql("adam")
     end
 
     it "should not allow a hash" do
-      lambda { @resource.send(attrib, { :woot => "i found it" }) }.should raise_error(ArgumentError)
+      expect { @resource.send(attrib, { :woot => "i found it" }) }.to raise_error(ArgumentError)
     end
   end
 end
@@ -97,16 +97,16 @@ end
 
     it "should allow a string" do
       @resource.send(attrib, "100")
-      @resource.send(attrib).should eql("100")
+      expect(@resource.send(attrib)).to eql("100")
     end
 
     it "should allow an integer" do
       @resource.send(attrib, 100)
-      @resource.send(attrib).should eql(100)
+      expect(@resource.send(attrib)).to eql(100)
     end
 
     it "should not allow a hash" do
-      lambda { @resource.send(attrib, { :woot => "i found it" }) }.should raise_error(ArgumentError)
+      expect { @resource.send(attrib, { :woot => "i found it" }) }.to raise_error(ArgumentError)
     end
   end
 
@@ -120,13 +120,13 @@ end
 
     it "describes its state" do
       state = @resource.state
-      state[:uid].should == 123
-      state[:gid].should == 456
-      state[:home].should == "/usr/local/root/"
+      expect(state[:uid]).to eq(123)
+      expect(state[:gid]).to eq(456)
+      expect(state[:home]).to eq("/usr/local/root/")
     end
 
     it "returns the username as its identity" do
-      @resource.identity.should == "root"
+      expect(@resource.identity).to eq("root")
     end
   end