Merge branch 'master' into macos

test/integration/v201707-py2/controls/pkgs_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 version =
   case platform[:family]
   when 'redhat'
@@ -14,10 +16,10 @@ version =
 control 'salt packages' do
   title 'should be installed'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe package(p) do
       it { should be_installed }
       its('version') { should eq version }

test/integration/v201707-py2/controls/service_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 control 'salt services' do
   title 'should be running'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe service(p) do
       it { should be_enabled }
       it { should be_running }

test/integration/v201707-py2/inspec.yml

@@ -15,3 +15,4 @@ supports:
   - platform-name: suse
   - platform-name: freebsd
   - platform-name: amazon
+  - platform-name: arch

test/integration/v201803-py2/controls/pkgs_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 version =
   case platform[:family]
   when 'redhat'
@@ -9,10 +11,10 @@ version =
 control 'salt packages' do
   title 'should be installed'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe package(p) do
       it { should be_installed }
       its('version') { should eq version }

test/integration/v201803-py2/controls/service_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 control 'salt services' do
   title 'should be running'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe service(p) do
       it { should be_enabled }
       it { should be_running }

test/integration/v201803-py2/inspec.yml

@@ -15,3 +15,4 @@ supports:
   - platform-name: suse
   - platform-name: freebsd
   - platform-name: amazon
+  - platform-name: arch

test/integration/v201902-py2/controls/pkgs_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 version =
   case platform[:family]
   when 'redhat'
@@ -18,10 +20,10 @@ version =
 control 'salt packages' do
   title 'should be installed'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe package(p) do
       it { should be_installed }
       its('version') { should eq version }

test/integration/v201902-py2/controls/service_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 control 'salt services' do
   title 'should be running'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe service(p) do
       it { should be_enabled }
       it { should be_running }

test/integration/v201902-py2/inspec.yml

@@ -15,3 +15,4 @@ supports:
   - platform-name: suse
   - platform-name: freebsd
   - platform-name: amazon
+  - platform-name: arch

test/integration/v201902-py3/controls/pkgs_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 version =
   case platform[:family]
   when 'redhat'
     case platform[:name]
     when 'amazon'
-      '2019.2.0-1.el7'
+      '2019.2.2-1.el7'
     when 'centos'
       '2019.2.1-1.el7'
     when 'fedora'
@@ -18,10 +20,10 @@ version =
 control 'salt packages' do
   title 'should be installed'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe package(p) do
       it { should be_installed }
       its('version') { should eq version }

test/integration/v201902-py3/controls/service_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 control 'salt services' do
   title 'should be running'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe service(p) do
       it { should be_enabled }
       it { should be_running }

test/integration/v201902-py3/inspec.yml

@@ -15,3 +15,4 @@ supports:
   - platform-name: suse
   - platform-name: freebsd
   - platform-name: amazon
+  - platform-name: arch