summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2014-11-03 13:54:01 -0800
committerClaire McQuin <claire@getchef.com>2014-11-03 13:54:01 -0800
commitc64b01083a6ca891ae7dfe52f95836a5a7013deb (patch)
treeddd6b880b14d1963f0af516dd4d53d441d4c95cb
parenta43bed3b5d6a63a31e6b0aa518eac3420879828e (diff)
downloadchef-c64b01083a6ca891ae7dfe52f95836a5a7013deb.tar.gz
Clean up for Windows spec deprecation warnings.
-rw-r--r--spec/functional/resource/link_spec.rb2
-rw-r--r--spec/support/matchers/leak.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/functional/resource/link_spec.rb b/spec/functional/resource/link_spec.rb
index a27224c94c..c8f64cbd20 100644
--- a/spec/functional/resource/link_spec.rb
+++ b/spec/functional/resource/link_spec.rb
@@ -564,7 +564,7 @@ describe Chef::Resource::Link do
# OS X gets angry about this sort of link. Bug in OS X, IMO.
pending('OS X/FreeBSD/AIX symlink? and readlink working on hard links to symlinks') if (os_x? or freebsd? or aix?)
expect(symlink?(target_file)).to be_truthy
- paths_eql?(readlink(target_file), @other_target).should be_truthy
+ expect(paths_eql?(readlink(target_file), @other_target)).to be_truthy
end
include_context 'delete is noop'
end
diff --git a/spec/support/matchers/leak.rb b/spec/support/matchers/leak.rb
index cc7d265a3c..01d1e53f92 100644
--- a/spec/support/matchers/leak.rb
+++ b/spec/support/matchers/leak.rb
@@ -26,11 +26,11 @@ module Matchers
@variance = opts[:variance] || 5000
end
- def failure_message_for_should
+ def failure_message
"expected final measure [#{@final_measure}] to be greater than or within +/- #{@variance} delta of initial measure [#{@initial_measure}]"
end
- def failure_message_for_should_not
+ def failure_message_when_negated
"expected final measure [#{@final_measure}] to be less than or within +/- #{@variance} delta of initial measure [#{@initial_measure}]"
end