rubocop 0.22.0 → 0.23.0

data/spec/rubocop/cop/style/space_after_not_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceAfterNot do
+describe RuboCop::Cop::Style::SpaceAfterNot do
   subject(:cop) { described_class.new }
 
   it 'reports an offense for space after !' do

data/spec/rubocop/cop/style/space_after_semicolon_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceAfterSemicolon do
+describe RuboCop::Cop::Style::SpaceAfterSemicolon do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for semicolon without space after it' do

data/spec/rubocop/cop/style/space_around_equals_in_parameter_default_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceAroundEqualsInParameterDefault, :config do
+describe RuboCop::Cop::Style::SpaceAroundEqualsInParameterDefault, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'when EnforcedStyle is space' do

data/spec/rubocop/cop/style/space_around_operators_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceAroundOperators do
+describe RuboCop::Cop::Style::SpaceAroundOperators do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for assignment without space on both sides' do

data/spec/rubocop/cop/style/space_before_block_braces_spec.rb

@@ -2,13 +2,13 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceBeforeBlockBraces do
+describe RuboCop::Cop::Style::SpaceBeforeBlockBraces do
   subject(:cop) { described_class.new(config) }
   let(:config) do
-    merged = Rubocop::ConfigLoader
-      .default_configuration['SpaceBeforeBlockBraces'].merge(cop_config)
-    Rubocop::Config.new('Blocks' => { 'Enabled' => false },
-                        'SpaceBeforeBlockBraces' => merged)
+    merged = RuboCop::ConfigLoader
+      .default_configuration['Style/SpaceBeforeBlockBraces'].merge(cop_config)
+    RuboCop::Config.new('Style/Blocks' => { 'Enabled' => false },
+                        'Style/SpaceBeforeBlockBraces' => merged)
   end
   let(:cop_config) { { 'EnforcedStyle' => 'space' } }
 

data/spec/rubocop/cop/style/space_before_comment_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceBeforeComment do
+describe RuboCop::Cop::Style::SpaceBeforeComment do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for missing space before an EOL comment' do

data/spec/rubocop/cop/style/space_before_modifier_keyword_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceBeforeModifierKeyword do
+describe RuboCop::Cop::Style::SpaceBeforeModifierKeyword do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for missing space before if/unless' do

data/spec/rubocop/cop/style/space_inside_block_braces_spec.rb

@@ -2,15 +2,15 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceInsideBlockBraces do
+describe RuboCop::Cop::Style::SpaceInsideBlockBraces do
   SUPPORTED_STYLES = %w(space no_space)
 
   subject(:cop) { described_class.new(config) }
   let(:config) do
-    merged = Rubocop::ConfigLoader
-      .default_configuration['SpaceInsideBlockBraces'].merge(cop_config)
-    Rubocop::Config.new('Blocks' => { 'Enabled' => false },
-                        'SpaceInsideBlockBraces' => merged)
+    merged = RuboCop::ConfigLoader
+      .default_configuration['Style/SpaceInsideBlockBraces'].merge(cop_config)
+    RuboCop::Config.new('Style/Blocks' => { 'Enabled' => false },
+                        'Style/SpaceInsideBlockBraces' => merged)
   end
   let(:cop_config) do
     {
@@ -147,8 +147,8 @@ describe Rubocop::Cop::Style::SpaceInsideBlockBraces do
 
     context 'and Blocks cop enabled' do
       let(:config) do
-        Rubocop::Config.new('Blocks'                 => { 'Enabled' => true },
-                            'SpaceInsideBlockBraces' => cop_config)
+        RuboCop::Config.new('Style/Blocks' => { 'Enabled' => true },
+                            'Style/SpaceInsideBlockBraces' => cop_config)
       end
 
       it 'does auto-correction for single-line blocks' do

data/spec/rubocop/cop/style/space_inside_brackets_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceInsideBrackets do
+describe RuboCop::Cop::Style::SpaceInsideBrackets do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for an array literal with spaces inside' do

data/spec/rubocop/cop/style/space_inside_hash_literal_braces_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
+describe RuboCop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'EnforcedStyle' => 'space' } }
 

data/spec/rubocop/cop/style/space_inside_parens_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceInsideParens do
+describe RuboCop::Cop::Style::SpaceInsideParens do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for spaces inside parens' do

data/spec/rubocop/cop/style/special_global_vars_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpecialGlobalVars do
+describe RuboCop::Cop::Style::SpecialGlobalVars do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for $:' do

data/spec/rubocop/cop/style/string_literals_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::StringLiterals, :config do
+describe RuboCop::Cop::Style::StringLiterals, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'configured with single quotes preferred' do

data/spec/rubocop/cop/style/symbol_array_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SymbolArray do
+describe RuboCop::Cop::Style::SymbolArray do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for arrays of symbols', ruby: 2.0 do

data/spec/rubocop/cop/style/tab_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::Tab do
+describe RuboCop::Cop::Style::Tab do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for a line indented with tab' do

data/spec/rubocop/cop/style/trailing_blank_lines_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::TrailingBlankLines, :config do
+describe RuboCop::Cop::Style::TrailingBlankLines, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'when EnforcedStyle is final_newline' do

data/spec/rubocop/cop/style/trailing_comma_spec.rb

@@ -2,11 +2,10 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::TrailingComma, :config do
+describe RuboCop::Cop::Style::TrailingComma, :config do
   subject(:cop) { described_class.new(config) }
-  let(:cop_config) { { 'EnforcedStyleForMultiline' => 'no_comma' } }
 
-  context 'with single line list of values' do
+  shared_examples 'single line lists' do
     it 'registers an offense for trailing comma in an Array literal' do
       inspect_source(cop, 'VALUES = [1001, 2020, 3333, ]')
       expect(cop.messages)
@@ -76,8 +75,22 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
     end
   end
 
+  context 'with single line list of values' do
+    context 'when EnforcedStyleForMultiline is no_comma' do
+      let(:cop_config) { { 'EnforcedStyleForMultiline' => 'no_comma' } }
+      include_examples 'single line lists'
+    end
+
+    context 'when EnforcedStyleForMultiline is comma' do
+      let(:cop_config) { { 'EnforcedStyleForMultiline' => 'comma' } }
+      include_examples 'single line lists'
+    end
+  end
+
   context 'with multi-line list of values' do
     context 'when EnforcedStyleForMultiline is no_comma' do
+      let(:cop_config) { { 'EnforcedStyleForMultiline' => 'no_comma' } }
+
       it 'registers an offense for trailing comma in an Array literal' do
         inspect_source(cop, ['VALUES = [',
                              '           1001,',
@@ -131,8 +144,7 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
         expect(cop.offenses).to be_empty
       end
 
-      it 'accepts comma inside a heredoc' \
-         ' parameters at the end' do
+      it 'accepts comma inside a heredoc parameters at the end' do
         inspect_source(cop, ['route(help: {',
                              "  'auth' => <<-HELP.chomp",
                              ',',
@@ -145,20 +157,28 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
     context 'when EnforcedStyleForMultiline is comma' do
       let(:cop_config) { { 'EnforcedStyleForMultiline' => 'comma' } }
 
-      it 'registers an offense for no trailing comma in an Array literal' do
+      it 'accepts Array literal with no trailing comma when closing bracket ' \
+         'is on same line as last value' do
         inspect_source(cop, ['VALUES = [',
                              '           1001,',
                              '           2020,',
                              '           3333]'])
-        expect(cop.messages)
-          .to eq(['Put a comma after the last item of a multiline array.'])
-        expect(cop.highlights).to eq(['3333'])
+        expect(cop.offenses).to be_empty
+      end
+
+      it 'accepts Array literal with two of the values on the same line' do
+        inspect_source(cop, ['VALUES = [',
+                             '           1001, 2020,',
+                             '           3333',
+                             '         ]'])
+        expect(cop.offenses).to be_empty
       end
 
       it 'registers an offense for no trailing comma in a Hash literal' do
         inspect_source(cop, ['MAP = { a: 1001,',
                              '        b: 2020,',
-                             '        c: 3333 }'])
+                             '        c: 3333',
+                             '}'])
         expect(cop.messages)
           .to eq(['Put a comma after the last item of a multiline hash.'])
         expect(cop.highlights).to eq(['c: 3333'])
@@ -178,6 +198,12 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
         expect(cop.highlights).to eq(['d: 1'])
       end
 
+      it 'accepts a method call with two parameters on the same line' do
+        inspect_source(cop, ['some_method(a, b',
+                             '           )'])
+        expect(cop.offenses).to be_empty
+      end
+
       it 'accepts trailing comma in an Array literal' do
         inspect_source(cop, ['VALUES = [1001,',
                              '          2020,',

data/spec/rubocop/cop/style/trailing_whitespace_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::TrailingWhitespace do
+describe RuboCop::Cop::Style::TrailingWhitespace do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for a line ending with space' do

data/spec/rubocop/cop/style/trivial_accessors_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::TrivialAccessors, :config do
+describe RuboCop::Cop::Style::TrivialAccessors, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { {} }
 
@@ -475,7 +475,8 @@ describe Rubocop::Cop::Style::TrivialAccessors, :config do
       end
 
       it 'does not autocorrect' do
-        expect(autocorrect_source(cop, source)).to eq(source.join("\n"))
+        expect(autocorrect_source(cop, source))
+          .to eq(source.join("\n"))
       end
     end
 
@@ -487,7 +488,54 @@ describe Rubocop::Cop::Style::TrivialAccessors, :config do
       end
 
       it 'does not autocorrect' do
-        expect(autocorrect_source(cop, source)).to eq(source.join("\n"))
+        expect(autocorrect_source(cop, source))
+          .to eq(source.join("\n"))
+      end
+    end
+
+    context 'class receiver reader' do
+      let(:source) do
+        ['class Foo',
+         '  def self.foo',
+         '    @foo',
+         '  end',
+         'end']
+      end
+
+      let(:corrected_source) do
+        ['class Foo',
+         '  class << self',
+         '    attr_reader :foo',
+         '  end',
+         'end']
+      end
+
+      it 'autocorrects with class-level attr_reader' do
+        expect(autocorrect_source(cop, source))
+          .to eq(corrected_source.join("\n"))
+      end
+    end
+
+    context 'class receiver writer' do
+      let(:source) do
+        ['class Foo',
+         '  def self.foo=(f)',
+         '    @foo = f',
+         '  end',
+         'end']
+      end
+
+      let(:corrected_source) do
+        ['class Foo',
+         '  class << self',
+         '    attr_writer :foo',
+         '  end',
+         'end']
+      end
+
+      it 'autocorrects with class-level attr_writer' do
+        expect(autocorrect_source(cop, source))
+          .to eq(corrected_source.join("\n"))
       end
     end
   end

data/spec/rubocop/cop/style/unless_else_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::UnlessElse do
+describe RuboCop::Cop::Style::UnlessElse do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for an unless with else' do

data/spec/rubocop/cop/style/unneeded_capital_w_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::UnneededCapitalW do
+describe RuboCop::Cop::Style::UnneededCapitalW do
   subject(:cop) { described_class.new }
 
   it 'registers no offense for normal arrays of strings' do

data/spec/rubocop/cop/style/unneeded_percent_x_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::UnneededPercentX do
+describe RuboCop::Cop::Style::UnneededPercentX do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for a %x string without backquotes' do

data/spec/rubocop/cop/style/variable_interpolation_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::VariableInterpolation do
+describe RuboCop::Cop::Style::VariableInterpolation do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for interpolated global variables' do

data/spec/rubocop/cop/style/variable_name_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::VariableName, :config do
+describe RuboCop::Cop::Style::VariableName, :config do
   subject(:cop) { described_class.new(config) }
 
   shared_examples 'always accepted' do

data/spec/rubocop/cop/style/when_then_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::WhenThen do
+describe RuboCop::Cop::Style::WhenThen do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for when x;' do

data/spec/rubocop/cop/style/while_until_do_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::WhileUntilDo do
+describe RuboCop::Cop::Style::WhileUntilDo do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for do in multiline while' do

data/spec/rubocop/cop/style/while_until_modifier_spec.rb

@@ -2,13 +2,13 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::WhileUntilModifier do
+describe RuboCop::Cop::Style::WhileUntilModifier do
   include StatementModifierHelper
 
   subject(:cop) { described_class.new(config) }
   let(:config) do
-    hash = { 'LineLength' => { 'Max' => 80 } }
-    Rubocop::Config.new(hash)
+    hash = { 'Style/LineLength' => { 'Max' => 80 } }
+    RuboCop::Config.new(hash)
   end
 
   it "accepts multiline unless that doesn't fit on one line" do
@@ -76,10 +76,10 @@ describe Rubocop::Cop::Style::WhileUntilModifier do
   context 'when the maximum line length is specified by the cop itself' do
     let(:config) do
       hash = {
-        'LineLength' => { 'Max' => 100 },
-        'WhileUntilModifier' => { 'MaxLineLength' => 80 }
+        'Style/LineLength' => { 'Max' => 100 },
+        'Style/WhileUntilModifier' => { 'MaxLineLength' => 80 }
       }
-      Rubocop::Config.new(hash)
+      RuboCop::Config.new(hash)
     end
 
     it "accepts multiline while that doesn't fit on one line" do