chef 12.5.0.alpha.1 → 12.5.1

data/spec/functional/win32/{registry_helper_spec.rb → registry_spec.rb}

@@ -20,25 +20,6 @@
 require 'spec_helper'
 require 'chef/win32/registry'
 
-describe Chef::Resource::RegistryKey, :unix_only do
-  before(:all) do
-    events = Chef::EventDispatch::Dispatcher.new
-    node = Chef::Node.new
-    ohai = Ohai::System.new
-    ohai.all_plugins
-    node.consume_external_attrs(ohai.data,{})
-    run_context = Chef::RunContext.new(node, {}, events)
-    @resource = Chef::Resource::RegistryKey.new("HKCU\\Software", run_context)
-  end
-  context "when load_current_resource is run on a non-windows node" do
-    it "throws an exception because you don't have a windows registry (derp)" do
-      @resource.key("HKCU\\Software\\Opscode")
-      @resource.values([{:name=>"Color", :type=>:string, :data=>"Orange"}])
-      expect{@resource.run_action(:create)}.to raise_error(Chef::Exceptions::Win32NotWindows)
-    end
-  end
-end
-
 describe 'Chef::Win32::Registry', :windows_only do
 
   before(:all) do
@@ -556,11 +537,11 @@ describe 'Chef::Win32::Registry', :windows_only do
       end
 
       after(:all) do
-        ::Win32::Registry::HKEY_LOCAL_MACHINE.open("Software\\Root", ::Win32::Registry::KEY_ALL_ACCESS | 0x0100) do |reg|
-          reg.delete_key("Trunk", true)
+        ::Win32::Registry::HKEY_LOCAL_MACHINE.open("Software", ::Win32::Registry::KEY_ALL_ACCESS | 0x0100) do |reg|
+          reg.delete_key("Root", true)
         end
-        ::Win32::Registry::HKEY_LOCAL_MACHINE.open("Software\\Root", ::Win32::Registry::KEY_ALL_ACCESS | 0x0200) do |reg|
-          reg.delete_key("Trunk", true)
+        ::Win32::Registry::HKEY_LOCAL_MACHINE.open("Software", ::Win32::Registry::KEY_ALL_ACCESS | 0x0200) do |reg|
+          reg.delete_key("Root", true)
         end
       end
 

data/spec/integration/client/client_spec.rb

@@ -303,6 +303,57 @@ EOM
 
   end
 
+  when_the_repository "has a cookbook that generates deprecation warnings" do
+    before do
+      file 'cookbooks/x/recipes/default.rb', <<-EOM
+        class ::MyResource < Chef::Resource
+          use_automatic_resource_name
+          property :x, default: []
+          property :y, default: {}
+        end
+
+        my_resource 'blah' do
+          1.upto(10) do
+            x nil
+          end
+          x nil
+        end
+      EOM
+    end
+
+    def match_indices(regex, str)
+      result = []
+      pos = 0
+      while match = regex.match(str, pos)
+        result << match.begin(0)
+        pos = match.end(0) + 1
+      end
+      result
+    end
+
+    it "should output each deprecation warning only once, at the end of the run" do
+      file 'config/client.rb', <<EOM
+local_mode true
+cookbook_path "#{path_to('cookbooks')}"
+# Mimick what happens when you are on the console
+formatters << :doc
+log_level :warn
+EOM
+
+      ENV.delete('CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS')
+
+      result = shell_out!("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
+      expect(result.error?).to be_falsey
+
+      # Search to the end of the client run in the output
+      run_complete = result.stdout.index("Running handlers complete")
+      expect(run_complete).to be >= 0
+
+      # Make sure there is exactly one result for each, and that it occurs *after* the complete message.
+      expect(match_indices(/nil currently does not overwrite the value of/, result.stdout)).to match([ be > run_complete ])
+    end
+  end
+
   when_the_repository "has a cookbook with only an audit recipe" do
 
     before do

data/spec/integration/knife/download_spec.rb

@@ -1113,11 +1113,13 @@ Created /acls/clients/foo-validator.json
 Created /acls/containers
 Created /acls/containers/clients.json
 Created /acls/containers/containers.json
+Created /acls/containers/cookbook_artifacts.json
 Created /acls/containers/cookbooks.json
 Created /acls/containers/data.json
 Created /acls/containers/environments.json
 Created /acls/containers/groups.json
 Created /acls/containers/nodes.json
+Created /acls/containers/policies.json
 Created /acls/containers/roles.json
 Created /acls/containers/sandboxes.json
 Created /acls/containers/x.json
@@ -1139,11 +1141,13 @@ Created /clients/foo-validator.json
 Created /containers
 Created /containers/clients.json
 Created /containers/containers.json
+Created /containers/cookbook_artifacts.json
 Created /containers/cookbooks.json
 Created /containers/data.json
 Created /containers/environments.json
 Created /containers/groups.json
 Created /containers/nodes.json
+Created /containers/policies.json
 Created /containers/roles.json
 Created /containers/sandboxes.json
 Created /containers/x.json

data/spec/integration/knife/list_spec.rb

@@ -702,11 +702,13 @@ foo-validator.json
 /acls/containers:
 clients.json
 containers.json
+cookbook_artifacts.json
 cookbooks.json
 data.json
 environments.json
 groups.json
 nodes.json
+policies.json
 roles.json
 sandboxes.json
 
@@ -733,11 +735,13 @@ foo-validator.json
 /containers:
 clients.json
 containers.json
+cookbook_artifacts.json
 cookbooks.json
 data.json
 environments.json
 groups.json
 nodes.json
+policies.json
 roles.json
 sandboxes.json
 
@@ -804,11 +808,13 @@ foo-validator.json
 /acls/containers:
 clients.json
 containers.json
+cookbook_artifacts.json
 cookbooks.json
 data.json
 environments.json
 groups.json
 nodes.json
+policies.json
 roles.json
 sandboxes.json
 
@@ -835,11 +841,13 @@ foo-validator.json
 /containers:
 clients.json
 containers.json
+cookbook_artifacts.json
 cookbooks.json
 data.json
 environments.json
 groups.json
 nodes.json
+policies.json
 roles.json
 sandboxes.json
 

data/spec/integration/knife/upload_spec.rb

@@ -198,7 +198,7 @@ Created /nodes/y.json
 Created /roles/y.json
 Created /users/y.json
 EOM
-            knife('diff --name-status /').should_succeed ''
+            knife('diff /').should_succeed ''
           end
 
           it 'knife upload --no-diff adds the new files' do

data/spec/integration/recipes/recipe_dsl_spec.rb

@@ -119,7 +119,7 @@ describe "Recipe DSL methods" do
             recipe = converge {
               backcompat_thingy 'blah' do; end
             }
-            expect(recipe.logged_warnings).to match(/Class Chef::Provider::BackcompatThingy does not declare 'resource_name :backcompat_thingy'./)
+            expect(recipe.logged_warnings).to match(/Class Chef::Provider::BackcompatThingy does not declare 'provides :backcompat_thingy'./)
             expect(BaseThingy.created_resource).not_to be_nil
           end
         end

data/spec/integration/recipes/remote_directory.rb

@@ -0,0 +1,74 @@
+require 'support/shared/integration/integration_helper'
+
+describe Chef::Resource::RemoteDirectory do
+  include IntegrationSupport
+  include Chef::Mixin::ShellOut
+
+  # Until Cheffish::RSpec has cookbook support, we have to run the whole client
+  let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
+
+  # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
+  # following constraints are satisfied:
+  # * Windows: windows can only run batch scripts as bare executables. Rubygems
+  # creates batch wrappers for installed gems, but we don't have batch wrappers
+  # in the source tree.
+  # * Other `chef-client` in PATH: A common case is running the tests on a
+  # machine that has omnibus chef installed. In that case we need to ensure
+  # we're running `chef-client` from the source tree and not the external one.
+  # cf. CHEF-4914
+  let(:chef_client) { "ruby '#{chef_dir}/chef-client' --minimal-ohai" }
+
+  when_the_repository "has a cookbook with a source_dir with two subdirectories, each with one file and subdir in a different alphabetical order" do
+    before do
+      file 'config/client.rb', <<-EOM
+        local_mode true
+        cookbook_path "#{path_to('cookbooks')}"
+      EOM
+      directory "cookbooks/test" do
+        directory "files/default/source_dir" do
+          directory "sub1" do
+            file "aaa", ""
+            file "zzz/file", ""
+          end
+          directory "sub2" do
+            file "aaa/file", ""
+            file "zzz", ""
+          end
+        end
+      end
+    end
+
+    context "and a recipe is run with a remote_directory that syncs source_dir with different mode and file_mode" do
+      let!(:dest_dir) { path_to("dest_dir") }
+      before do
+        directory "cookbooks/test" do
+          file "recipes/default.rb", <<-EOM
+             remote_directory #{dest_dir.inspect} do
+               source "source_dir"
+               mode "0754"
+               files_mode 0777
+             end
+          EOM
+        end
+        shell_out!("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'test::default'", :cwd => chef_dir)
+      end
+
+      def mode_of(path)
+        path = path_to(path)
+        stat = File.stat(path)
+        (stat.mode & 0777).to_s(8)
+      end
+
+      it "creates all directories and files with the correct permissions" do
+        expect(mode_of("dest_dir/sub1")).to eq "754"
+        expect(mode_of("dest_dir/sub1/aaa")).to eq "777"
+        expect(mode_of("dest_dir/sub1/zzz")).to eq "754"
+        expect(mode_of("dest_dir/sub1/zzz/file")).to eq "777"
+        expect(mode_of("dest_dir/sub2")).to eq "754"
+        expect(mode_of("dest_dir/sub2/aaa")).to eq "754"
+        expect(mode_of("dest_dir/sub2/aaa/file")).to eq "777"
+        expect(mode_of("dest_dir/sub2/zzz")).to eq "777"
+      end
+    end
+  end
+end

data/spec/integration/recipes/resource_action_spec.rb

@@ -3,18 +3,8 @@ require 'support/shared/integration/integration_helper'
 describe "Resource.action" do
   include IntegrationSupport
 
-  def converge(str=nil, file=nil, line=nil, &block)
-    if block
-      super(&block)
-    else
-      super() do
-        eval(str, nil, file, line)
-      end
-    end
-  end
-
   shared_context "ActionJackson" do
-    it "The default action is the first declared action" do
+    it "the default action is the first declared action" do
       converge <<-EOM, __FILE__, __LINE__+1
         #{resource_dsl} 'hi' do
           foo 'foo!'
@@ -24,7 +14,7 @@ describe "Resource.action" do
       expect(ActionJackson.succeeded).to eq true
     end
 
-    it "The action can access recipe DSL" do
+    it "the action can access recipe DSL" do
       converge <<-EOM, __FILE__, __LINE__+1
         #{resource_dsl} 'hi' do
           foo 'foo!'
@@ -35,7 +25,7 @@ describe "Resource.action" do
       expect(ActionJackson.succeeded).to eq true
     end
 
-    it "The action can access attributes" do
+    it "the action can access attributes" do
       converge <<-EOM, __FILE__, __LINE__+1
         #{resource_dsl} 'hi' do
           foo 'foo!'
@@ -46,7 +36,7 @@ describe "Resource.action" do
       expect(ActionJackson.succeeded).to eq 'foo!'
     end
 
-    it "The action can access public methods" do
+    it "the action can access public methods" do
       converge <<-EOM, __FILE__, __LINE__+1
         #{resource_dsl} 'hi' do
           foo 'foo!'
@@ -57,7 +47,7 @@ describe "Resource.action" do
       expect(ActionJackson.succeeded).to eq 'foo_public!'
     end
 
-    it "The action can access protected methods" do
+    it "the action can access protected methods" do
       converge <<-EOM, __FILE__, __LINE__+1
         #{resource_dsl} 'hi' do
           foo 'foo!'
@@ -68,7 +58,7 @@ describe "Resource.action" do
       expect(ActionJackson.succeeded).to eq 'foo_protected!'
     end
 
-    it "The action cannot access private methods" do
+    it "the action cannot access private methods" do
       expect {
         converge(<<-EOM, __FILE__, __LINE__+1)
           #{resource_dsl} 'hi' do
@@ -80,7 +70,7 @@ describe "Resource.action" do
       expect(ActionJackson.ran_action).to eq :access_private_method
     end
 
-    it "The action cannot access resource instance variables" do
+    it "the action cannot access resource instance variables" do
       converge <<-EOM, __FILE__, __LINE__+1
         #{resource_dsl} 'hi' do
           foo 'foo!'
@@ -91,7 +81,7 @@ describe "Resource.action" do
       expect(ActionJackson.succeeded).to be_nil
     end
 
-    it "The action does not compile until the prior resource has converged" do
+    it "the action does not compile until the prior resource has converged" do
       converge <<-EOM, __FILE__, __LINE__+1
         ruby_block 'wow' do
           block do
@@ -108,7 +98,7 @@ describe "Resource.action" do
       expect(ActionJackson.succeeded).to eq 'ruby_block_converged!'
     end
 
-    it "The action's resources converge before the next resource converges" do
+    it "the action's resources converge before the next resource converges" do
       converge <<-EOM, __FILE__, __LINE__+1
         #{resource_dsl} 'hi' do
           foo 'foo!'
@@ -212,6 +202,11 @@ describe "Resource.action" do
       let(:resource_dsl) { :action_jackson }
     end
 
+    it "Can retrieve ancestors of action class without crashing" do
+      converge { action_jackson 'hi' }
+      expect { ActionJackson.action_class.ancestors.join(",") }.not_to raise_error
+    end
+
     context "And 'action_jackgrandson' inheriting from ActionJackson and changing nothing" do
       before(:context) {
         class ActionJackgrandson < ActionJackson
@@ -224,7 +219,7 @@ describe "Resource.action" do
       end
     end
 
-    context "And 'action_jackalope' inheriting from ActionJackson with an extra attribute and action" do
+    context "And 'action_jackalope' inheriting from ActionJackson with an extra attribute, action and custom method" do
       before(:context) {
         class ActionJackalope < ActionJackson
           use_automatic_resource_name
@@ -238,6 +233,7 @@ describe "Resource.action" do
             @bar
           end
           class <<self
+            attr_accessor :load_current_resource_ran
             attr_accessor :jackalope_ran
           end
           action :access_jackalope do
@@ -253,6 +249,7 @@ describe "Resource.action" do
       }
       before do
         ActionJackalope.jackalope_ran = nil
+        ActionJackalope.load_current_resource_ran = nil
       end
 
       context "action_jackson still behaves the same" do
@@ -261,7 +258,7 @@ describe "Resource.action" do
         end
       end
 
-      it "The default action remains the same even though new actions were specified first" do
+      it "the default action remains the same even though new actions were specified first" do
         converge {
           action_jackalope 'hi' do
             foo 'foo!'
@@ -330,7 +327,7 @@ describe "Resource.action" do
         end
       end
     }
-    it "The default action is :nothing" do
+    it "the default action is :nothing" do
       converge {
         no_action_jackson 'hi' do
           foo 'foo!'
@@ -340,4 +337,27 @@ describe "Resource.action" do
       expect(NoActionJackson.action_was).to eq [:nothing]
     end
   end
+
+  context "With a resource with action a-b-c d" do
+    before(:context) {
+      class WeirdActionJackson < Chef::Resource
+        use_automatic_resource_name
+
+        class <<self
+          attr_accessor :action_was
+        end
+
+        action "a-b-c d" do
+          WeirdActionJackson.action_was = action
+        end
+      end
+    }
+
+    it "Running the action works" do
+      expect_recipe {
+        weird_action_jackson 'hi'
+      }.to be_up_to_date
+      expect(WeirdActionJackson.action_was).to eq :"a-b-c d"
+    end
+  end
 end

data/spec/integration/recipes/resource_converge_if_changed_spec.rb

@@ -0,0 +1,423 @@
+require 'support/shared/integration/integration_helper'
+
+describe "Resource::ActionClass#converge_if_changed" do
+  include IntegrationSupport
+
+  module Namer
+    extend self
+    attr_accessor :current_index
+    def incrementing_value
+      @incrementing_value += 1
+      @incrementing_value
+    end
+    attr_writer :incrementing_value
+  end
+
+  before(:all) { Namer.current_index = 1 }
+  before { Namer.current_index += 1 }
+  before { Namer.incrementing_value = 0 }
+
+  context "when the resource has identity, state and control properties" do
+    let(:resource_name) { :"converge_if_changed_dsl#{Namer.current_index}" }
+    let(:resource_class) {
+      result = Class.new(Chef::Resource) do
+        def self.to_s; resource_name; end
+        def self.inspect; resource_name.inspect; end
+        property :identity1, identity: true, default: 'default_identity1'
+        property :control1, desired_state: false, default: 'default_control1'
+        property :state1, default: 'default_state1'
+        property :state2, default: 'default_state2'
+        attr_accessor :converged
+        def initialize(*args)
+          super
+          @converged = 0
+        end
+      end
+      result.resource_name resource_name
+      result
+    }
+    let(:converged_recipe) { converge(converge_recipe) }
+    let(:resource) { converged_recipe.resources.first }
+
+    context "and converge_if_changed with no parameters" do
+      before :each do
+        resource_class.action :create do
+          converge_if_changed do
+            new_resource.converged += 1
+          end
+        end
+      end
+
+      context "and current_resource with state1=current, state2=current" do
+        before :each do
+          resource_class.load_current_value do
+            state1 'current_state1'
+            state2 'current_state2'
+          end
+        end
+
+        context "and nothing is set" do
+          let(:converge_recipe) { "#{resource_name} 'blah'" }
+
+          it "the resource updates nothing" do
+            expect(resource.converged).to eq 0
+            expect(resource.updated?).to  be_falsey
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create (up to date)
+            EOM
+          end
+        end
+
+        context "and state1 is set to a new value" do
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                state1 'new_state1'
+              end
+            EOM
+          }
+
+          it "the resource updates state1" do
+            expect(resource.converged).to eq 1
+            expect(resource.updated?).to  be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - update default_identity1
+  -   set state1 to "new_state1" (was "current_state1")
+              EOM
+          end
+        end
+
+        context "and state1 and state2 are set to new values" do
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                state1 'new_state1'
+                state2 'new_state2'
+              end
+            EOM
+          }
+
+          it "the resource updates state1 and state2" do
+            expect(resource.converged).to eq 1
+            expect(resource.updated?).to  be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - update default_identity1
+  -   set state1 to "new_state1" (was "current_state1")
+  -   set state2 to "new_state2" (was "current_state2")
+EOM
+          end
+        end
+
+        context "and state1 is set to its current value but state2 is set to a new value" do
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                state1 'current_state1'
+                state2 'new_state2'
+              end
+            EOM
+          }
+
+          it "the resource updates state2" do
+            expect(resource.converged).to eq 1
+            expect(resource.updated?).to  be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - update default_identity1
+  -   set state2 to "new_state2" (was "current_state2")
+EOM
+          end
+        end
+
+        context "and state1 and state2 are set to their current values" do
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                state1 'current_state1'
+                state2 'current_state2'
+              end
+            EOM
+          }
+
+          it "the resource updates nothing" do
+            expect(resource.converged).to eq 0
+            expect(resource.updated?).to  be_falsey
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create (up to date)
+EOM
+          end
+        end
+
+        context "and identity1 and control1 are set to new values" do
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                identity1 'new_identity1'
+                control1 'new_control1'
+              end
+            EOM
+          }
+
+          # Because the identity value is copied over to the new resource, by
+          # default they do not register as "changed"
+          it "the resource updates nothing" do
+            expect(resource.converged).to eq 0
+            expect(resource.updated?).to  be_falsey
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create (up to date)
+EOM
+          end
+        end
+      end
+
+      context "and current_resource with identity1=current, control1=current" do
+        before :each do
+          resource_class.load_current_value do
+            identity1 'current_identity1'
+            control1 'current_control1'
+          end
+        end
+
+        context "and identity1 and control1 are set to new values" do
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                identity1 'new_identity1'
+                control1 'new_control1'
+              end
+            EOM
+          }
+
+          # Control values are not desired state and are therefore not considered
+          # a reason for converging.
+          it "the resource updates identity1" do
+            expect(resource.converged).to eq 1
+            expect(resource.updated?).to  be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - update current_identity1
+  -   set identity1 to "new_identity1" (was "current_identity1")
+            EOM
+          end
+        end
+      end
+
+      context "and has no current_resource" do
+        before :each do
+          resource_class.load_current_value do
+            current_value_does_not_exist!
+          end
+        end
+
+        context "and nothing is set" do
+          let(:converge_recipe) { "#{resource_name} 'blah'" }
+
+          it "the resource is created" do
+            expect(resource.converged).to eq 1
+            expect(resource.updated?).to  be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - create default_identity1
+  -   set identity1 to "default_identity1" (default value)
+  -   set state1    to "default_state1" (default value)
+  -   set state2    to "default_state2" (default value)
+EOM
+          end
+        end
+
+        context "and state1 and state2 are set" do
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                state1 'new_state1'
+                state2 'new_state2'
+              end
+            EOM
+          }
+
+          it "the resource is created" do
+            expect(resource.converged).to eq 1
+            expect(resource.updated?).to  be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - create default_identity1
+  -   set identity1 to "default_identity1" (default value)
+  -   set state1    to "new_state1"
+  -   set state2    to "new_state2"
+EOM
+          end
+        end
+      end
+    end
+
+    context "and separate converge_if_changed :state1 and converge_if_changed :state2" do
+      before :each do
+        resource_class.action :create do
+          converge_if_changed :state1 do
+            new_resource.converged += 1
+          end
+          converge_if_changed :state2 do
+            new_resource.converged += 1
+          end
+        end
+      end
+
+      context "and current_resource with state1=current, state2=current" do
+        before :each do
+          resource_class.load_current_value do
+            state1 'current_state1'
+            state2 'current_state2'
+          end
+        end
+
+        context "and nothing is set" do
+          let(:converge_recipe) { "#{resource_name} 'blah'" }
+
+          it "the resource updates nothing" do
+            expect(resource.converged).to eq 0
+            expect(resource.updated?).to  be_falsey
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create (up to date)
+EOM
+          end
+        end
+
+        context "and state1 is set to a new value" do
+
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                state1 'new_state1'
+              end
+            EOM
+          }
+
+          it "the resource updates state1" do
+            expect(resource.converged).to eq 1
+            expect(resource.updated?).to  be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - update default_identity1
+  -   set state1 to "new_state1" (was "current_state1")
+EOM
+          end
+        end
+
+        context "and state1 and state2 are set to new values" do
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                state1 'new_state1'
+                state2 'new_state2'
+              end
+            EOM
+          }
+
+          it "the resource updates state1 and state2" do
+            expect(resource.converged).to eq 2
+            expect(resource.updated?).to  be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - update default_identity1
+  -   set state1 to "new_state1" (was "current_state1")
+  - update default_identity1
+  -   set state2 to "new_state2" (was "current_state2")
+EOM
+          end
+        end
+
+        context "and state1 is set to its current value but state2 is set to a new value" do
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                state1 'current_state1'
+                state2 'new_state2'
+              end
+            EOM
+          }
+
+          it "the resource updates state2" do
+            expect(resource.converged).to eq 1
+            expect(resource.updated?).to  be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - update default_identity1
+  -   set state2 to "new_state2" (was "current_state2")
+EOM
+          end
+        end
+
+        context "and state1 and state2 are set to their current values" do
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                state1 'current_state1'
+                state2 'current_state2'
+              end
+            EOM
+          }
+
+          it "the resource updates nothing" do
+            expect(resource.converged).to eq 0
+            expect(resource.updated?).to  be_falsey
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create (up to date)
+EOM
+          end
+        end
+      end
+
+      context "and no current_resource" do
+        before :each do
+          resource_class.load_current_value do
+            current_value_does_not_exist!
+          end
+        end
+
+        context "and nothing is set" do
+          let(:converge_recipe) {
+            "#{resource_name} 'blah'"
+          }
+
+          it "the resource is created" do
+            expect(resource.converged).to eq 2
+            expect(resource.updated?).to  be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - create default_identity1
+  -   set state1 to "default_state1" (default value)
+  - create default_identity1
+  -   set state2 to "default_state2" (default value)
+EOM
+          end
+        end
+
+        context "and state1 and state2 are set to new values" do
+          let(:converge_recipe) {
+            <<-EOM
+              #{resource_name} 'blah' do
+                state1 'new_state1'
+                state2 'new_state2'
+              end
+            EOM
+          }
+
+          it "the resource is created" do
+            expect(resource.converged).to eq 2
+            expect(resource.updated?).to  be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - create default_identity1
+  -   set state1 to "new_state1"
+  - create default_identity1
+  -   set state2 to "new_state2"
+EOM
+          end
+        end
+      end
+    end
+
+  end
+end