chef 12.13.37 → 12.14.60

data/spec/integration/recipes/resource_action_spec.rb

@@ -62,14 +62,14 @@ module ResourceActionSpec
       end
 
       it "the action cannot access private methods" do
-        expect {
+        expect do
           converge(<<-EOM, __FILE__, __LINE__ + 1)
           #{resource_dsl} "hi" do
             foo "foo!"
             action :access_private_method
           end
         EOM
-        }.to raise_error(NameError)
+        end.to raise_error(NameError)
         expect(ActionJackson.ran_action).to eq :access_private_method
       end
 
@@ -139,26 +139,6 @@ module ResourceActionSpec
           attr_accessor :ruby_block_converged
         end
 
-        public
-
-        def foo_public
-          "foo_public!"
-        end
-
-        protected
-
-        def foo_protected
-          "foo_protected!"
-        end
-
-        private
-
-        def foo_private
-          "foo_private!"
-        end
-
-        public
-
         action :access_recipe_dsl do
           ActionJackson.ran_action = :access_recipe_dsl
           ruby_block "hi there" do
@@ -199,13 +179,29 @@ module ResourceActionSpec
           ActionJackson.ran_action = :access_class_method
           ActionJackson.succeeded = ActionJackson.ruby_block_converged
         end
+
+        def foo_public
+          "foo_public!"
+        end
+
+        protected
+
+        def foo_protected
+          "foo_protected!"
+        end
+
+        private
+
+        def foo_private
+          "foo_private!"
+        end
       end
 
-      before(:each) {
+      before(:each) do
         ActionJackson.ran_action = :error
         ActionJackson.succeeded = :error
         ActionJackson.ruby_block_converged = :error
-      }
+      end
 
       it_behaves_like "ActionJackson" do
         let(:resource_dsl) { :action_jackson }
@@ -217,11 +213,11 @@ module ResourceActionSpec
       end
 
       context "And 'action_jackgrandson' inheriting from ActionJackson and changing nothing" do
-        before(:context) {
+        before(:context) do
           class ActionJackgrandson < ActionJackson
             use_automatic_resource_name
           end
-        }
+        end
 
         it_behaves_like "ActionJackson" do
           let(:resource_dsl) { :action_jackgrandson }
@@ -267,38 +263,38 @@ module ResourceActionSpec
         end
 
         it "the default action remains the same even though new actions were specified first" do
-          converge {
+          converge do
             action_jackalope "hi" do
               foo "foo!"
               bar "bar!"
             end
-          }
+          end
           expect(ActionJackson.ran_action).to eq :access_recipe_dsl
           expect(ActionJackson.succeeded).to eq true
         end
 
         it "new actions run, and can access overridden, new, and overridden attributes" do
-          converge {
+          converge do
             action_jackalope "hi" do
               foo "foo!"
               bar "bar!"
               blarghle "blarghle!"
               action :access_jackalope
             end
-          }
+          end
           expect(ActionJackalope.jackalope_ran).to eq :access_jackalope
           expect(ActionJackalope.succeeded).to eq "foo!alope blarghle! bar!alope"
         end
 
         it "overridden actions run, call super, and can access overridden, new, and overridden attributes" do
-          converge {
+          converge do
             action_jackalope "hi" do
               foo "foo!"
               bar "bar!"
               blarghle "blarghle!"
               action :access_attribute
             end
-          }
+          end
           expect(ActionJackson.ran_action).to eq :access_attribute
           expect(ActionJackson.succeeded).to eq "foo!alope blarghle! bar!alope"
           expect(ActionJackalope.jackalope_ran).to eq :access_attribute
@@ -306,14 +302,14 @@ module ResourceActionSpec
         end
 
         it "non-overridden actions run and can access overridden and non-overridden variables (but not necessarily new ones)" do
-          converge {
+          converge do
             action_jackalope "hi" do
               foo "foo!"
               bar "bar!"
               blarghle "blarghle!"
               action :access_attribute2
             end
-          }
+          end
           expect(ActionJackson.ran_action).to eq :access_attribute2
           expect(ActionJackson.succeeded).to eq("foo!alope blarghle! bar!alope").or(eq("foo!alope blarghle!"))
         end
@@ -335,12 +331,12 @@ module ResourceActionSpec
       end
 
       it "the default action is :nothing" do
-        converge {
+        converge do
           no_action_jackson "hi" do
             foo "foo!"
             NoActionJackson.action_was = action
           end
-        }
+        end
         expect(NoActionJackson.action_was).to eq [:nothing]
       end
     end
@@ -359,9 +355,9 @@ module ResourceActionSpec
       end
 
       it "Running the action works" do
-        expect_recipe {
+        expect_recipe do
           weird_action_jackson "hi"
-        }.to be_up_to_date
+        end.to be_up_to_date
         expect(WeirdActionJackson.action_was).to eq :"a-b-c d"
       end
     end
@@ -404,41 +400,41 @@ module ResourceActionSpec
         attr_reader :x_warning_line
 
         it "Using the enclosing resource to set x to x emits a warning that you're using the wrong x" do
-          recipe = converge {
+          recipe = converge do
             resource_action_spec_also_with_x "hi" do
               x 1
               action :set_x_to_x
             end
-          }
+          end
           warnings = recipe.logs.lines.select { |l| l =~ /warn/i }
           expect(warnings.size).to eq 1
           expect(warnings[0]).to match(/property x is declared in both resource_action_spec_with_x\[hi\] and resource_action_spec_also_with_x\[hi\] action :set_x_to_x. Use new_resource.x instead. At #{__FILE__}:#{ResourceActionSpecAlsoWithX.x_warning_line}/)
         end
 
         it "Using the enclosing resource to set x to x outside the initializer emits no warning" do
-          expect_recipe {
+          expect_recipe do
             resource_action_spec_also_with_x "hi" do
               x 1
               action :set_x_to_x_in_non_initializer
             end
-          }.to emit_no_warnings_or_errors
+          end.to emit_no_warnings_or_errors
         end
 
         it "Using the enclosing resource to set x to 10 emits no warning" do
-          expect_recipe {
+          expect_recipe do
             resource_action_spec_also_with_x "hi" do
               x 1
               action :set_x_to_10
             end
-          }.to emit_no_warnings_or_errors
+          end.to emit_no_warnings_or_errors
         end
 
         it "Using the enclosing resource to set x to 10 emits no warning" do
-          expect_recipe {
+          expect_recipe do
             r = resource_action_spec_also_with_x "hi"
             r.x 1
             r.action :set_x_to_10
-          }.to emit_no_warnings_or_errors
+          end.to emit_no_warnings_or_errors
         end
       end
 
@@ -464,11 +460,11 @@ module ResourceActionSpec
       end
 
       it "Setting group to nil in an action does not emit a warning about it being defined in two places" do
-        expect_recipe {
+        expect_recipe do
           resource_action_spec_set_group_to_nil "hi" do
             action :set_group_to_nil
           end
-        }.to emit_no_warnings_or_errors
+        end.to emit_no_warnings_or_errors
       end
     end
 
@@ -484,9 +480,9 @@ module ResourceActionSpec
       end
 
       it "Raises an error when attempting to use a template in the action" do
-        expect_converge {
+        expect_converge do
           has_property_named_template "hi"
-        }.to raise_error(/Property template of has_property_named_template\[hi\] cannot be passed a block! If you meant to create a resource named template instead, you'll need to first rename the property./)
+        end.to raise_error(/Property template of has_property_named_template\[hi\] cannot be passed a block! If you meant to create a resource named template instead, you'll need to first rename the property./)
       end
     end
 
@@ -528,9 +524,9 @@ module ResourceActionSpec
 
       it "the methods are available to the action" do
         r = nil
-        expect_recipe {
+        expect_recipe do
           r = declares_action_class_methods "hi"
-        }.to emit_no_warnings_or_errors
+        end.to emit_no_warnings_or_errors
         expect(r.x).to eq(10)
       end
 
@@ -557,9 +553,9 @@ module ResourceActionSpec
 
         it "the methods are available to the action" do
           r = nil
-          expect_recipe {
+          expect_recipe do
             r = declares_action_class_methods_too "hi"
-          }.to emit_no_warnings_or_errors
+          end.to emit_no_warnings_or_errors
           expect(r.x).to eq(15)
         end
       end

data/spec/integration/recipes/resource_converge_if_changed_spec.rb

@@ -19,7 +19,7 @@ describe "Resource::ActionClass#converge_if_changed" do
 
   context "when the resource has identity, state and control properties" do
     let(:resource_name) { :"converge_if_changed_dsl#{Namer.current_index}" }
-    let(:resource_class) {
+    let(:resource_class) do
       result = Class.new(Chef::Resource) do
         def self.to_s; resource_name.to_s; end
 
@@ -36,7 +36,7 @@ describe "Resource::ActionClass#converge_if_changed" do
       end
       result.resource_name resource_name
       result
-    }
+    end
     let(:converged_recipe) { converge(converge_recipe) }
     let(:resource) { converged_recipe.resources.first }
 
@@ -70,13 +70,13 @@ describe "Resource::ActionClass#converge_if_changed" do
         end
 
         context "and state1 is set to a new value" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'new_state1'
               end
             EOM
-          }
+          end
 
           it "the resource updates state1" do
             expect(resource.converged).to eq 1
@@ -90,14 +90,14 @@ describe "Resource::ActionClass#converge_if_changed" do
         end
 
         context "and state1 and state2 are set to new values" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'new_state1'
                 state2 'new_state2'
               end
             EOM
-          }
+          end
 
           it "the resource updates state1 and state2" do
             expect(resource.converged).to eq 1
@@ -112,7 +112,7 @@ EOM
         end
 
         context "and state1 and state2 are set to new sensitive values" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 sensitive true
@@ -120,7 +120,7 @@ EOM
                 state2 'new_state2'
               end
             EOM
-          }
+          end
 
           it "the resource updates state1 and state2" do
             expect(resource.converged).to eq 1
@@ -135,14 +135,14 @@ EOM
         end
 
         context "and state1 is set to its current value but state2 is set to a new value" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'current_state1'
                 state2 'new_state2'
               end
             EOM
-          }
+          end
 
           it "the resource updates state2" do
             expect(resource.converged).to eq 1
@@ -156,14 +156,14 @@ EOM
         end
 
         context "and state1 and state2 are set to their current values" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'current_state1'
                 state2 'current_state2'
               end
             EOM
-          }
+          end
 
           it "the resource updates nothing" do
             expect(resource.converged).to eq 0
@@ -175,14 +175,14 @@ EOM
         end
 
         context "and identity1 and control1 are set to new values" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 identity1 'new_identity1'
                 control1 'new_control1'
               end
             EOM
-          }
+          end
 
           # Because the identity value is copied over to the new resource, by
           # default they do not register as "changed"
@@ -205,14 +205,14 @@ EOM
         end
 
         context "and identity1 and control1 are set to new values" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 identity1 'new_identity1'
                 control1 'new_control1'
               end
             EOM
-          }
+          end
 
           # Control values are not desired state and are therefore not considered
           # a reason for converging.
@@ -252,14 +252,14 @@ EOM
         end
 
         context "and state1 and state2 are set" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'new_state1'
                 state2 'new_state2'
               end
             EOM
-          }
+          end
 
           it "the resource is created" do
             expect(resource.converged).to eq 1
@@ -275,7 +275,7 @@ EOM
         end
 
         context "and state1 and state2 are set with sensitive property" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 sensitive true
@@ -283,7 +283,7 @@ EOM
                 state2 'new_state2'
               end
             EOM
-          }
+          end
 
           it "the resource is created" do
             expect(resource.converged).to eq 1
@@ -334,13 +334,13 @@ EOM
 
         context "and state1 is set to a new value" do
 
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'new_state1'
               end
             EOM
-          }
+          end
 
           it "the resource updates state1" do
             expect(resource.converged).to eq 1
@@ -354,14 +354,14 @@ EOM
         end
 
         context "and state1 and state2 are set to new values" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'new_state1'
                 state2 'new_state2'
               end
             EOM
-          }
+          end
 
           it "the resource updates state1 and state2" do
             expect(resource.converged).to eq 2
@@ -377,14 +377,14 @@ EOM
         end
 
         context "and state1 is set to its current value but state2 is set to a new value" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'current_state1'
                 state2 'new_state2'
               end
             EOM
-          }
+          end
 
           it "the resource updates state2" do
             expect(resource.converged).to eq 1
@@ -398,14 +398,14 @@ EOM
         end
 
         context "and state1 and state2 are set to their current values" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'current_state1'
                 state2 'current_state2'
               end
             EOM
-          }
+          end
 
           it "the resource updates nothing" do
             expect(resource.converged).to eq 0
@@ -425,9 +425,9 @@ EOM
         end
 
         context "and nothing is set" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             "#{resource_name} 'blah'"
-          }
+          end
 
           it "the resource is created" do
             expect(resource.converged).to eq 2
@@ -443,14 +443,14 @@ EOM
         end
 
         context "and state1 and state2 are set to new values" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'new_state1'
                 state2 'new_state2'
               end
             EOM
-          }
+          end
 
           it "the resource is created" do
             expect(resource.converged).to eq 2
@@ -466,7 +466,7 @@ EOM
         end
 
         context "and state1 and state2 are set to new sensitive values" do
-          let(:converge_recipe) {
+          let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 sensitive true
@@ -474,7 +474,7 @@ EOM
                 state2 'new_state2'
               end
             EOM
-          }
+          end
 
           it "the resource is created" do
             expect(resource.converged).to eq 2