rubocop 0.22.0 → 0.23.0

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::CommentAnnotation, :config do
+describe RuboCop::Cop::Style::CommentAnnotation, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) do
     { 'Keywords' => %w(TODO FIXME OPTIMIZE HACK REVIEW) }
@@ -23,7 +23,7 @@ describe Rubocop::Cop::Style::CommentAnnotation, :config do
   end
 
   context 'when used with the clang formatter' do
-    let(:formatter) { Rubocop::Formatter::ClangStyleFormatter.new(output) }
+    let(:formatter) { RuboCop::Formatter::ClangStyleFormatter.new(output) }
     let(:output) { StringIO.new }
 
     it 'marks the annotation keyword' do

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::CommentIndentation do
+describe RuboCop::Cop::Style::CommentIndentation do
   subject(:cop) { described_class.new }
 
   context 'on outer level' do

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::ConstantName do
+describe RuboCop::Cop::Style::ConstantName do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for camel case in const name' do
@@ -46,7 +46,7 @@ describe Rubocop::Cop::Style::ConstantName do
                    ['AnythingGoes = test do',
                     '  do_something',
                     'end'
-                    ])
+                   ])
     expect(cop.offenses).to be_empty
   end
 

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

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

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::DefWithParentheses do
+describe RuboCop::Cop::Style::DefWithParentheses do
   subject(:cop) { described_class.new }
 
   it 'reports an offense for def with empty parens' do

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::DeprecatedHashMethods do
+describe RuboCop::Cop::Style::DeprecatedHashMethods do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for has_key? with one arg' do

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

@@ -2,11 +2,11 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::Documentation do
+describe RuboCop::Cop::Style::Documentation do
 
   subject(:cop) { described_class.new(config) }
   let(:config) do
-    Rubocop::Config.new('CommentAnnotation' => {
+    RuboCop::Config.new('Style/CommentAnnotation' => {
                           'Keywords' => %w(TODO FIXME OPTIMIZE HACK REVIEW)
                         })
   end
@@ -72,6 +72,30 @@ describe Rubocop::Cop::Style::Documentation do
     expect(cop.offenses.size).to eq(1)
   end
 
+  it 'accepts non-empty class with annotation comment followed by other ' \
+     'comment' do
+    inspect_source(cop,
+                   ['# OPTIMIZE: Make this faster.',
+                    '# Class comment.',
+                    'class My_Class',
+                    '  TEST = 20',
+                    'end'
+                   ])
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts non-empty class with comment that ends with an annotation' do
+    inspect_source(cop,
+                   ['# Does fooing.',
+                    '# FIXME: Not yet implemented.',
+                    'class Foo',
+                    '  def initialize',
+                    '  end',
+                    'end'
+                   ])
+    expect(cop.offenses).to be_empty
+  end
+
   it 'accepts non-empty module with documentation' do
     inspect_source(cop,
                    ['# class comment',

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::DotPosition, :config do
+describe RuboCop::Cop::Style::DotPosition, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'Leading dots style' do

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

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

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

@@ -2,15 +2,12 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::EachWithObject do
+describe RuboCop::Cop::Style::EachWithObject do
   subject(:cop) { described_class.new }
 
   it 'finds inject and reduce with passed in and returned hash' do
     inspect_source(cop,
-                   ['[].inject({}) do |a, e|',
-                    '  a[e] = 1',
-                    '  a',
-                    'end',
+                   ['[].inject({}) { |a, e| a }',
                     '',
                     '[].reduce({}) do |a, e|',
                     '  a[e] = 1',
@@ -18,7 +15,7 @@ describe Rubocop::Cop::Style::EachWithObject do
                     '  a',
                     'end'])
     expect(cop.offenses.size).to eq(2)
-    expect(cop.offenses.map(&:line).sort).to eq([1, 6])
+    expect(cop.offenses.map(&:line).sort).to eq([1, 3])
     expect(cop.messages)
       .to eq(['Use `each_with_object` instead of `inject`.',
               'Use `each_with_object` instead of `reduce`.'])
@@ -32,7 +29,34 @@ describe Rubocop::Cop::Style::EachWithObject do
                     'end',
                     '',
                     '[].reduce({}) do |a, e|',
-                    '  a + e',
+                    '  my_method e, a',
+                    'end'])
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'ignores inject and reduce with empty body' do
+    inspect_source(cop,
+                   ['[].inject({}) do |a, e|',
+                    'end',
+                    '',
+                    '[].reduce({}) { |a, e| }'])
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'ignores inject and reduce with condition as body' do
+    inspect_source(cop,
+                   ['[].inject({}) do |a, e|',
+                    '  a = e if e',
+                    'end',
+                    '',
+                    '[].inject({}) do |a, e|',
+                    '  if e',
+                    '    a = e',
+                    '  end',
+                    'end',
+                    '',
+                    '[].reduce({}) do |a, e|',
+                    '  a = e ? e : 2',
                     'end'])
     expect(cop.offenses).to be_empty
   end

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

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

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::EmptyLinesAroundAccessModifier do
+describe RuboCop::Cop::Style::EmptyLinesAroundAccessModifier do
   subject(:cop) { described_class.new }
 
   %w(private protected public).each do |access_modifier|

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::EmptyLinesAroundBody do
+describe RuboCop::Cop::Style::EmptyLinesAroundBody do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for method body starting with a blank' do

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

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

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::EmptyLiteral do
+describe RuboCop::Cop::Style::EmptyLiteral do
   subject(:cop) { described_class.new }
 
   describe 'Empty Array' do

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::Encoding, :config do
+describe RuboCop::Cop::Style::Encoding, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'when_needed' do

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

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

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

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'tempfile'
 
-describe Rubocop::Cop::Style::EndOfLine do
+describe RuboCop::Cop::Style::EndOfLine do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for CR+LF' do
@@ -21,11 +21,21 @@ describe Rubocop::Cop::Style::EndOfLine do
     expect(cop.messages).to eq(['Carriage return character detected.'])
   end
 
+  shared_examples 'iso-8859-15' do
+    it 'can inspect non-UTF-8 encoded source with proper encoding comment' do
+      inspect_source_file(cop, ['# coding: ISO-8859-15\r',
+                                "# Euro symbol: \xa4\r"])
+      expect(cop.offenses.size).to eq(1)
+    end
+  end
+
   context 'when there are many lines ending with CR+LF' do
     it 'registers only one offense' do
       inspect_source_file(cop, ['x=0', '', 'y=1'].join("\r\n"))
       expect(cop.messages.size).to eq(1)
     end
+
+    include_examples 'iso-8859-15'
   end
 
   context 'when the default external encoding is US_ASCII' do
@@ -41,5 +51,7 @@ describe Rubocop::Cop::Style::EndOfLine do
                            'end'].join("\n"))
       expect(cop.offenses).to be_empty
     end
+
+    include_examples 'iso-8859-15'
   end
 end

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

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

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

@@ -2,11 +2,11 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::FileName do
+describe RuboCop::Cop::Style::FileName do
   subject(:cop) { described_class.new(config) }
 
   let(:config) do
-    Rubocop::Config.new(
+    RuboCop::Config.new(
       { 'AllCops' => { 'Include' => includes } },
       '/some/.rubocop.yml'
     )

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

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

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::For, :config do
+describe RuboCop::Cop::Style::For, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'when each is the enforced style' do

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

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

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::GlobalVars, :config do
+describe RuboCop::Cop::Style::GlobalVars, :config do
   cop_config = {
     'AllowedVariables' => ['$allowed']
   }

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::GuardClause, :config do
+describe RuboCop::Cop::Style::GuardClause, :config do
   let(:cop) { described_class.new(config) }
   let(:cop_config) { {} }
 

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

@@ -2,16 +2,18 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::HashSyntax, :config do
+describe RuboCop::Cop::Style::HashSyntax, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'configured to enforce ruby19 style' do
     let(:config) do
-      Rubocop::Config.new('HashSyntax' => {
+      RuboCop::Config.new('Style/HashSyntax' => {
                             'EnforcedStyle'   => 'ruby19',
                             'SupportedStyles' => %w(ruby19 hash_rockets)
                           },
-                          'SpaceAroundOperators' => { 'Enabled' => true })
+                          'Style/SpaceAroundOperators' => {
+                            'Enabled' => true
+                          })
     end
 
     it 'registers offense for hash rocket syntax when new is possible' do
@@ -81,11 +83,13 @@ describe Rubocop::Cop::Style::HashSyntax, :config do
 
     context 'with SpaceAroundOperators disabled' do
       let(:config) do
-        Rubocop::Config.new('HashSyntax' => {
+        RuboCop::Config.new('Style/HashSyntax' => {
                               'EnforcedStyle'   => 'ruby19',
                               'SupportedStyles' => %w(ruby19 hash_rockets)
                             },
-                            'SpaceAroundOperators' => { 'Enabled' => false })
+                            'Style/SpaceAroundOperators' => {
+                              'Enabled' => false
+                            })
       end
 
       it 'auto-corrects even if there is no space around =>' do

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

@@ -2,13 +2,13 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::IfUnlessModifier do
+describe RuboCop::Cop::Style::IfUnlessModifier 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 'registers an offense for multiline if that fits on one line' do
@@ -128,10 +128,10 @@ describe Rubocop::Cop::Style::IfUnlessModifier do
     context 'when the maximum line length is specified by the cop itself' do
       let(:config) do
         hash = {
-          'LineLength' => { 'Max' => 100 },
-          'IfUnlessModifier' => { 'MaxLineLength' => 80 }
+          'Style/LineLength' => { 'Max' => 100 },
+          'Style/IfUnlessModifier' => { 'MaxLineLength' => 80 }
         }
-        Rubocop::Config.new(hash)
+        RuboCop::Config.new(hash)
       end
 
       it "accepts multiline if that doesn't fit on one line" do