diff options
| author | Claire McQuin <claire@getchef.com> | 2014-10-31 13:26:41 -0700 |
|---|---|---|
| committer | Claire McQuin <claire@getchef.com> | 2014-10-31 13:26:41 -0700 |
| commit | 8e78ea7a889ef7393edbd3ca1010b644ce746c70 (patch) | |
| tree | 248f0a33535a2369b67b706fc4ccb7903eaa8d91 | |
| parent | e83d1a6cea042364184379740beb862c40c7da08 (diff) | |
| parent | 2f942406d9bb64335586cbca982dfbe9d36c0a74 (diff) | |
| download | chef-8e78ea7a889ef7393edbd3ca1010b644ce746c70.tar.gz | |
Merge branch 'master' into mcquin/rspec-3
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | lib/chef/resource_collection.rb | 4 | ||||
| -rw-r--r-- | spec/unit/provider/package/windows_spec.rb | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index dcc93fde32..7e539fd70f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ branches: - master - 10-stable - 11-stable + - 12-stable script: bundle exec rspec --color --format progress diff --git a/lib/chef/resource_collection.rb b/lib/chef/resource_collection.rb index 30520cff7e..4fd6fcad24 100644 --- a/lib/chef/resource_collection.rb +++ b/lib/chef/resource_collection.rb @@ -43,8 +43,6 @@ class Chef # @param resource [Chef::Resource] The resource to insert # @param resource_type [String,Symbol] If known, the resource type used in the recipe, Eg `package`, `execute` # @param instance_name [String] If known, the recource name as used in the recipe, IE `vim` in `package 'vim'` - # @param at_location [Integer] If know, a location in the @resource_list to insert resource - # If you know the at_location but not the resource_type or instance_name, pass them in as nil # This method is meant to be the 1 insert method necessary in the future. It should support all known use cases # for writing into the ResourceCollection. def insert(resource, opts={}) @@ -60,7 +58,7 @@ class Chef # @deprecated def []=(index, resource) - Chef::Log.warn("`[]=` is deprecated, use `insert` with the `at_location` parameter") + Chef::Log.warn("`[]=` is deprecated, use `insert` (which only inserts at the end)") resource_list[index] = resource resource_set.insert_as(resource) end diff --git a/spec/unit/provider/package/windows_spec.rb b/spec/unit/provider/package/windows_spec.rb index 5ab84e7ac7..d402113d72 100644 --- a/spec/unit/provider/package/windows_spec.rb +++ b/spec/unit/provider/package/windows_spec.rb @@ -68,8 +68,8 @@ describe Chef::Provider::Package::Windows, :windows_only do describe "installer_type" do it "it returns @installer_type if it is set" do - provider.new_resource.installer_type("downeaster") - expect(provider.installer_type).to eql("downeaster") + provider.new_resource.installer_type(:downeaster) + expect(provider.installer_type).to eql(:downeaster) end it "sets installer_type to msi if the source ends in .msi" do |