(CONT-776) - Correct Style/TrailingCommaInHashLiteral

Author: jordanbreen28

.rubocop_todo.yml

@@ -155,10 +155,3 @@ RSpec/NoExpectationExample:
 RSpec/StubbedMock:
   Exclude:
     - 'spec/unit/lib/facter/docker_spec.rb'
-
-# Offense count: 190
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Enabled: false

spec/classes/compose_spec.rb

@@ -5,34 +5,34 @@
 tests = {
   'with default valus' => {},
   'with ensure => absent' => {
-    'ensure' => 'absent',
+    'ensure' => 'absent'
   },
   'with version => 1.7.0' => {
-    'version' => '1.7.0',
+    'version' => '1.7.0'
   },
   'when proxy is provided' => {
     'version' => '1.7.0',
-    'proxy' => 'http://proxy.example.org:3128/',
+    'proxy' => 'http://proxy.example.org:3128/'
   },
   'when proxy is not a http proxy' => {
-    'proxy' => 'this is not a URL',
+    'proxy' => 'this is not a URL'
   },
   'when proxy contains username and password' => {
     'version' => '1.7.0',
-    'proxy' => 'http://user:[email protected]:3128/',
+    'proxy' => 'http://user:[email protected]:3128/'
   },
   'when proxy IP is provided' => {
     'version' => '1.7.0',
-    'proxy' => 'http://10.10.10.10:3128/',
+    'proxy' => 'http://10.10.10.10:3128/'
   },
   'when base_url is provided' => {
     'version' => '1.7.0',
-    'base_url' => 'http://example.org',
+    'base_url' => 'http://example.org'
   },
   'when raw_url is provided' => {
     'version' => '1.7.0',
-    'raw_url' => 'http://example.org',
-  },
+    'raw_url' => 'http://example.org'
+  }
 }
 
 describe 'docker::compose', type: :class do
@@ -62,7 +62,7 @@
             'proxy' => :undef,
             'base_url' => defaults['compose_base_url'],
             'raw_url' => :undef,
-            'curl_ensure' => defaults['curl_ensure'],
+            'curl_ensure' => defaults['curl_ensure']
           }.merge(local_params)
 
           let(:facts) do

spec/classes/images_spec.rb

@@ -4,11 +4,11 @@
 
 tests = {
   'with ensure => present' => {
-    'ensure' => 'present',
+    'ensure' => 'present'
   },
   'with ensure => absent' => {
-    'ensure' => 'absent',
-  },
+    'ensure' => 'absent'
+  }
 }
 
 describe 'docker::images', type: :class do
@@ -38,8 +38,8 @@
               'force' => false,
               'docker_file' => :undef,
               'docker_dir' => :undef,
-              'docker_tar' => :undef,
-            },
+              'docker_tar' => :undef
+            }
           }
 
           params.each do |key, values|
@@ -52,8 +52,8 @@
             let(:params) do
               {
                 'images' => {
-                  key => values,
-                },
+                  key => values
+                }
               }
             end
 

spec/classes/init_spec.rb

@@ -9,26 +9,26 @@
       'some_random_user',
       'foo',
       'bar',
-    ],
+    ]
   },
   'with package_source set to docker-engine' => {
-    'package_source' => 'docker-engine',
+    'package_source' => 'docker-engine'
   },
   'with package_source set to docker-ce' => {
-    'package_source' => 'docker-ce',
+    'package_source' => 'docker-ce'
   },
   'with ensure set to absent' => {
-    'ensure' => 'absent',
+    'ensure' => 'absent'
   },
   'with ensure set to absent and given version' => {
     'ensure' => 'absent',
-    'version' => '16',
+    'version' => '16'
   },
   'with ms parameter set' => {
     'version' => '16',
     'docker_msft_provider_version' => '123',
-    'nuget_package_provider_version' => '41',
-  },
+    'nuget_package_provider_version' => '41'
+  }
 }
 
 describe 'docker', type: :class do
@@ -41,13 +41,13 @@
 
       default_params = {
         'docker_ee' => true,
-        'docker_users' => [],
+        'docker_users' => []
       }
     else
       facts = os_facts
 
       default_params = {
-        'docker_users' => [],
+        'docker_users' => []
       }
     end
 
@@ -178,7 +178,7 @@
             'tmp_dir_config' => defaults['tmp_dir_config'],
             'tmp_dir' => defaults['tmp_dir'],
             'use_upstream_package_source' => defaults['use_upstream_package_source'],
-            'version' => defaults['version'],
+            'version' => defaults['version']
           }.merge(default_params).merge(local_params)
 
           let(:facts) do

spec/classes/machine_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 tests = {
-  'with default value' => {},
+  'with default value' => {}
 }
 
 describe 'docker::machine', type: :class do
@@ -31,7 +31,7 @@
             'install_path' => defaults['machine_install_path'],
             'proxy' => :undef,
             'url' => :undef,
-            'curl_ensure' => defaults['curl_ensure'],
+            'curl_ensure' => defaults['curl_ensure']
           }.merge(local_params)
 
           let(:facts) do

spec/classes/networks_spec.rb

@@ -8,15 +8,15 @@
     'driver' => 'overlay',
     'subnet' => '192.168.1.0/24',
     'gateway' => '192.168.1.1',
-    'ip_range' => '192.168.1.4/32',
+    'ip_range' => '192.168.1.4/32'
   },
   'network-absent' => {
     'ensure' => 'absent',
     'driver' => 'overlay',
     'subnet' => '192.168.1.0/24',
     'gateway' => '192.168.1.1',
-    'ip_range' => '192.168.1.4/32',
-  },
+    'ip_range' => '192.168.1.4/32'
+  }
 }
 
 describe 'docker::networks', type: :class do
@@ -47,8 +47,8 @@
           let(:params) do
             {
               'networks' => {
-                title => local_params,
-              },
+                title => local_params
+              }
             }
           end
 

spec/classes/plugins_spec.rb

@@ -4,11 +4,11 @@
 
 tests = {
   'foo/enabled:latest' => {
-    'enabled' => true,
+    'enabled' => true
   },
   'foo/disabled:latest' => {
-    'enabled' => false,
-  },
+    'enabled' => false
+  }
 }
 
 describe 'docker::plugins', type: :class do
@@ -40,8 +40,8 @@
               'disable_content_trust' => true,
               'grant_all_permissions' => true,
               'force_remove' => true,
-              'settings' => [],
-            },
+              'settings' => []
+            }
           }
 
           params.each do |key, values|
@@ -54,8 +54,8 @@
             let(:params) do
               {
                 'plugins' => {
-                  key => values,
-                },
+                  key => values
+                }
               }
             end
 

spec/defines/exec_spec.rb

@@ -5,42 +5,42 @@
 tests = {
   'with default values' => {},
   'when running detached' => {
-    'detach' => true,
+    'detach' => true
   },
   'when running with tty' => {
-    'tty' => true,
+    'tty' => true
   },
   'when running with interactive' => {
-    'interactive' => true,
+    'interactive' => true
   },
   'when running with onlyif "running"' => {
     'interactive' => true,
-    'onlyif' => 'running',
+    'onlyif' => 'running'
   },
   'when running without onlyif custom command' => {
     'interactive' => true,
-    'onlyif' => 'custom',
+    'onlyif' => 'custom'
   },
   'when running without onlyif' => {
-    'interactive' => true,
+    'interactive' => true
   },
   'when running with unless' => {
     'interactive' => true,
-    'unless' => 'some_command arg1',
+    'unless' => 'some_command arg1'
   },
   'when running without unless' => {
-    'interactive' => true,
+    'interactive' => true
   },
   'with title that need sanitisation' => {
     'detach' => true,
-    'sanitise_name' => true,
+    'sanitise_name' => true
   },
   'with environment variables passed to exec' => {
     'env' => [
       'FOO=BAR',
       'FOO2=BAR2',
-    ],
-  },
+    ]
+  }
 }
 
 describe 'docker::exec', type: :define do
@@ -72,7 +72,7 @@
             'refreshonly' => false,
             'sanitise_name' => true,
             'tty' => false,
-            'unless' => :undef,
+            'unless' => :undef
           }.merge(local_params)
 
           let(:facts) do