summaryrefslogtreecommitdiff
path: root/spec/integration
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-03-03 16:22:23 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-03-03 16:22:23 -0800
commit5fd3c2f8376d7264d8ca4f883c9dfc4fbfb9b0d3 (patch)
tree41d861f8d67a80b1c789357c81545517ea00bd0c /spec/integration
parent0b835a0a92509c5d9ad4123d320024da0005dac3 (diff)
downloadchef-5fd3c2f8376d7264d8ca4f883c9dfc4fbfb9b0d3.tar.gz
better chef+ruby rspec constraints
lets us use Gem::Dependency constraints directly as rspec constraints for matching Chef::Version and RUBY_VERSION. copies some magic sauce from bundler that does something similar
Diffstat (limited to 'spec/integration')
-rw-r--r--spec/integration/knife/upload_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/knife/upload_spec.rb b/spec/integration/knife/upload_spec.rb
index 739dfa44d1..9a1717b2d9 100644
--- a/spec/integration/knife/upload_spec.rb
+++ b/spec/integration/knife/upload_spec.rb
@@ -159,14 +159,14 @@ EOM
file "cookbooks/x/metadata.rb", "name 'x'; version '1.0.0'; depends 'x'"
end
- it "should warn", :chef_lt_13_only do
+ it "should warn", chef: "< 13" do
knife("upload /cookbooks").should_succeed(
stdout: "Updated /cookbooks/x\n",
stderr: "WARN: Ignoring self-dependency in cookbook x, please remove it (in the future this will be fatal).\n"
)
knife("diff --name-status /").should_succeed ""
end
- it "should fail in Chef 13", :chef_gte_13_only do
+ it "should fail in Chef 13", chef: ">= 13" do
knife("upload /cookbooks").should_fail ""
# FIXME: include the error message here
end