fix serverspec php version

webdevops · Aug 18, 2020 · 4243d35 · 4243d35
1 parent ba467d2
commit 4243d35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/serverspec/spec/shared/php/test.rb b/tests/serverspec/spec/shared/php/test.rb
@@ -125,7 +125,7 @@
                 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.stdout).to match %r!PHP (?:7|8)\.[0-9]\.[0-9]{1,2}(-[^\(]*)?!
                 expect(cmd.exit_status).to eq 0
             end
         end

diff --git a/tests/serverspec/spec/shared/php/version.rb b/tests/serverspec/spec/shared/php/version.rb
@@ -8,7 +8,7 @@
 
 shared_examples 'php7::cli::version' do
     describe command('php -v') do
-        its(:stdout) { should match %r!PHP 7\.[0-9]\.[0-9]{1,2}(RC[0-9]|beta[0-9])?(-[^\(]*)? \(cli\)! }
+        its(:stdout) { should match %r!PHP (?:7|8)\.[0-9]\.[0-9]{1,2}(RC[0-9]|beta[0-9])?(-[^\(]*)? \(cli\)! }
 
         its(:exit_status) { should eq 0 }
     end