test(config): fix for Amazon Linux 2 & Oracle Linux 7/8

saltstack-formulas · Feb 14, 2021 · ab39c8f · ab39c8f
1 parent ae6375c
commit ab39c8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb
@@ -3,12 +3,12 @@
 server_available = '/etc/nginx/sites-available'
 server_enabled	 = '/etc/nginx/sites-enabled'
 
-# Override by OS
-case os[:name]
-when 'redhat', 'centos', 'fedora'
+# Override by platform family
+case platform[:family]
+when 'redhat','fedora'
   server_available = '/etc/nginx/conf.d'
   server_enabled   = '/etc/nginx/conf.d'
-when 'opensuse'
+when 'suse'
   server_available = '/etc/nginx/vhosts.d'
   server_enabled   = '/etc/nginx/vhosts.d'
 end

diff --git a/test/integration/default/controls/service.rb b/test/integration/default/controls/service.rb
@@ -2,6 +2,7 @@
   title 'should be running and enabled'
 
   describe service('nginx') do
+    it { should be_installed }
     it { should be_enabled }
     it { should be_running }
   end