Merge pull request puppetlabs#53 from puppetlabs/2021-02-26_fix_ruboc…

…op_1.10_linter_issues 2021 02 26 fix rubocop 1.10 linter issues
koic · Feb 26, 2021 · 92ef8f4 · 92ef8f4
2 parents 632c1b0 + 39dea90
commit 92ef8f4
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 19 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -4,6 +4,7 @@ require:
 
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 
 Metrics/BlockLength:
   Exclude:

diff --git a/lib/rubocop/cop/i18n/rails_i18n/decorate_string.rb b/lib/rubocop/cop/i18n/rails_i18n/decorate_string.rb
@@ -122,7 +122,7 @@ def regexp_from_string_type
             when 'sentence'            then SENTENCE_REGEXP
             when 'fragmented_sentence' then FRAGMENTED_SENTENCE_REGEXP
             when 'fragment'            then FRAGMENT_REGEXP
-            else
+            else # rubocop:disable Lint/DuplicateBranch
               SENTENCE_REGEXP
             end
           end

diff --git a/spec/rubocop/cop/i18n/gettext/decorate_function_message_spec.rb b/spec/rubocop/cop/i18n/gettext/decorate_function_message_spec.rb
@@ -2,9 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::I18n::GetText::DecorateFunctionMessage do
-  let(:config) { RuboCop::Config.new }
-  subject(:cop) { described_class.new(config) }
+describe RuboCop::Cop::I18n::GetText::DecorateFunctionMessage, :config, :config do
   before(:each) do
     investigate(cop, source)
   end

diff --git a/spec/rubocop/cop/i18n/gettext/decorate_string_formatting_using_interpolation_spec.rb b/spec/rubocop/cop/i18n/gettext/decorate_string_formatting_using_interpolation_spec.rb
@@ -2,9 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::I18n::GetText::DecorateStringFormattingUsingInterpolation do
-  let(:config) { RuboCop::Config.new }
-  subject(:cop) { described_class.new(config) }
+describe RuboCop::Cop::I18n::GetText::DecorateStringFormattingUsingInterpolation, :config, :config do
   before(:each) do
     investigate(cop, source)
   end

diff --git a/spec/rubocop/cop/i18n/gettext/decorate_string_formatting_using_percent_spec.rb b/spec/rubocop/cop/i18n/gettext/decorate_string_formatting_using_percent_spec.rb
@@ -2,9 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::I18n::GetText::DecorateStringFormattingUsingPercent do
-  let(:config) { RuboCop::Config.new }
-  subject(:cop) { described_class.new(config) }
+describe RuboCop::Cop::I18n::GetText::DecorateStringFormattingUsingPercent, :config, :config do
   before(:each) do
     investigate(cop, source)
   end

diff --git a/spec/rubocop/cop/i18n/gettext/decorate_string_spec.rb b/spec/rubocop/cop/i18n/gettext/decorate_string_spec.rb
@@ -2,9 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::I18n::GetText::DecorateString do
-  let(:config) { RuboCop::Config.new }
-  subject(:cop) { described_class.new(config) }
+describe RuboCop::Cop::I18n::GetText::DecorateString, :config, :config do
   before(:each) do
     investigate(cop, source)
   end

diff --git a/spec/rubocop/cop/i18n/rails_i18n/decorate_string_formatting_using_interpolation_spec.rb b/spec/rubocop/cop/i18n/rails_i18n/decorate_string_formatting_using_interpolation_spec.rb
@@ -2,9 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::I18n::RailsI18n::DecorateStringFormattingUsingInterpolation do
-  let(:config) { RuboCop::Config.new }
-  subject(:cop) { described_class.new(config) }
+describe RuboCop::Cop::I18n::RailsI18n::DecorateStringFormattingUsingInterpolation, :config, :config do
   before(:each) do
     investigate(cop, source)
   end

diff --git a/spec/rubocop/cop/i18n/rails_i18n/decorate_string_spec.rb b/spec/rubocop/cop/i18n/rails_i18n/decorate_string_spec.rb
@@ -2,9 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::I18n::RailsI18n::DecorateString do
-  let(:config) { RuboCop::Config.new }
-  subject(:cop) { described_class.new(config) }
+describe RuboCop::Cop::I18n::RailsI18n::DecorateString, :config, :config do
   before(:each) do
     investigate(cop, source)
   end