summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-05-18 13:06:53 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2015-05-18 13:06:53 -0700
commitca5f5b5fa9484e6971436beef6d89a28cf3745ca (patch)
tree314f139ab176bcef6fa2c28eb889028c286bd9ce
parentb9a326a9c7fe9b7d888101edb55ef701b0f3ef70 (diff)
downloadchef-ca5f5b5fa9484e6971436beef6d89a28cf3745ca.tar.gz
fix circular references tests
-rw-r--r--spec/integration/knife/deps_spec.rb22
1 files changed, 8 insertions, 14 deletions
diff --git a/spec/integration/knife/deps_spec.rb b/spec/integration/knife/deps_spec.rb
index 3120db4940..b7333cefda 100644
--- a/spec/integration/knife/deps_spec.rb
+++ b/spec/integration/knife/deps_spec.rb
@@ -216,22 +216,16 @@ depends "self"'
end
it 'knife deps prints each once' do
- knife('deps /cookbooks/foo /cookbooks/self').should_succeed <<EOM
-/cookbooks/baz
-/cookbooks/bar
-/cookbooks/foo
-/cookbooks/self
-EOM
+ knife('deps /cookbooks/foo /cookbooks/self').should_succeed(
+ stdout: "/cookbooks/baz\n/cookbooks/bar\n/cookbooks/foo\n/cookbooks/self\n",
+ stderr: "WARN: Ignoring self-dependency in cookbook self, please remove it (in the future this will be fatal).\n"
+ )
end
it 'knife deps --tree prints each once' do
- knife('deps --tree /cookbooks/foo /cookbooks/self').should_succeed <<EOM
-/cookbooks/foo
- /cookbooks/bar
- /cookbooks/baz
- /cookbooks/foo
-/cookbooks/self
- /cookbooks/self
-EOM
+ knife('deps --tree /cookbooks/foo /cookbooks/self').should_succeed(
+ stdout: "/cookbooks/foo\n /cookbooks/bar\n /cookbooks/baz\n /cookbooks/foo\n/cookbooks/self\n",
+ stderr: "WARN: Ignoring self-dependency in cookbook self, please remove it (in the future this will be fatal).\n"
+ )
end
end
when_the_repository 'has roles with circular dependencies' do