From fb38145cd49729a1adcba50e3bb7a2a73732fa80 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Thu, 28 Aug 2014 18:33:56 -0700 Subject: [PATCH] Ah hah, got it --- spec/acceptance/install_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/acceptance/install_spec.rb b/spec/acceptance/install_spec.rb index 1dbf330..efc4a9b 100644 --- a/spec/acceptance/install_spec.rb +++ b/spec/acceptance/install_spec.rb @@ -94,11 +94,11 @@ end # C14704 # C14705 # C15006 -describe 'oracle', :if => - fact('operatingsystem') == 'Debian' && fact('operatingsystemrelease').match(/^7/) - || fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease').match(/^12\.04/) - || fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease').match(/^14\.04/) -do +describe 'oracle', :if => ( + (fact('operatingsystem') == 'Debian') and (fact('operatingsystemrelease').match(/^7/)) or + (fact('operatingsystem') == 'Ubuntu') and (fact('operatingsystemrelease').match(/^12\.04/)) or + (fact('operatingsystem') == 'Ubuntu') and (fact('operatingsystemrelease').match(/^14\.04/)) +) do # not supported # The package is not available from any sources, but if a customer # custom-builds the package using java-package and adds it to a local