From 37b0c4383927d32b4a6960523baae80dc8df20bf Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 11 Oct 2019 12:50:13 +0100
Subject: [PATCH 1/3] fix(rubocop): add fixes using `rubocop
 --safe-auto-correct`

---
 test/integration/default/controls/command_spec.rb  | 10 +++++-----
 test/integration/default/controls/config_spec.rb   |  2 ++
 test/integration/default/controls/services_spec.rb |  6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/test/integration/default/controls/command_spec.rb b/test/integration/default/controls/command_spec.rb
index 7e6eea3..b68a47d 100644
--- a/test/integration/default/controls/command_spec.rb
+++ b/test/integration/default/controls/command_spec.rb
@@ -1,14 +1,14 @@
+# frozen_string_literal: true
+
 # Overide by Platform
 pg_port = '5432'
-if platform[:family] == 'debian' or platform[:family] == 'suse'
-  pg_port = '5433'
-end
+pg_port = '5433' if (platform[:family] == 'debian') || (platform[:family] == 'suse')
 
 control 'Postgres command' do
   title 'should match desired lines'
 
   # Can't use `%Q` here due to the `\`
-  describe command(%q{su - postgres -c 'psql -p} + pg_port + %q{ -qtc "\l+ db2"'}) do
-    its(:stdout) { should match(%r{db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space}) }
+  describe command("su - postgres -c 'psql -p" + pg_port + %q( -qtc "\l+ db2"')) do
+    its(:stdout) { should match(/db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space/) }
   end
 end
diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config_spec.rb
index dc61924..476ee6b 100644
--- a/test/integration/default/controls/config_spec.rb
+++ b/test/integration/default/controls/config_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 control 'Postgres configuration' do
   title 'should include the directory'
 
diff --git a/test/integration/default/controls/services_spec.rb b/test/integration/default/controls/services_spec.rb
index b2bfe97..5dfd78e 100644
--- a/test/integration/default/controls/services_spec.rb
+++ b/test/integration/default/controls/services_spec.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # Overide by Platform
 service_name = 'postgresql'
 pg_port = 5432
-if platform[:name] == 'centos' and platform[:release].start_with?('6')
+if (platform[:name] == 'centos') && platform[:release].start_with?('6')
   service_name = 'postgresql-9.6'
-elsif platform[:family] == 'debian' or platform[:family] == 'suse'
+elsif (platform[:family] == 'debian') || (platform[:family] == 'suse')
   pg_port = 5433
 end
 

From b369aa9d40b3f686504876d231ce05ec05fb90ee Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 11 Oct 2019 12:52:29 +0100
Subject: [PATCH 2/3] fix(rubocop): fix remaining errors manually

---
 test/integration/default/controls/command_spec.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/integration/default/controls/command_spec.rb b/test/integration/default/controls/command_spec.rb
index b68a47d..30046fd 100644
--- a/test/integration/default/controls/command_spec.rb
+++ b/test/integration/default/controls/command_spec.rb
@@ -9,6 +9,10 @@ control 'Postgres command' do
 
   # Can't use `%Q` here due to the `\`
   describe command("su - postgres -c 'psql -p" + pg_port + %q( -qtc "\l+ db2"')) do
-    its(:stdout) { should match(/db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space/) }
+    its(:stdout) do
+      should match(
+        /db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space/
+      )
+    end
   end
 end

From 2c82872dd939e6cc31cc54ee37b49402f1b111bd Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 11 Oct 2019 12:57:27 +0100
Subject: [PATCH 3/3] ci(travis): merge `rubocop` linter into main `lint` job

* Semi-automated using https://github.com/myii/ssf-formula/pull/64
---
 .travis.yml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3edfdc3..1c70727 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,17 +21,14 @@ stages:
   - name: release
     if: branch = master AND type != pull_request
 jobs:
-  allow_failures:
-    - env: Lint_rubocop
-  fast_finish: true
   include:
     ## Define the test stage that runs the linters (and testing matrix, if applicable)
 
-    # Run all of the linters in a single job (except `rubocop`)
+    # Run all of the linters in a single job
     - language: node_js
       node_js: lts/*
       env: Lint
-      name: 'Lint: salt-lint, yamllint & commitlint'
+      name: 'Lint: salt-lint, yamllint, rubocop & commitlint'
       before_install: skip
       script:
         # Install and run `salt-lint`
@@ -42,21 +39,13 @@ jobs:
         # Need at least `v1.17.0` for the `yaml-files` setting
         - pip install --user yamllint>=1.17.0
         - yamllint -s .
+        # Install and run `rubocop`
+        - gem install rubocop
+        - rubocop -d
         # Install and run `commitlint`
         - npm install @commitlint/config-conventional -D
         - npm install @commitlint/travis-cli -D
         - commitlint-travis
-    # Run the `rubocop` linter in a separate job that is allowed to fail
-    # Once these lint errors are fixed, this can be merged into a single job
-    - language: node_js
-      node_js: lts/*
-      env: Lint_rubocop
-      name: 'Lint: rubocop'
-      before_install: skip
-      script:
-        # Install and run `rubocop`
-        - gem install rubocop
-        - rubocop -d
 
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with