From 1a4d20877ce9ff7e5c09ba38ff4ea4b2502e0665 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 22 Dec 2020 14:42:11 +0000 Subject: [PATCH] test: fix rubocop violations Use method: 1. `rubocop -a --safe` 2. `rubocop -A --safe` 3. Use `rubocop:disable` ``` Offenses: test/integration/default/controls/config_spec.rb:1:1: C: Style/FrozenStringLiteralComment: Missing frozen string literal comment. control 'Php configuration' do ^ test/integration/default/controls/config_spec.rb:4:3: C: Metrics/AbcSize: Assignment Branch Condition size for test_debian is too high. [<0, 26, 0> 26/17] (http://c2.com/cgi/wiki?AbcMetric, https://en.wikipedia.org/wiki/ABC_Software_Metric) def test_debian ... ^^^^^^^^^^^^^^^ test/integration/default/controls/config_spec.rb:4:3: C: Metrics/MethodLength: Method has too many lines. [14/10] (https://rubystyle.guide#short-methods) def test_debian ... ^^^^^^^^^^^^^^^ test/integration/default/controls/config_spec.rb:24:3: C: Style/EmptyMethod: Put empty method definitions on a single line. (https://rubystyle.guide#no-single-line-methods) def test_redhat ... ^^^^^^^^^^^^^^^ test/integration/default/controls/config_spec.rb:27:3: C: Style/EmptyMethod: Put empty method definitions on a single line. (https://rubystyle.guide#no-single-line-methods) def test_suse ... ^^^^^^^^^^^^^ test/integration/default/controls/package_spec.rb:1:1: C: Style/FrozenStringLiteralComment: Missing frozen string literal comment. control 'Php package' do ^ test/integration/default/controls/package_spec.rb:4:3: C: Metrics/AbcSize: Assignment Branch Condition size for test_debian is too high. [<1, 26, 1> 26.04/17] (http://c2.com/cgi/wiki?AbcMetric, https://en.wikipedia.org/wiki/ABC_Software_Metric) def test_debian ... ^^^^^^^^^^^^^^^ test/integration/default/controls/package_spec.rb:4:3: C: Metrics/MethodLength: Method has too many lines. [20/10] (https://rubystyle.guide#short-methods) def test_debian ... ^^^^^^^^^^^^^^^ test/integration/default/controls/package_spec.rb:21:1: C: Layout/EmptyLinesAroundBlockBody: Extra empty line detected at block body beginning. (https://rubystyle.guide#empty-lines-around-bodies) test/integration/default/controls/service_spec.rb:1:1: C: Style/FrozenStringLiteralComment: Missing frozen string literal comment. control 'Php service' do ^ test/integration/default/controls/service_spec.rb:16:3: C: Style/EmptyMethod: Put empty method definitions on a single line. (https://rubystyle.guide#no-single-line-methods) def test_redhat ... ^^^^^^^^^^^^^^^ test/integration/default/controls/service_spec.rb:19:3: C: Style/EmptyMethod: Put empty method definitions on a single line. (https://rubystyle.guide#no-single-line-methods) def test_suse ... ^^^^^^^^^^^^^ 7 files inspected, 12 offenses detected, 8 offenses auto-correctable ``` --- test/integration/default/controls/config_spec.rb | 10 ++++++---- test/integration/default/controls/package_spec.rb | 5 ++++- test/integration/default/controls/service_spec.rb | 8 ++++---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config_spec.rb index fee1f2da..c20b7eee 100644 --- a/test/integration/default/controls/config_spec.rb +++ b/test/integration/default/controls/config_spec.rb @@ -1,6 +1,9 @@ +# frozen_string_literal: true + control 'Php configuration' do title 'should match desired lines' + # rubocop:disable Metrics/MethodLength, Metrics/AbcSize def test_debian describe file('/etc/php/5.6/fpm/pool.d/radius-admin.conf') do its('content') { should include '[radius-admin]' } @@ -20,12 +23,11 @@ def test_debian its('content') { should include 'date.timezone = Europe/Paris' } end end + # rubocop:enable Metrics/MethodLength, Metrics/AbcSize - def test_redhat - end + def test_redhat; end - def test_suse - end + def test_suse; end case os[:family] when 'debian' diff --git a/test/integration/default/controls/package_spec.rb b/test/integration/default/controls/package_spec.rb index e3b56c6f..e61dc6b3 100644 --- a/test/integration/default/controls/package_spec.rb +++ b/test/integration/default/controls/package_spec.rb @@ -1,6 +1,9 @@ +# frozen_string_literal: true + control 'Php package' do title 'should be installed' + # rubocop:disable Metrics/MethodLength, Metrics/AbcSize def test_debian describe package('php-imagick') do it { should be_installed } @@ -18,7 +21,6 @@ def test_debian bz2 cli curl fpm gd imap intl mbstring mysql readline xml zip ].each do |pkg| - describe package("php5.6-#{pkg}") do it { should be_installed } end @@ -28,6 +30,7 @@ def test_debian end end end + # rubocop:enable Metrics/MethodLength, Metrics/AbcSize def test_redhat describe package('php') do diff --git a/test/integration/default/controls/service_spec.rb b/test/integration/default/controls/service_spec.rb index d1932aba..3e1ba7bb 100644 --- a/test/integration/default/controls/service_spec.rb +++ b/test/integration/default/controls/service_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + control 'Php service' do title 'should be running and enabled' @@ -13,11 +15,9 @@ def test_debian end end - def test_redhat - end + def test_redhat; end - def test_suse - end + def test_suse; end case os[:family] when 'debian'