enable Lint/ParenthesesAsGroupedExpression

voxpupuli · Apr 11, 2016 · f1a4b88 · f1a4b88
1 parent 5e85e38
commit f1a4b88
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 99 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -92,7 +92,7 @@ Lint/Loop:
 
 # DISABLED
 Lint/ParenthesesAsGroupedExpression:
-  Enabled: false
+  Enabled: true
 
 Lint/RescueException:
   Enabled: false

diff --git a/spec/classes/agent_spec.rb b/spec/classes/agent_spec.rb
@@ -2,8 +2,10 @@
 require 'spec_helper'
 
 describe 'zabbix::agent' do
-  let (:node) { 'agent.example.com' }
-  let (:params) do
+  let :node do
+    'agent.example.com'
+  end
+  let :params do
     {
       server: '192.168.1.1',
       serveractive: '192.168.1.1',
@@ -12,7 +14,7 @@
   end
 
   context 'On RedHat 7.1' do
-    let (:facts) do
+    let :facts do
       {
         osfamily: 'RedHat',
         operatingsystem: 'RedHat',
@@ -42,7 +44,7 @@
     it { should contain_file('/etc/zabbix/zabbix_agentd.d').with_ensure('directory') }
 
     context "when declaring manage_repo is true" do
-      let (:params) do
+      let :params do
         {
           manage_repo: true,
         }
@@ -53,7 +55,7 @@
     end
 
     context "when declaring manage_resources is true" do
-      let (:params) do
+      let :params do
         {
           manage_resources: true,
         }
@@ -63,7 +65,7 @@
     end
 
     context "configuration file with hostnameitem" do
-      let (:params) do
+      let :params do
         {
           hostnameitem: 'system.hostname',
         }
@@ -73,7 +75,7 @@
     end
 
     context "when declaring manage_firewall is true" do
-      let (:params) do
+      let :params do
         {
           manage_firewall: true,
         }
@@ -83,7 +85,7 @@
     end
 
     context "when declaring manage_firewall is false" do
-      let (:params) do
+      let :params do
         {
           manage_firewall: false,
         }
@@ -93,7 +95,7 @@
     end
 
     context "configuration file with full options" do
-      let (:params) do
+      let :params do
         {
           allowroot: '0',
           agent_configfile_path: '/etc/zabbix/zabbix_agentd.conf',

diff --git a/spec/classes/database_mysql_spec.rb b/spec/classes/database_mysql_spec.rb
@@ -2,10 +2,12 @@
 require 'spec_helper'
 
 describe 'zabbix::database::mysql' do
-  let (:node) { 'rspec.puppet.com' }
+  let :node do
+    'rspec.puppet.com'
+  end
 
   context 'On RedHat 6.5' do
-    let (:facts) do
+    let :facts do
       {
         osfamily: 'RedHat',
         operatingsystem: 'RedHat',
@@ -26,7 +28,7 @@
     end
 
     describe "when zabbix_type is server" do
-      let (:params) do
+      let :params do
         {
           database_name: 'zabbix-server',
           database_user: 'zabbix-server',
@@ -43,7 +45,7 @@
     end
 
     describe "when zabbix_type is proxy" do
-      let (:params) do
+      let :params do
         {
           database_name: 'zabbix-proxy',
           database_user: 'zabbix-proxy',

diff --git a/spec/classes/database_postgresql_spec.rb b/spec/classes/database_postgresql_spec.rb
@@ -2,14 +2,16 @@
 require 'spec_helper'
 
 describe 'zabbix::database::postgresql' do
-  let (:node) { 'rspec.puppet.com' }
+  let :node do
+    'rspec.puppet.com'
+  end
 
-  let (:pre_condition) do
+  let :pre_condition do
     "include ::postgresql::server"
   end
 
   context 'On RedHat 6.5' do
-    let (:facts) do
+    let :facts do
       {
         osfamily: 'RedHat',
         operatingsystem: 'RedHat',
@@ -30,7 +32,7 @@
     end
 
     describe "when zabbix_type is server" do
-      let (:params) do
+      let :params do
         {
           database_name: 'zabbix-server',
           database_user: 'zabbix-server',
@@ -48,7 +50,7 @@
     end
 
     describe "when zabbix_type is proxy" do
-      let (:params) do
+      let :params do
         {
           database_name: 'zabbix-proxy',
           database_user: 'zabbix-proxy',

diff --git a/spec/classes/database_spec.rb b/spec/classes/database_spec.rb
@@ -2,14 +2,16 @@
 require 'spec_helper'
 
 describe 'zabbix::database' do
-  let (:node) { 'rspec.puppet.com' }
+  let :node do
+    'rspec.puppet.com'
+  end
 
-  let (:pre_condition) do
+  let :pre_condition do
     "class {'postgresql::server':}"
   end
 
   context 'On RedHat 6.5' do
-    let (:facts) do
+    let :facts do
       {
         osfamily: 'RedHat',
         operatingsystem: 'RedHat',
@@ -30,7 +32,7 @@
     end
 
     describe "database_type is postgresql, zabbix_type is server and is multiple host setup" do
-      let (:params) do
+      let :params do
         {
           database_type: 'postgresql',
           database_name: 'zabbix-server',
@@ -54,7 +56,7 @@
     end
 
     describe "database_type is postgresql, zabbix_type is server and is single node setup" do
-      let (:params) do
+      let :params do
         {
           database_type: 'postgresql',
           database_name: 'zabbix-server',
@@ -78,7 +80,7 @@
     end
 
     describe "database_type is postgresql, zabbix_type is proxy" do
-      let (:params) do
+      let :params do
         {
           database_type: 'postgresql',
           database_name: 'zabbix-proxy',
@@ -94,7 +96,7 @@
     end
 
     describe "database_type is mysql, zabbix_type is server and is multiple host setup" do
-      let (:params) do
+      let :params do
         {
           database_type: 'mysql',
           database_name: 'zabbix-server',
@@ -116,7 +118,7 @@
     end
 
     describe "database_type is mysql, zabbix_type is server and is a single host setup" do
-      let (:params) do
+      let :params do
         {
           database_type: 'mysql',
           database_name: 'zabbix-server',
@@ -138,7 +140,7 @@
     end
 
     describe "database_type is mysql, zabbix_type is proxy and is a single host setup" do
-      let (:params) do
+      let :params do
         {
           database_type: 'mysql',
           database_name: 'zabbix-proxy',
@@ -152,7 +154,7 @@
     end
 
     describe "database_type is sqlite, zabbix_type is proxy and is a multiple host setup" do
-      let (:params) do
+      let :params do
         {
           database_type: 'sqlite',
           database_name: 'zabbix-server',

diff --git a/spec/classes/javagateway_spec.rb b/spec/classes/javagateway_spec.rb
@@ -2,10 +2,12 @@
 require 'spec_helper'
 
 describe 'zabbix::javagateway' do
-  let (:node) { 'rspec.puppet.com' }
+  let :node do
+    'rspec.puppet.com'
+  end
 
   context 'On RedHat 6.5' do
-    let (:facts) do
+    let :facts do
       {
         osfamily: 'RedHat',
         operatingsystem: 'RedHat',
@@ -29,7 +31,7 @@
     it { should contain_service('zabbix-java-gateway')}
 
     context 'when declaring manage_repo is true' do
-      let (:params) do
+      let :params do
         {
           manage_repo: true,
         }

diff --git a/spec/classes/proxy_spec.rb b/spec/classes/proxy_spec.rb
@@ -2,17 +2,19 @@
 require 'spec_helper'
 
 describe 'zabbix::proxy' do
-  let (:node) { 'rspec.puppet.com' }
+  let :node do
+    'rspec.puppet.com'
+  end
 
-  let (:params) do
+  let :params do
     {
       zabbix_server_host: '192.168.1.1',
       zabbix_version: '2.4'
     }
   end
 
   context 'On RedHat 7.1' do
-    let (:facts) do
+    let :facts do
       {
         osfamily: 'RedHat',
         operatingsystem: 'RedHat',
@@ -32,15 +34,15 @@
       }
     end
 
-    let (:pre_condition) do
+    let :pre_condition do
       "class {'postgresql::server':}"
     end
 
     it { should contain_file('/etc/zabbix/zabbix_proxy.conf.d').with_ensure('directory') }
     it { should contain_file('/etc/zabbix/zabbix_proxy.conf.d').with_require('File[/etc/zabbix/zabbix_proxy.conf]') }
 
     describe "when manage_repo is true" do
-      let (:params) do
+      let :params do
         {
           manage_repo: true,
         }
@@ -51,7 +53,7 @@
     end
 
     describe "when database_type is postgresql" do
-      let (:params) do
+      let :params do
         {
           database_type: 'postgresql',
         }
@@ -65,7 +67,7 @@
     end
 
     describe "when database_type is mysql" do
-      let (:params) do
+      let :params do
         {
           database_type: 'mysql',
         }
@@ -79,7 +81,7 @@
     end
 
     describe "when manage_resources is true" do
-      let (:params) do
+      let :params do
         {
           manage_resources: true,
           listenip: '192.168.1.1',
@@ -90,7 +92,7 @@
     end
 
     context 'with zabbix::database::postgresql class' do
-      let (:params) do
+      let :params do
         {
           database_type: 'postgresql',
           manage_database: true,
@@ -285,7 +287,7 @@
     end
 
     context "with zabbix_proxy.conf and version 3.0" do
-      let (:params) do
+      let :params do
         {
           tlsaccept: 'cert',
           tlscafile: '/etc/zabbix/keys/zabbix-server.ca',