Switch to new test syntax

Author: mblaschke

tests/serverspec/spec/shared/apache/service.rb

@@ -1,8 +1,9 @@
 shared_examples 'apache::service::running' do
-    describe command("service apache check") do
+    describe "service apache check" do
         it "should have running apache daemon", :retry => 5, :retry_wait => 10 do
-            its(:stdout) { should match 'ok' }
-            its(:exit_status) { should eq 0 }
+            cmd = command("service apache check")
+            expect(cmd.stdout).to match('ok')
+            expect(cmd.exit_status).to eq 0
         end
     end
 

tests/serverspec/spec/shared/dovecot/service.rb

@@ -1,8 +1,9 @@
 shared_examples 'dovecot::service::running' do
-    describe command("service dovecot check") do
+    describe "service dovecot check" do
         it "should have running dovecot daemon", :retry => 5, :retry_wait => 10 do
-            its(:stdout) { should match 'ok' }
-            its(:exit_status) { should eq 0 }
+            cmd = command("service dovecot check")
+            expect(cmd.stdout).to match('ok')
+            expect(cmd.exit_status).to eq 0
         end
     end
 

tests/serverspec/spec/shared/hhvm/service.rb

@@ -1,8 +1,9 @@
 shared_examples 'hhvm::service::running' do
-    describe command("service hhvm check") do
+    describe "service hhvm check" do
         it "should have running hhvm daemon", :retry => 5, :retry_wait => 10 do
-            its(:stdout) { should match 'ok' }
-            its(:exit_status) { should eq 0 }
+            cmd = command("service hhvm check")
+            expect(cmd.stdout).to match('ok')
+            expect(cmd.exit_status).to eq 0
         end
     end
 

tests/serverspec/spec/shared/nginx/service.rb

@@ -1,8 +1,9 @@
 shared_examples 'nginx::service::running' do
-    describe command("service nginx check") do
+    describe "service nginx check" do
         it "should have running nginx daemon", :retry => 5, :retry_wait => 10 do
-            its(:stdout) { should match 'ok' }
-            its(:exit_status) { should eq 0 }
+            cmd = command("service nginx check")
+            expect(cmd.stdout).to match('ok')
+            expect(cmd.exit_status).to eq 0
         end
     end
 

tests/serverspec/spec/shared/php/service.rb

@@ -1,8 +1,9 @@
 shared_examples 'php-fpm::service::running' do
-    describe command("service php-fpm check") do
+    describe "service php-fpm check" do
         it "should have running php-fpm daemon", :retry => 5, :retry_wait => 10 do
-            its(:stdout) { should match 'ok' }
-            its(:exit_status) { should eq 0 }
+            cmd = command("service php-fpm check")
+            expect(cmd.stdout).to match('ok')
+            expect(cmd.exit_status).to eq 0
         end
     end
 

tests/serverspec/spec/shared/php/test.rb

@@ -35,18 +35,16 @@
         'http://localhost/php-test.php?test=sha1',
         'https://localhost/php-test.php?test=sha1'
     ].each do |url|
-        describe command("curl --insecure --silent --retry 10 --fail #{url}") do
-            it "should have running and answering webserver and php app server", :retry => 5, :retry_wait => 10 do
-                its(:stdout) { should_not contain('PHP Notice') }
-                its(:stdout) { should_not contain('Notice') }
-                its(:stdout) { should_not contain('PHP Warning') }
-                its(:stderr) { should_not contain('PHP Notice') }
-                its(:stderr) { should_not contain('Notice') }
-                its(:stderr) { should_not contain('PHP Warning') }
-
-                its(:stdout) { should     contain('2ae62521966cf6d4188acefc943c903e5fc0a25c') }
-
-                its(:exit_status) { should eq 0 }
+        describe url do
+            it "should have running and answering webserver", :retry => 5, :retry_wait => 10 do
+                cmd = command("curl --insecure --silent --retry 10 --fail #{url}")
+                expect(cmd.stdout).not_to contain('PHP Notice')
+                expect(cmd.stdout).not_to contain('Notice')
+                expect(cmd.stdout).not_to contain('PHP Warning')
+                expect(cmd.stdout).not_to contain('Warning')
+                expect(cmd.stdout).not_to contain('Fatal Error')
+                expect(cmd.stdout).to contain('2ae62521966cf6d4188acefc943c903e5fc0a25c')
+                expect(cmd.exit_status).to eq 0
             end
         end
     end
@@ -57,18 +55,16 @@
         'http://localhost/php-test.php?test=php_sapi_name',
         'https://localhost/php-test.php?test=php_sapi_name'
     ].each do |url|
-        describe command("curl --insecure --silent --retry 10 --fail #{url}") do
-            it "should have running and answering webserver and php app server", :retry => 5, :retry_wait => 10 do
-                its(:stdout) { should_not contain('PHP Notice') }
-                its(:stdout) { should_not contain('Notice') }
-                its(:stdout) { should_not contain('PHP Warning') }
-                its(:stderr) { should_not contain('PHP Notice') }
-                its(:stderr) { should_not contain('Notice') }
-                its(:stderr) { should_not contain('PHP Warning') }
-
-                its(:stdout) { should     contain('fpm-fcgi') }
-
-                its(:exit_status) { should eq 0 }
+        describe url do
+            it "should have running and answering webserver", :retry => 5, :retry_wait => 10 do
+                cmd = command("curl --insecure --silent --retry 10 --fail #{url}")
+                expect(cmd.stdout).not_to contain('PHP Notice')
+                expect(cmd.stdout).not_to contain('Notice')
+                expect(cmd.stdout).not_to contain('PHP Warning')
+                expect(cmd.stdout).not_to contain('Warning')
+                expect(cmd.stdout).not_to contain('Fatal Error')
+                expect(cmd.stdout).to contain('fpm-fcgi')
+                expect(cmd.exit_status).to eq 0
             end
         end
     end
@@ -80,18 +76,17 @@
         'http://localhost/php-test.php?test=php_ini_scanned_files',
         'https://localhost/php-test.php?test=php_ini_scanned_files'
     ].each do |url|
-        describe command("curl --insecure --silent --retry 10 --fail #{url}") do
-            it "should have running and answering webserver and php app server", :retry => 5, :retry_wait => 10 do
-                its(:stdout) { should_not contain('PHP Notice') }
-                its(:stdout) { should_not contain('Notice') }
-                its(:stdout) { should_not contain('PHP Warning') }
-                its(:stderr) { should_not contain('PHP Notice') }
-                its(:stderr) { should_not contain('Notice') }
-                its(:stderr) { should_not contain('PHP Warning') }
-                its(:stdout) { should contain('-docker.ini') }
-                its(:stdout) { should contain('-webdevops.ini') }
-
-                its(:exit_status) { should eq 0 }
+        describe url do
+            it "should have running and answering webserver", :retry => 5, :retry_wait => 10 do
+                cmd = command("curl --insecure --silent --retry 10 --fail #{url}")
+                expect(cmd.stdout).not_to contain('PHP Notice')
+                expect(cmd.stdout).not_to contain('Notice')
+                expect(cmd.stdout).not_to contain('PHP Warning')
+                expect(cmd.stdout).not_to contain('Warning')
+                expect(cmd.stdout).not_to contain('Fatal Error')
+                expect(cmd.stdout).to contain('-docker.ini')
+                expect(cmd.stdout).to contain('-webdevops.ini')
+                expect(cmd.exit_status).to eq 0
             end
         end
     end
@@ -102,18 +97,16 @@
         'http://localhost/php-test.php?test=version',
         'https://localhost/php-test.php?test=version'
     ].each do |url|
-        describe command("curl --insecure --silent --retry 10 --fail #{url}") do
-            it "should have running and answering webserver and php app server", :retry => 5, :retry_wait => 10 do
-                its(:stdout) { should_not contain('PHP Notice') }
-                its(:stdout) { should_not contain('Notice') }
-                its(:stdout) { should_not contain('PHP Warning') }
-                its(:stderr) { should_not contain('PHP Notice') }
-                its(:stderr) { should_not contain('Notice') }
-                its(:stderr) { should_not contain('PHP Warning') }
-
-                its(:stdout) { should match %r!PHP 5\.[3-9]\.[0-9]{1,2}(-[^\(]*)?! }
-
-                its(:exit_status) { should eq 0 }
+        describe url do
+            it "should have running and answering webserver", :retry => 5, :retry_wait => 10 do
+                cmd = command("curl --insecure --silent --retry 10 --fail #{url}")
+                expect(cmd.stdout).not_to contain('PHP Notice')
+                expect(cmd.stdout).not_to contain('Notice')
+                expect(cmd.stdout).not_to contain('PHP Warning')
+                expect(cmd.stdout).not_to contain('Warning')
+                expect(cmd.stdout).not_to contain('Fatal Error')
+                expect(cmd.stdout).to match %r!PHP 5\.[3-9]\.[0-9]{1,2}(-[^\(]*)?!
+                expect(cmd.exit_status).to eq 0
             end
         end
     end
@@ -124,18 +117,16 @@
         'http://localhost/php-test.php?test=version',
         'https://localhost/php-test.php?test=version'
     ].each do |url|
-        describe command("curl --insecure --silent --retry 10 --fail #{url}") do
-            it "should have running and answering webserver and php app server", :retry => 5, :retry_wait => 10 do
-                its(:stdout) { should_not contain('PHP Notice') }
-                its(:stdout) { should_not contain('Notice') }
-                its(:stdout) { should_not contain('PHP Warning') }
-                its(:stderr) { should_not contain('PHP Notice') }
-                its(:stderr) { should_not contain('Notice') }
-                its(:stderr) { should_not contain('PHP Warning') }
-
-                its(:stdout) { should match %r!PHP 7\.[0-9]\.[0-9]{1,2}(-[^\(]*)?! }
-
-                its(:exit_status) { should eq 0 }
+        describe url do
+            it "should have running and answering webserver", :retry => 5, :retry_wait => 10 do
+                cmd = command("curl --insecure --silent --retry 10 --fail #{url}")
+                expect(cmd.stdout).not_to contain('PHP Notice')
+                expect(cmd.stdout).not_to contain('Notice')
+                expect(cmd.stdout).not_to contain('PHP Warning')
+                expect(cmd.stdout).not_to contain('Warning')
+                expect(cmd.stdout).not_to contain('Fatal Error')
+                expect(cmd.stdout).to match %r!PHP 7\.[0-9]\.[0-9]{1,2}(-[^\(]*)?!
+                expect(cmd.exit_status).to eq 0
             end
         end
     end
@@ -146,18 +137,16 @@
         'http://localhost/php-test.php?test=process_user_id',
         'https://localhost/php-test.php?test=process_user_id'
     ].each do |url|
-        describe command("curl --insecure --silent --retry 10 --fail #{url}") do
-            it "should have running and answering webserver and php app server", :retry => 5, :retry_wait => 10 do
-                its(:stdout) { should_not contain('PHP Notice') }
-                its(:stdout) { should_not contain('Notice') }
-                its(:stdout) { should_not contain('PHP Warning') }
-                its(:stderr) { should_not contain('PHP Notice') }
-                its(:stderr) { should_not contain('Notice') }
-                its(:stderr) { should_not contain('PHP Warning') }
-
-                its(:stdout) { should contain('UID:1000#') }
-
-                its(:exit_status) { should eq 0 }
+        describe url do
+            it "should have running and answering webserver", :retry => 5, :retry_wait => 10 do
+                cmd = command("curl --insecure --silent --retry 10 --fail #{url}")
+                expect(cmd.stdout).not_to contain('PHP Notice')
+                expect(cmd.stdout).not_to contain('Notice')
+                expect(cmd.stdout).not_to contain('PHP Warning')
+                expect(cmd.stdout).not_to contain('Warning')
+                expect(cmd.stdout).not_to contain('Fatal Error')
+                expect(cmd.stdout).to contain('UID:1000#')
+                expect(cmd.exit_status).to eq 0
             end
         end
     end

tests/serverspec/spec/shared/postfix/service.rb

@@ -1,8 +1,9 @@
 shared_examples 'postfix::service::running' do
-    describe command("service postfix check") do
+    describe "service postfix check" do
         it "should have running postfix daemon", :retry => 5, :retry_wait => 10 do
-            its(:stdout) { should match 'ok' }
-            its(:exit_status) { should eq 0 }
+            cmd = command("service postfix check")
+            expect(cmd.stdout).to match('ok')
+            expect(cmd.exit_status).to eq 0
         end
     end
 

tests/serverspec/spec/shared/ssh/service.rb

@@ -1,8 +1,9 @@
 shared_examples 'ssh::service::running' do
-    describe command("service ssh check") do
+    describe "service ssh check" do
         it "should have running ssh daemon", :retry => 5, :retry_wait => 10 do
-            its(:stdout) { should match 'ok' }
-            its(:exit_status) { should eq 0 }
+            cmd = command("service ssh check")
+            expect(cmd.stdout).to match('ok')
+            expect(cmd.exit_status).to eq 0
         end
     end
 

tests/serverspec/spec/shared/vsftp/service.rb

@@ -1,8 +1,9 @@
 shared_examples 'vsftp::service::running' do
-    describe command("service vsftp check") do
+    describe "service vsftp check" do
         it "should have running vsftp daemon", :retry => 5, :retry_wait => 10 do
-            its(:stdout) { should match 'ok' }
-            its(:exit_status) { should eq 0 }
+            cmd = command("service vsftp check")
+            expect(cmd.stdout).to match('ok')
+            expect(cmd.exit_status).to eq 0
         end
     end
 

tests/serverspec/spec/shared/web/test.rb

@@ -3,10 +3,11 @@
         'http://localhost/pi-number.html',
         'https://localhost/pi-number.html'
     ].each do |url|
-        describe command("curl --insecure --silent --retry 10 --fail #{url}") do
+        describe url do
             it "should have running and answering webserver", :retry => 5, :retry_wait => 10 do
-                its(:stdout) { should     contain('3.14159265359') }
-                its(:exit_status) { should eq 0 }
+                cmd = command("curl --insecure --silent --retry 10 --fail #{url}")
+                expect(cmd.stdout).to contain('3.14159265359')
+                expect(cmd.exit_status).to eq 0
             end
         end
     end