rubocop 0.16.0 → 0.17.0

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

@@ -72,7 +72,7 @@ describe Rubocop::Cop::Style::MultilineIfThen do
     inspect_source(cop, ['unless cond then',
                          'end'])
     expect(cop.messages).to eq(
-      ['Never use then for multi-line if/unless.'])
+      ['Never use then for multi-line unless.'])
   end
 
   it 'accepts multiline unless without then' do
@@ -83,7 +83,7 @@ describe Rubocop::Cop::Style::MultilineIfThen do
 
   it 'does not get confused by a postfix unless' do
     inspect_source(cop,
-                   ['two unless one',
+                   ['two unless one'
                    ])
     expect(cop.offences).to be_empty
   end

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

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::MultilineTernaryOperator do
+  subject(:cop) { described_class.new }
+
+  it 'registers offence for a multiline ternary operator expression' do
+    inspect_source(cop, ['a = cond ?',
+                         '  b : c'])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it 'accepts a single line ternary operator expression' do
+    inspect_source(cop, ['a = cond ? b : c'])
+    expect(cop.offences).to be_empty
+  end
+end

data/spec/rubocop/cop/style/{ternary_operator_spec.rb → nested_ternary_operator_spec.rb}

@@ -2,21 +2,6 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::MultilineTernaryOperator do
-  subject(:cop) { described_class.new }
-
-  it 'registers offence for a multiline ternary operator expression' do
-    inspect_source(cop, ['a = cond ?',
-                         '  b : c'])
-    expect(cop.offences.size).to eq(1)
-  end
-
-  it 'accepts a single line ternary operator expression' do
-    inspect_source(cop, ['a = cond ? b : c'])
-    expect(cop.offences).to be_empty
-  end
-end
-
 describe Rubocop::Cop::Style::NestedTernaryOperator do
   subject(:cop) { described_class.new }
 

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

@@ -9,11 +9,13 @@ describe Rubocop::Cop::Style::NumericLiterals, :config do
   it 'registers an offence for a long integer without underscores' do
     inspect_source(cop, ['a = 123456'])
     expect(cop.offences.size).to eq(1)
+    expect(cop.config_to_allow_offences).to eq('MinDigits' => 6)
   end
 
-  it 'registers an offence for an integer with misplaced' do
+  it 'registers an offence for an integer with misplaced underscore' do
     inspect_source(cop, ['a = 123_456_78_90_00'])
     expect(cop.offences.size).to eq(1)
+    expect(cop.config_to_allow_offences).to eq('Enabled' => false)
   end
 
   it 'accepts long numbers with underscore' do
@@ -44,4 +46,19 @@ describe Rubocop::Cop::Style::NumericLiterals, :config do
                          'c = 0xab11111111bb'])
     expect(cop.offences).to be_empty
   end
+
+  it 'autocorrects a long integer offence' do
+    corrected = autocorrect_source(cop, ['a = 123456'])
+    expect(corrected).to eq 'a = 123_456'
+  end
+
+  it 'autocorrects an integer with misplaced underscore' do
+    corrected = autocorrect_source(cop, ['a = 123_456_78_90_00'])
+    expect(corrected).to eq 'a = 123_456_789_000'
+  end
+
+  it 'autocorrects negative numbers' do
+    corrected = autocorrect_source(cop, ['a = -123456'])
+    expect(corrected).to eq 'a = -123_456'
+  end
 end

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

@@ -7,6 +7,7 @@ describe Rubocop::Cop::Style::OneLineConditional do
 
   it 'registers an offence for one line if/then/end' do
     inspect_source(cop, ['if cond then run else dont end'])
-    expect(cop.messages).to eq([cop.error_message])
+    expect(cop.messages).to eq(['Favor the ternary operator (?:)' \
+                                ' over if/then/else/end constructs.'])
   end
 end

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

@@ -15,6 +15,7 @@ describe Rubocop::Cop::Style::ParameterLists, :config do
     inspect_source(cop, ['def meth(a, b, c, d, e)',
                          'end'])
     expect(cop.offences.size).to eq(1)
+    expect(cop.config_to_allow_offences).to eq('Max' => 5)
   end
 
   it 'accepts a method def with 4 parameters' do

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

@@ -18,10 +18,14 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
                          'end',
                          'x += 1 if (x < 10)',
                          'x += 1 unless (x < 10)',
-                         'x += 1 while (x < 10)',
                          'x += 1 until (x < 10)',
+                         'x += 1 while (x < 10)'
                         ])
     expect(cop.offences.size).to eq(9)
+    expect(cop.messages.first)
+      .to eq("Don't use parentheses around the condition of an if.")
+    expect(cop.messages.last)
+      .to eq("Don't use parentheses around the condition of a while.")
   end
 
   it 'auto-corrects parentheses around condition' do
@@ -37,7 +41,7 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
                                          'x += 1 if (x < 10)',
                                          'x += 1 unless (x < 10)',
                                          'x += 1 while (x < 10)',
-                                         'x += 1 until (x < 10)',
+                                         'x += 1 until (x < 10)'
                                         ])
     expect(corrected).to eq ['if x > 10',
                              'elsif x < 3',
@@ -51,7 +55,7 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
                              'x += 1 if x < 10',
                              'x += 1 unless x < 10',
                              'x += 1 while x < 10',
-                             'x += 1 until x < 10',
+                             'x += 1 until x < 10'
                             ].join("\n")
   end
 
@@ -67,11 +71,16 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
                          'x += 1 if x < 10',
                          'x += 1 unless x < 10',
                          'x += 1 while x < 10',
-                         'x += 1 until x < 10',
+                         'x += 1 until x < 10'
                         ])
     expect(cop.offences).to be_empty
   end
 
+  it 'accepts parentheses around condition in a ternary' do
+    inspect_source(cop, '(a == 0) ? b : a')
+    expect(cop.offences).to be_empty
+  end
+
   it 'is not confused by leading parenthesis in subexpression' do
     inspect_source(cop, ['(a > b) && other ? one : two'])
     expect(cop.offences).to be_empty

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

@@ -11,6 +11,17 @@ describe Rubocop::Cop::Style::RaiseArgs, :config do
     it 'reports an offence for a raise with 2 args' do
       inspect_source(cop, ['raise RuntimeError, msg'])
       expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'exploded')
+    end
+
+    it 'reports an offence for correct + opposite' do
+      inspect_source(cop, ['if a',
+                           '  raise RuntimeError, msg',
+                           'else',
+                           '  raise Ex.new(msg)',
+                           'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'reports an offence for a raise with 3 args' do
@@ -35,6 +46,17 @@ describe Rubocop::Cop::Style::RaiseArgs, :config do
     it 'reports an offence for a raise with exception object' do
       inspect_source(cop, ['raise Ex.new(msg)'])
       expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'compact')
+    end
+
+    it 'reports an offence for opposite + correct' do
+      inspect_source(cop, ['if a',
+                           '  raise RuntimeError, msg',
+                           'else',
+                           '  raise Ex.new(msg)',
+                           'end'])
+      expect(cop.offences.size).to eq(1)
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'accepts exception constructor with more than 1 argument' do

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

@@ -92,7 +92,7 @@ describe Rubocop::Cop::Style::RedundantSelf do
   it 'accepts a self receiver used to distinguish from blockarg' do
     src = ['def requested_specs(&groups)',
            '  some_method(self.groups)',
-           'end',
+           'end'
           ]
     inspect_source(cop, src)
     expect(cop.offences).to be_empty
@@ -101,7 +101,7 @@ describe Rubocop::Cop::Style::RedundantSelf do
   it 'accepts a self receiver used to distinguish from argument' do
     src = ['def requested_specs(groups)',
            '  some_method(self.groups)',
-           'end',
+           'end'
           ]
     inspect_source(cop, src)
     expect(cop.offences).to be_empty
@@ -110,7 +110,7 @@ describe Rubocop::Cop::Style::RedundantSelf do
   it 'accepts a self receiver used to distinguish from argument' do
     src = ['def requested_specs(final = true)',
            '  something if self.final != final',
-           'end',
+           'end'
           ]
     inspect_source(cop, src)
     expect(cop.offences).to be_empty
@@ -123,7 +123,7 @@ describe Rubocop::Cop::Style::RedundantSelf do
            '    groups.map! { |g| g.to_sym }',
            '    specs_for(groups)',
            '  end',
-           'end',
+           'end'
           ]
     inspect_source(cop, src)
     expect(cop.offences).to be_empty

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

@@ -14,6 +14,7 @@ describe Rubocop::Cop::Style::RegexpLiteral, :config do
         expect(cop.messages)
           .to eq(['Use %r for regular expressions matching more ' +
                   "than 1 '/' character."] * 2)
+        expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 2)
       end
 
       it 'accepts zero or one slash in regexp' do
@@ -33,6 +34,7 @@ describe Rubocop::Cop::Style::RegexpLiteral, :config do
         expect(cop.messages)
           .to eq(['Use %r for regular expressions matching more ' +
                   "than 0 '/' characters."])
+        expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 1)
       end
 
       it 'accepts zero slashes in regexp' do
@@ -45,6 +47,7 @@ describe Rubocop::Cop::Style::RegexpLiteral, :config do
         expect(cop.messages)
           .to eq(['Use %r only for regular expressions matching more ' +
                   "than 0 '/' characters."])
+        expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 1)
       end
 
       it 'accepts regexp with one slash' do
@@ -67,6 +70,7 @@ describe Rubocop::Cop::Style::RegexpLiteral, :config do
         expect(cop.messages)
           .to eq(['Use %r only for regular expressions matching more ' +
                   "than 1 '/' character."] * 2)
+        expect(cop.config_to_allow_offences).to eq('MaxSlashes' => 2)
       end
 
       it 'accepts regexp with two or more slashes' do

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

@@ -9,16 +9,24 @@ describe Rubocop::Cop::Style::SpaceAfterColon do
     # TODO: There is double reporting of the last colon (also from
     # SpaceAroundOperators).
     inspect_source(cop, ['x = w ? {a:3}:4'])
-    expect(cop.messages).to eq(
-      ['Space missing after colon.'] * 2)
+    expect(cop.messages).to eq(['Space missing after colon.'] * 2)
+    expect(cop.highlights).to eq([':'] * 2)
   end
 
-  it 'allows the colons in symbols' do
+  it 'accepts colons in symbols' do
     inspect_source(cop, ['x = :a'])
     expect(cop.messages).to be_empty
   end
 
-  it 'allows colons in strings' do
+  if RUBY_VERSION >= '2.1'
+    it 'accepts colons denoting required keyword argument' do
+      inspect_source(cop, ['def initialize(table:, nodes:)',
+                           'end'])
+      expect(cop.messages).to be_empty
+    end
+  end
+
+  it 'accepts colons in strings' do
     inspect_source(cop, ["str << ':'"])
     expect(cop.messages).to be_empty
   end

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

@@ -10,7 +10,7 @@ describe Rubocop::Cop::Style::SpaceAfterMethodName do
                    ['def func (x)',
                     '  a',
                     'end'])
-    expect(cop.offences).to have(1).item
+    expect(cop.offences.size).to eq(1)
   end
 
   it 'registers an offence for defs with space before the parenthesis' do
@@ -18,7 +18,7 @@ describe Rubocop::Cop::Style::SpaceAfterMethodName do
                    ['def self.func (x)',
                     '  a',
                     'end'])
-    expect(cop.offences).to have(1).item
+    expect(cop.offences.size).to eq(1)
   end
 
   it 'accepts a def without arguments' do

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

@@ -7,8 +7,10 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
 
   subject(:cop) { described_class.new(config) }
   let(:config) do
+    merged = Rubocop::ConfigLoader
+      .default_configuration['SpaceAroundBlockBraces'].merge(cop_config)
     Rubocop::Config.new('Blocks' => { 'Enabled' => false },
-                        'SpaceAroundBlockBraces' => cop_config)
+                        'SpaceAroundBlockBraces' => merged)
   end
   let(:cop_config) do
     {
@@ -96,6 +98,23 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
     inspect_source(cop, ['each { puts}'])
     expect(cop.messages).to eq(['Space missing inside }.'])
     expect(cop.highlights).to eq(['}'])
+    expect(cop.config_to_allow_offences).to eq('Enabled' => false)
+  end
+
+  it 'registers offences for both braces without inner space' do
+    inspect_source(cop, ['a {}',
+                         'b { }',
+                         'each {puts}'])
+    expect(cop.messages).to eq(['Space inside empty braces detected.',
+                                'Space missing inside {.',
+                                'Space missing inside }.'])
+    expect(cop.highlights).to eq([' ', 'p', '}'])
+
+    # Both correct and incorrect code has been found in relation to
+    # EnforcedStyleForEmptyBraces, but that doesn't matter. EnforcedStyle can
+    # be changed to get rid of the EnforcedStyle offences.
+    expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
+                                               'no_space_inside_braces')
   end
 
   it 'auto-corrects missing space' do
@@ -190,6 +209,7 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
       inspect_source(cop, ['each { puts}'])
       expect(cop.messages).to eq(['Space inside { detected.'])
       expect(cop.highlights).to eq([' '])
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'registers an offence for right brace with inner space' do
@@ -198,6 +218,15 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
       expect(cop.highlights).to eq(['  '])
     end
 
+    it 'registers offences for both braces with inner space' do
+      inspect_source(cop, ['each { puts  }'])
+      expect(cop.messages).to eq(['Space inside { detected.',
+                                  'Space inside } detected.'])
+      expect(cop.highlights).to eq([' ', '  '])
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
+                                                 'space_inside_braces')
+    end
+
     it 'registers an offence for left brace without outer space' do
       inspect_source(cop, ['each{puts}'])
       expect(cop.messages).to eq(['Space missing to the left of {.'])

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

@@ -281,7 +281,7 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
 
   it 'registers an offence for various assignments without space' do
     inspect_source(cop, ['x||=0', 'y&&=0', 'z*=2',
-                         '@a=0', 'a,b=0', 'A=0', 'x[3]=0', '$A=0'])
+                         '@a=0', '@@a=0', 'a,b=0', 'A=0', 'x[3]=0', '$A=0'])
     expect(cop.messages)
       .to eq(["Surrounding space missing for operator '||='.",
               "Surrounding space missing for operator '&&='.",
@@ -290,6 +290,7 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
               "Surrounding space missing for operator '='.",
               "Surrounding space missing for operator '='.",
               "Surrounding space missing for operator '='.",
+              "Surrounding space missing for operator '='.",
               "Surrounding space missing for operator '='."])
   end
 

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

@@ -51,11 +51,20 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
   it 'registers an offence for hashes with no spaces if so configured' do
     inspect_source(cop,
                    ['h = {a: 1, b: 2}',
-                    'h = {a => 1 }'])
+                    'h = {a => 1}'])
     expect(cop.messages).to eq(['Space inside { missing.',
                                 'Space inside } missing.',
-                                'Space inside { missing.'])
-    expect(cop.highlights).to eq(['{', '}', '{'])
+                                'Space inside { missing.',
+                                'Space inside } missing.'])
+    expect(cop.highlights).to eq(['{', '}', '{', '}'])
+    expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'no_space')
+  end
+
+  it 'registers an offence for correct + opposite' do
+    inspect_source(cop,
+                   ['h = { a: 1}'])
+    expect(cop.messages).to eq(['Space inside } missing.'])
+    expect(cop.config_to_allow_offences).to eq('Enabled' => false)
   end
 
   it 'auto-corrects missing space' do
@@ -74,6 +83,14 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
       expect(cop.messages).to eq(['Space inside { detected.',
                                   'Space inside } detected.'])
       expect(cop.highlights).to eq([' ', ' '])
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'space')
+    end
+
+    it 'registers an offence for opposite + correct' do
+      inspect_source(cop,
+                     ['h = {a: 1 }'])
+      expect(cop.messages).to eq(['Space inside } detected.'])
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'auto-corrects unwanted space' do

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

@@ -21,6 +21,17 @@ describe Rubocop::Cop::Style::StringLiterals, :config do
       expect(cop.messages)
         .to eq(["Prefer single-quoted strings when you don't need " +
                 'string interpolation or special symbols.'] * 4)
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
+                                                 'double_quotes')
+    end
+
+    it 'registers offence for correct + opposite' do
+      inspect_source(cop, ['s = "abc"',
+                           "x = 'abc'"])
+      expect(cop.messages)
+        .to eq(["Prefer single-quoted strings when you don't need " +
+                'string interpolation or special symbols.'])
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'accepts single quotes' do
@@ -33,6 +44,11 @@ describe Rubocop::Cop::Style::StringLiterals, :config do
       expect(cop.offences).to be_empty
     end
 
+    it 'accepts % quotes' do
+      inspect_source(cop, ['a = %(x)'])
+      expect(cop.offences).to be_empty
+    end
+
     it 'accepts heredocs' do
       inspect_source(cop,
                      ['execute <<-SQL',
@@ -116,6 +132,18 @@ describe Rubocop::Cop::Style::StringLiterals, :config do
         .to eq(['Prefer double-quoted strings unless you need ' +
                 'single quotes to avoid extra backslashes for ' +
                 'escaping.'])
+      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' =>
+                                                 'single_quotes')
+    end
+
+    it 'registers offence for opposite + correct' do
+      inspect_source(cop, ['s = "abc"',
+                           "x = 'abc'"])
+      expect(cop.messages)
+        .to eq(['Prefer double-quoted strings unless you need ' +
+                'single quotes to avoid extra backslashes for ' +
+                'escaping.'])
+      expect(cop.config_to_allow_offences).to eq('Enabled' => false)
     end
 
     it 'accepts double quotes' do
@@ -128,6 +156,11 @@ describe Rubocop::Cop::Style::StringLiterals, :config do
       expect(cop.offences).to be_empty
     end
 
+    it 'accepts % quotes' do
+      inspect_source(cop, ['a = %(x)'])
+      expect(cop.offences).to be_empty
+    end
+
     it 'accepts heredocs' do
       inspect_source(cop,
                      ['execute <<-SQL',