Add test file to fixture cookbook

3 files changed, 8 insertions, 2 deletions

diff --git a/spec/data/cookbooks/openldap/spec/spec_helper.rb b/spec/data/cookbooks/openldap/spec/spec_helper.rb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/spec/data/cookbooks/openldap/spec/spec_helper.rb
diff --git a/spec/unit/cookbook/syntax_check_spec.rb b/spec/unit/cookbook/syntax_check_spec.rb
index 6d0ce96870..228f695106 100644
--- a/spec/unit/cookbook/syntax_check_spec.rb
+++ b/spec/unit/cookbook/syntax_check_spec.rb
@@ -38,7 +38,8 @@ describe Chef::Cookbook::SyntaxCheck do
         recipes/default.rb
         recipes/gigantor.rb
         recipes/one.rb
-        recipes/return.rb }.map { |f| File.join(cookbook_path, f) }
+        recipes/return.rb
+        spec/spec_helper.rb }.map { |f| File.join(cookbook_path, f) }
   end
 
   before do
@@ -50,7 +51,8 @@ describe Chef::Cookbook::SyntaxCheck do
     @libr_files = %w{openldap.rb openldap/version.rb}.map { |f| File.join(cookbook_path, "libraries", f) }
     @defn_files = %w{client.rb server.rb}.map { |f| File.join(cookbook_path, "definitions", f) }
     @recipes = %w{default.rb gigantor.rb one.rb return.rb}.map { |f| File.join(cookbook_path, "recipes", f) }
-    @ruby_files = @attr_files + @libr_files + @defn_files + @recipes + [File.join(cookbook_path, "metadata.rb")]
+    @spec_files = [ File.join(cookbook_path, "spec", "spec_helper.rb") ]
+    @ruby_files = @attr_files + @libr_files + @defn_files + @recipes + @spec_files + [File.join(cookbook_path, "metadata.rb")]
     basenames = %w{ helpers_via_partial_test.erb
                     helper_test.erb
                     helpers.erb
diff --git a/spec/unit/cookbook_site_streaming_uploader_spec.rb b/spec/unit/cookbook_site_streaming_uploader_spec.rb
index 0e9c277b11..10963386dd 100644
--- a/spec/unit/cookbook_site_streaming_uploader_spec.rb
+++ b/spec/unit/cookbook_site_streaming_uploader_spec.rb
@@ -49,6 +49,10 @@ describe Chef::CookbookSiteStreamingUploader do
       cookbook = @loader[:openldap]
       files_count = Dir.glob(File.join(@cookbook_repo, cookbook.name.to_s, "**", "*"), File::FNM_DOTMATCH).count { |file| File.file?(file) }
 
+      # The fixture cookbook contains a spec/spec_helper.rb file, which is not
+      # a part of any cookbook segment, so it is not uploaded.
+      files_count -= 1
+
       expect(Tempfile).to receive(:new).with("chef-#{cookbook.name}-build").and_return(FakeTempfile.new("chef-#{cookbook.name}-build"))
       expect(FileUtils).to receive(:mkdir_p).exactly(files_count + 1).times
       expect(FileUtils).to receive(:cp).exactly(files_count).times