rubocop 0.28.0 → 0.29.0

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

@@ -6,7 +6,7 @@ describe RuboCop::Cop::Style::CaseEquality do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for ===' do
-    inspect_source(cop, ['Array === var'])
+    inspect_source(cop, 'Array === var')
     expect(cop.offenses.size).to eq(1)
     expect(cop.highlights).to eq(['==='])
   end

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

@@ -6,22 +6,22 @@ describe RuboCop::Cop::Style::CharacterLiteral do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for character literals' do
-    inspect_source(cop, ['x = ?x'])
+    inspect_source(cop, 'x = ?x')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for literals like \n' do
-    inspect_source(cop, ['x = ?\n'])
+    inspect_source(cop, 'x = ?\n')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts literals like ?\C-\M-d' do
-    inspect_source(cop, ['x = ?\C-\M-d'])
+    inspect_source(cop, 'x = ?\C-\M-d')
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts ? in a %w literal' do
-    inspect_source(cop, ['%w{? A}'])
+    inspect_source(cop, '%w{? A}')
     expect(cop.offenses).to be_empty
   end
 

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

@@ -9,7 +9,8 @@ describe RuboCop::Cop::Style::ClassAndModuleChildren, :config do
     let(:cop_config) { { 'EnforcedStyle' => 'nested' } }
 
     it 'registers an offense for not nested classes' do
-      inspect_source(cop, ['class FooClass::BarClass', 'end'])
+      inspect_source(cop, ['class FooClass::BarClass',
+                           'end'])
 
       expect(cop.offenses.size).to eq 1
       expect(cop.messages).to eq [
@@ -19,7 +20,8 @@ describe RuboCop::Cop::Style::ClassAndModuleChildren, :config do
     end
 
     it 'registers an offense for not nested modules' do
-      inspect_source(cop, ['module FooModule::BarModule', 'end'])
+      inspect_source(cop, ['module FooModule::BarModule',
+                           'end'])
 
       expect(cop.offenses.size).to eq 1
       expect(cop.messages).to eq [

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

@@ -41,6 +41,18 @@ describe RuboCop::Cop::Style::ClassMethods do
     expect(cop.offenses).to be_empty
   end
 
+  it 'does not register an offense for other top-level singleton methods' do
+    inspect_source(cop,
+                   ['class Test',
+                    '  X = Something.new',
+                    '',
+                    '  def X.some_method',
+                    '    do_something',
+                    '  end',
+                    'end'])
+    expect(cop.offenses).to be_empty
+  end
+
   it 'does not register an offense outside class/module bodies' do
     inspect_source(cop,
                    ['def Test.some_method',

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

@@ -6,14 +6,14 @@ describe RuboCop::Cop::Style::ClassVars do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for class variable declaration' do
-    inspect_source(cop, ['class TestClass; @@test = 10; end'])
+    inspect_source(cop, 'class TestClass; @@test = 10; end')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Replace class var @@test with a class instance var.'])
   end
 
   it 'does not register an offense for class variable usage' do
-    inspect_source(cop, ['@@test.test(20)'])
+    inspect_source(cop, '@@test.test(20)')
     expect(cop.offenses).to be_empty
   end
 end

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

@@ -17,26 +17,26 @@ describe RuboCop::Cop::Style::CollectionMethods, :config do
 
   cop_config['PreferredMethods'].each do |method, preferred_method|
     it "registers an offense for #{method} with block" do
-      inspect_source(cop, ["[1, 2, 3].#{method} { |e| e + 1 }"])
+      inspect_source(cop, "[1, 2, 3].#{method} { |e| e + 1 }")
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Prefer `#{preferred_method}` over `#{method}`."])
     end
 
     it "registers an offense for #{method} with proc param" do
-      inspect_source(cop, ["[1, 2, 3].#{method}(&:test)"])
+      inspect_source(cop, "[1, 2, 3].#{method}(&:test)")
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Prefer `#{preferred_method}` over `#{method}`."])
     end
 
     it "accepts #{method} with more than 1 param" do
-      inspect_source(cop, ["[1, 2, 3].#{method}(other, &:test)"])
+      inspect_source(cop, "[1, 2, 3].#{method}(other, &:test)")
       expect(cop.offenses).to be_empty
     end
 
     it "accepts #{method} without a block" do
-      inspect_source(cop, ["[1, 2, 3].#{method}"])
+      inspect_source(cop, "[1, 2, 3].#{method}")
       expect(cop.offenses).to be_empty
     end
 

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

@@ -7,49 +7,49 @@ describe RuboCop::Cop::Style::ColonMethodCall do
 
   it 'registers an offense for instance method call' do
     inspect_source(cop,
-                   ['test::method_name'])
+                   'test::method_name')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for instance method call with arg' do
     inspect_source(cop,
-                   ['test::method_name(arg)'])
+                   'test::method_name(arg)')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for class method call' do
     inspect_source(cop,
-                   ['Class::method_name'])
+                   'Class::method_name')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for class method call with arg' do
     inspect_source(cop,
-                   ['Class::method_name(arg, arg2)'])
+                   'Class::method_name(arg, arg2)')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'does not register an offense for constant access' do
     inspect_source(cop,
-                   ['Tip::Top::SOME_CONST'])
+                   'Tip::Top::SOME_CONST')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for nested class' do
     inspect_source(cop,
-                   ['Tip::Top.some_method'])
+                   'Tip::Top.some_method')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense for op methods' do
     inspect_source(cop,
-                   ['Tip::Top.some_method[3]'])
+                   'Tip::Top.some_method[3]')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not register an offense when for constructor methods' do
     inspect_source(cop,
-                   ['Tip::Top(some_arg)'])
+                   'Tip::Top(some_arg)')
     expect(cop.offenses).to be_empty
   end
 

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

@@ -9,7 +9,7 @@ describe RuboCop::Cop::Style::CommentAnnotation, :config do
   end
 
   it 'registers an offense for a missing colon' do
-    inspect_source(cop, ['# TODO make better'])
+    inspect_source(cop, '# TODO make better')
     expect(cop.offenses.size).to eq(1)
   end
 
@@ -17,7 +17,7 @@ describe RuboCop::Cop::Style::CommentAnnotation, :config do
     let(:cop_config) { { 'Keywords' => %w(ISSUE) } }
 
     it 'registers an offense for a missing colon after the word' do
-      inspect_source(cop, ['# ISSUE wrong order'])
+      inspect_source(cop, '# ISSUE wrong order')
       expect(cop.offenses.size).to eq(1)
     end
   end
@@ -27,7 +27,7 @@ describe RuboCop::Cop::Style::CommentAnnotation, :config do
     let(:output) { StringIO.new }
 
     it 'marks the annotation keyword' do
-      inspect_source(cop, ['# TODO:make better'])
+      inspect_source(cop, '# TODO:make better')
       formatter.report_file('t', cop.offenses)
       expect(output.string).to eq(["t:1:3: C: #{described_class::MSG}",
                                    '# TODO:make better',
@@ -37,32 +37,32 @@ describe RuboCop::Cop::Style::CommentAnnotation, :config do
   end
 
   it 'registers an offense for lower case' do
-    inspect_source(cop, ['# fixme: does not work'])
+    inspect_source(cop, '# fixme: does not work')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for capitalized annotation keyword' do
-    inspect_source(cop, ['# Optimize: does not work'])
+    inspect_source(cop, '# Optimize: does not work')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers an offense for upper case with colon but no note' do
-    inspect_source(cop, ['# HACK:'])
+    inspect_source(cop, '# HACK:')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts upper case keyword with colon, space and note' do
-    inspect_source(cop, ['# REVIEW: not sure about this'])
+    inspect_source(cop, '# REVIEW: not sure about this')
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts upper case keyword alone' do
-    inspect_source(cop, ['# OPTIMIZE'])
+    inspect_source(cop, '# OPTIMIZE')
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts a comment that is obviously a code example' do
-    inspect_source(cop, ['# Todo.destroy(1)'])
+    inspect_source(cop, '# Todo.destroy(1)')
     expect(cop.offenses).to be_empty
   end
 
@@ -79,7 +79,7 @@ describe RuboCop::Cop::Style::CommentAnnotation, :config do
     end
 
     it 'accepts the word without colon' do
-      inspect_source(cop, ['# TODO make better'])
+      inspect_source(cop, '# TODO make better')
       expect(cop.offenses).to be_empty
     end
   end

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

@@ -7,37 +7,37 @@ describe RuboCop::Cop::Style::ConstantName do
 
   it 'registers an offense for camel case in const name' do
     inspect_source(cop,
-                   ['TopCase = 5'])
+                   'TopCase = 5')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'registers offenses for camel case in multiple const assignment' do
     inspect_source(cop,
-                   ['TopCase, Test2, TEST_3 = 5, 6, 7'])
+                   'TopCase, Test2, TEST_3 = 5, 6, 7')
     expect(cop.offenses.size).to eq(2)
   end
 
   it 'registers an offense for snake case in const name' do
     inspect_source(cop,
-                   ['TOP_test = 5'])
+                   'TOP_test = 5')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'allows screaming snake case in const name' do
     inspect_source(cop,
-                   ['TOP_TEST = 5'])
+                   'TOP_TEST = 5')
     expect(cop.offenses).to be_empty
   end
 
   it 'allows screaming snake case in multiple const assignment' do
     inspect_source(cop,
-                   ['TOP_TEST, TEST_2 = 5, 6'])
+                   'TOP_TEST, TEST_2 = 5, 6')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not check names if rhs is a method call' do
     inspect_source(cop,
-                   ['AnythingGoes = test'])
+                   'AnythingGoes = test')
     expect(cop.offenses).to be_empty
   end
 
@@ -52,7 +52,7 @@ describe RuboCop::Cop::Style::ConstantName do
 
   it 'does not check if rhs is another constant' do
     inspect_source(cop,
-                   ['Parser::CurrentRuby = Parser::Ruby20'])
+                   'Parser::CurrentRuby = Parser::Ruby20')
     expect(cop.offenses).to be_empty
   end
 

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

@@ -27,7 +27,7 @@ describe RuboCop::Cop::Style::DefWithParentheses do
   end
 
   it 'accepts empty parentheses in one liners' do
-    src = ["def to_s() join '/' end"]
+    src = "def to_s() join '/' end"
     inspect_source(cop, src)
     expect(cop.offenses).to be_empty
   end

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

@@ -7,7 +7,7 @@ describe RuboCop::Cop::Style::DeprecatedHashMethods do
 
   it 'registers an offense for has_key? with one arg' do
     inspect_source(cop,
-                   ['o.has_key?(o)'])
+                   'o.has_key?(o)')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['`Hash#has_key?` is deprecated in favor of `Hash#key?`.'])
@@ -15,13 +15,13 @@ describe RuboCop::Cop::Style::DeprecatedHashMethods do
 
   it 'accepts has_key? with no args' do
     inspect_source(cop,
-                   ['o.has_key?'])
+                   'o.has_key?')
     expect(cop.offenses).to be_empty
   end
 
   it 'registers an offense for has_value? with one arg' do
     inspect_source(cop,
-                   ['o.has_value?(o)'])
+                   'o.has_value?(o)')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['`Hash#has_value?` is deprecated in favor of `Hash#value?`.'])
@@ -29,7 +29,7 @@ describe RuboCop::Cop::Style::DeprecatedHashMethods do
 
   it 'accepts has_value? with no args' do
     inspect_source(cop,
-                   ['o.has_value?'])
+                   'o.has_value?')
     expect(cop.offenses).to be_empty
   end
 

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

@@ -32,17 +32,18 @@ describe RuboCop::Cop::Style::DotPosition, :config do
     end
 
     it 'does not err on method call with no dots' do
-      inspect_source(cop, ['puts something'])
+      inspect_source(cop, 'puts something')
       expect(cop.offenses).to be_empty
     end
 
     it 'does not err on method call without a method name' do
-      inspect_source(cop, ['l.', '(1)'])
+      inspect_source(cop, ['l.',
+                           '(1)'])
       expect(cop.offenses.size).to eq(1)
     end
 
     it 'does not err on method call on same line' do
-      inspect_source(cop, ['something.method_name'])
+      inspect_source(cop, 'something.method_name')
       expect(cop.offenses).to be_empty
     end
 
@@ -92,17 +93,18 @@ describe RuboCop::Cop::Style::DotPosition, :config do
     end
 
     it 'does not err on method call with no dots' do
-      inspect_source(cop, ['puts something'])
+      inspect_source(cop, 'puts something')
       expect(cop.offenses).to be_empty
     end
 
     it 'does not err on method call without a method name' do
-      inspect_source(cop, ['l', '.(1)'])
+      inspect_source(cop, ['l',
+                           '.(1)'])
       expect(cop.offenses.size).to eq(1)
     end
 
     it 'does not err on method call on same line' do
-      inspect_source(cop, ['something.method_name'])
+      inspect_source(cop, 'something.method_name')
       expect(cop.offenses).to be_empty
     end
 

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

@@ -62,12 +62,12 @@ describe RuboCop::Cop::Style::EachWithObject do
   end
 
   it 'ignores inject and reduce passed in symbol' do
-    inspect_source(cop, ['[].inject(:+)', '[].reduce(:+)'])
+    inspect_source(cop, '[].inject(:+)', '[].reduce(:+)')
     expect(cop.offenses).to be_empty
   end
 
   it 'does not blow up for reduce with no arguments' do
-    inspect_source(cop, ['[1, 2, 3].inject { |a, e| a + e }'])
+    inspect_source(cop, '[1, 2, 3].inject { |a, e| a + e }')
     expect(cop.offenses).to be_empty
   end
 end

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

@@ -12,8 +12,7 @@ describe RuboCop::Cop::Style::ElseAlignment do
   end
 
   it 'accepts a ternary if' do
-    inspect_source(cop,
-                   ['cond ? func1 : func2'])
+    inspect_source(cop, 'cond ? func1 : func2')
     expect(cop.offenses).to be_empty
   end
 
@@ -64,8 +63,7 @@ describe RuboCop::Cop::Style::ElseAlignment do
     end
 
     it 'accepts a one line if statement' do
-      inspect_source(cop,
-                     ['if cond then func1 else func2 end'])
+      inspect_source(cop, 'if cond then func1 else func2 end')
       expect(cop.offenses).to be_empty
     end
 

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

@@ -32,6 +32,38 @@ describe RuboCop::Cop::Style::EmptyLinesAroundAccessModifier do
         .to eq(["Keep a blank line before and after `#{access_modifier}`."])
     end
 
+    it "ignores #{access_modifier} inside a method call" do
+      inspect_source(cop,
+                     ['class Test',
+                      '  def #{access_modifier}?',
+                      "    #{access_modifier}",
+                      '  end',
+                      'end'])
+      expect(cop.offenses.size).to eq(0)
+    end
+
+    it "ignores #{access_modifier} deep inside a method call" do
+      inspect_source(cop,
+                     ['class Test',
+                      "  def #{access_modifier}?",
+                      '    if true',
+                      "      #{access_modifier}",
+                      '    end',
+                      '  end',
+                      'end'])
+      expect(cop.offenses.size).to eq(0)
+    end
+
+    it "ignores #{access_modifier} with a right-hand-side condition" do
+      inspect_source(cop,
+                     ['class Test',
+                      "  def #{access_modifier}?",
+                      "    #{access_modifier} if true",
+                      '  end',
+                      'end'])
+      expect(cop.offenses.size).to eq(0)
+    end
+
     it "autocorrects blank line before #{access_modifier}" do
       corrected = autocorrect_source(cop,
                                      ['class Test',
@@ -76,6 +108,52 @@ describe RuboCop::Cop::Style::EmptyLinesAroundAccessModifier do
       expect(cop.offenses).to be_empty
     end
 
+    context 'at the beginning of block' do
+      context 'for blocks defined with do' do
+        it 'accepts missing blank line' do
+          inspect_source(cop,
+                         ['included do',
+                          "  #{access_modifier}",
+                          '',
+                          '  def test; end',
+                          'end'])
+          expect(cop.offenses).to be_empty
+        end
+
+        it 'accepts missing blank line with arguments' do
+          inspect_source(cop,
+                         ['included do |foo|',
+                          "  #{access_modifier}",
+                          '',
+                          '  def test; end',
+                          'end'])
+          expect(cop.offenses).to be_empty
+        end
+      end
+
+      context 'for blocks defined with {}' do
+        it 'accepts missing blank line' do
+          inspect_source(cop,
+                         ['included {',
+                          "  #{access_modifier}",
+                          '',
+                          '  def test; end',
+                          '}'])
+          expect(cop.offenses).to be_empty
+        end
+
+        it 'accepts missing blank line with arguments' do
+          inspect_source(cop,
+                         ['included { |foo|',
+                          "  #{access_modifier}",
+                          '',
+                          '  def test; end',
+                          '}'])
+          expect(cop.offenses).to be_empty
+        end
+      end
+    end
+
     it 'accepts missing blank line when at the end of block' do
       inspect_source(cop,
                      ['class Test',