summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-04-17 13:17:53 -0700
committerTim Smith <tsmith@chef.io>2019-04-17 13:17:53 -0700
commitc7326d0b518ad7c22ffdf70413f5955888aba432 (patch)
tree6261757353a3627eae13d01131522adaa48dfca9 /spec
parentf6f4100cdb1d78fd189325220e8600a15f7e9bff (diff)
downloadchef-c7326d0b518ad7c22ffdf70413f5955888aba432.tar.gz
Improve the error message when no config can be loaded
Make it more clear that we're going to use the CLI options instead since we couldn't find a config file. Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'spec')
-rw-r--r--spec/unit/application_spec.rb2
-rw-r--r--spec/unit/log/syslog_spec.rb4
-rw-r--r--spec/unit/log/winevt_spec.rb4
3 files changed, 5 insertions, 5 deletions
diff --git a/spec/unit/application_spec.rb b/spec/unit/application_spec.rb
index ef28dbb21b..480f38349f 100644
--- a/spec/unit/application_spec.rb
+++ b/spec/unit/application_spec.rb
@@ -162,7 +162,7 @@ describe Chef::Application do
it "should emit a warning" do
expect(Chef::Config).not_to receive(:from_file).with("/etc/chef/default.rb")
- expect(Chef::Log).to receive(:warn).with("No config file found or specified on command line, using command line options.")
+ expect(Chef::Log).to receive(:warn).with("No config file found or specified on command line, using command line options instead.")
@app.configure_chef
end
end
diff --git a/spec/unit/log/syslog_spec.rb b/spec/unit/log/syslog_spec.rb
index 4586503e88..37ee66ec40 100644
--- a/spec/unit/log/syslog_spec.rb
+++ b/spec/unit/log/syslog_spec.rb
@@ -40,8 +40,8 @@ describe "Chef::Log::Syslog", unix_only: true do
end
it "should send message with severity warning to syslog." do
- expect(syslog).to receive(:add).with(2, "No config file found or specified on command line, using command line options.", nil)
- Chef::Log.warn("No config file found or specified on command line, using command line options.")
+ expect(syslog).to receive(:add).with(2, "No config file found or specified on command line, using command line options instead.", nil)
+ Chef::Log.warn("No config file found or specified on command line, using command line options instead.")
end
it "should fallback into send message with severity info to syslog when wrong format." do
diff --git a/spec/unit/log/winevt_spec.rb b/spec/unit/log/winevt_spec.rb
index c7cc49f40d..34f04ee6e9 100644
--- a/spec/unit/log/winevt_spec.rb
+++ b/spec/unit/log/winevt_spec.rb
@@ -43,8 +43,8 @@ describe Chef::Log::WinEvt do
end
it "should send message with severity warning to Windows Event Log." do
- expect(winevt).to receive(:add).with(2, "No config file found or specified on command line, using command line options.", nil)
- Chef::Log.warn("No config file found or specified on command line, using command line options.")
+ expect(winevt).to receive(:add).with(2, "No config file found or specified on command line, using command line options instead.", nil)
+ Chef::Log.warn("No config file found or specified on command line, using command line options instead.")
end
it "should fallback into send message with severity info to Windows Event Log when wrong format." do