Don't mutate recipe name string in versioned_recipe_list

fixes #3618

2 files changed, 6 insertions, 7 deletions

diff --git a/lib/chef/run_list/versioned_recipe_list.rb b/lib/chef/run_list/versioned_recipe_list.rb
index 7cce6fa48c..2824f08f31 100644
--- a/lib/chef/run_list/versioned_recipe_list.rb
+++ b/lib/chef/run_list/versioned_recipe_list.rb
@@ -70,15 +70,16 @@ class Chef
       # @return [Array] Array of strings with fully-qualified recipe names
       def with_fully_qualified_names_and_version_constraints
         self.map do |recipe_name|
-          ret = if recipe_name.include?('::')
+          qualified_recipe = if recipe_name.include?('::')
             recipe_name
           else
             "#{recipe_name}::default"
           end
-          if @versions[recipe_name]
-            ret << "@#{@versions[recipe_name]}"
-          end
-          ret
+
+          version = @versions[recipe_name]
+          qualified_recipe = "#{qualified_recipe}@#{version}" if version
+
+          qualified_recipe
         end
       end
     end
diff --git a/spec/unit/run_list/versioned_recipe_list_spec.rb b/spec/unit/run_list/versioned_recipe_list_spec.rb
index d87d7a409c..9c3ecaa0dd 100644
--- a/spec/unit/run_list/versioned_recipe_list_spec.rb
+++ b/spec/unit/run_list/versioned_recipe_list_spec.rb
@@ -180,8 +180,6 @@ describe Chef::RunList::VersionedRecipeList do
       end
 
       it "does not mutate the recipe name" do
-        pending "This reproduces https://github.com/chef/chef/issues/3618"
-
         expect(fq_names).to eq([ "apt::cacher@~> 1.2.0" ])
         expect(list).to eq( [ "apt::cacher" ] )
       end