From da5ddd16e6f1aad79fbba624fd4103aef7f5a572 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Tue, 7 Oct 2014 00:28:16 -0700 Subject: fix matchers, should pass now --- .../test/integration/webapp/serverspec/localhost/default_spec.rb | 6 +++--- 1 file 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 -- cgit v1.2.1