Merge pull request #1354 from opscode/chef-5169

added require for config_fetcher: CHEF-5169

3 files changed, 34 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 657e1f6adf..016a933f0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@
 * Knife cookbook test should honor chefignore (CHEF-4203)
 * Fix ImmutableMash and ImmutableArray to_hash and to_a methods (CHEF-5132)
 * guard_interpreter attribute: use powershell\_script, other script resources in guards (CHEF-4553)
+* Fix for CHEF-5169: add require for chef/config_fetcher
 
 ## Last Release: 11.10.0 (02/06/2014)
 
diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index 601bbd91f1..a943326d95 100644
--- a/lib/chef/application.rb
+++ b/lib/chef/application.rb
@@ -19,6 +19,7 @@
 require 'pp'
 require 'socket'
 require 'chef/config'
+require 'chef/config_fetcher'
 require 'chef/exceptions'
 require 'chef/log'
 require 'chef/platform'
diff --git a/spec/unit/pure_application_spec.rb b/spec/unit/pure_application_spec.rb
new file mode 100644
index 0000000000..5d879a7b85
--- /dev/null
+++ b/spec/unit/pure_application_spec.rb
@@ -0,0 +1,32 @@
+#
+# Author:: Serdar Sutay (<serdar@getchef.com>)
+# Copyright:: Copyright (c) 2014 Chef Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This spec file intentionally doesn't include spec_helper.rb to
+# be able to test only Chef::Application.
+# Regression test for CHEF-5169
+
+require 'chef/application'
+
+describe "Chef::Application" do
+  let(:app) { Chef::Application.new }
+
+  describe "load_config_file" do
+    it "calls ConfigFetcher successfully without NameError" do
+      expect { app.load_config_file }.not_to raise_error
+    end
+  end
+end