summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-10-07 00:28:16 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-10-07 00:28:16 -0700
commitda5ddd16e6f1aad79fbba624fd4103aef7f5a572 (patch)
tree69b83d535626fed18572baca6c0612df4e5dc2d7
parent9a00ed4f885dc2a5ce13f5d5b1eb74047bca48a3 (diff)
downloadchef-lcg/serverspec-2.tar.gz
fix matchers, should pass nowlcg/serverspec-2
-rw-r--r--kitchen-tests/test/integration/webapp/serverspec/localhost/default_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/kitchen-tests/test/integration/webapp/serverspec/localhost/default_spec.rb b/kitchen-tests/test/integration/webapp/serverspec/localhost/default_spec.rb
index f8e83829a4..05da3ff337 100644
--- a/kitchen-tests/test/integration/webapp/serverspec/localhost/default_spec.rb
+++ b/kitchen-tests/test/integration/webapp/serverspec/localhost/default_spec.rb
@@ -67,13 +67,13 @@ describe "webapp::default", :end_to_end => true do
let(:db_query) { "mysql -u root -pilikerandompasswordstoo -e \"#{statement}\"" }
let(:statement) { "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME='webapp'" }
it "creates a database called 'webapp'" do
- expect(command(db_query)).to return_stdout(/webapp/)
+ expect(command(db_query).stdout).to match /webapp/
end
describe "mysql database user 'webapp'" do
let(:statement) { "SELECT Host, Db FROM mysql.db WHERE User='webapp'\\G" }
it "adds user 'webapp' to database 'webapp@localhost'" do
- expect(command(db_query)).to return_stdout(/Host: localhost\n Db: webapp/)
+ expect(command(db_query).stdout).to match /Host: localhost\n Db: webapp/
end
describe "grants" do
@@ -86,7 +86,7 @@ describe "webapp::default", :end_to_end => true do
let(:priv_query) { "#{priv.capitalize}_priv" }
it "has privilege #{priv} on 'webapp@localhost'" do
- expect(command(db_query)).to return_stdout(/#{priv_query}: Y/)
+ expect(command(db_query).stdout).to match /#{priv_query}: Y/
end
end