rubocop 0.18.1 → 0.19.0

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

@@ -0,0 +1,72 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+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)
+  end
+  let(:cop_config) { { 'EnforcedStyle' => 'space' } }
+
+  context 'when EnforcedStyle is space' do
+    it 'accepts braces surrounded by spaces' do
+      inspect_source(cop, ['each { puts }'])
+      expect(cop.messages).to be_empty
+      expect(cop.highlights).to be_empty
+    end
+
+    it 'registers an offense for left brace without outer space' do
+      inspect_source(cop, ['each{ puts }'])
+      expect(cop.messages).to eq(['Space missing to the left of {.'])
+      expect(cop.highlights).to eq(['{'])
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'no_space')
+    end
+
+    it 'registers an offense for opposite + correct style' do
+      inspect_source(cop,
+                     ['each{ puts }',
+                      'each { puts }'])
+      expect(cop.messages).to eq(['Space missing to the left of {.'])
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
+    end
+
+    it 'auto-corrects missing space' do
+      new_source = autocorrect_source(cop, 'each{}')
+      expect(new_source).to eq('each {}')
+    end
+  end
+
+  context 'when EnforcedStyle is no_space' do
+    let(:cop_config) { { 'EnforcedStyle' => 'no_space' } }
+
+    it 'registers an offense for braces surrounded by spaces' do
+      inspect_source(cop, ['each { puts }'])
+      expect(cop.messages).to eq(['Space detected to the left of {.'])
+      expect(cop.highlights).to eq([' '])
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'space')
+    end
+
+    it 'registers an offense for correct + opposite style' do
+      inspect_source(cop,
+                     ['each{ puts }',
+                      'each { puts }'])
+      expect(cop.messages).to eq(['Space detected to the left of {.'])
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
+    end
+
+    it 'auto-corrects unwanted space' do
+      new_source = autocorrect_source(cop, 'each {}')
+      expect(new_source).to eq('each{}')
+    end
+
+    it 'accepts left brace without outer space' do
+      inspect_source(cop, ['each{ puts }'])
+      expect(cop.messages).to be_empty
+      expect(cop.highlights).to be_empty
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::SpaceBeforeModifierKeyword do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for missing space before if/unless' do
+  it 'registers an offense for missing space before if/unless' do
     inspect_source(cop, ['(a = 3)if a == 2',
                          'a = "test"if a == 2',
                          'a = 42unless a == 2',
@@ -14,7 +14,7 @@ describe Rubocop::Cop::Style::SpaceBeforeModifierKeyword do
     expect(cop.highlights).to eq([')', '"', '2', ']', '}'])
   end
 
-  it 'registers an offence for missing space before while/until' do
+  it 'registers an offense for missing space before while/until' do
     inspect_source(cop, ['(a = 3)while b',
                          'a = "test"until b',
                          'a = 42while b',
@@ -28,7 +28,7 @@ describe Rubocop::Cop::Style::SpaceBeforeModifierKeyword do
                          'a = "test" unless b',
                          'a = 42 while b',
                          'a = [1,2,3] until b'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts elsif at beginning of line' do
@@ -42,7 +42,7 @@ describe Rubocop::Cop::Style::SpaceBeforeModifierKeyword do
 
   it 'does not crash on ternary conditionals' do
     inspect_source(cop, 'a ? b : c')
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'auto-corrects missing space' do

data/spec/rubocop/cop/style/{space_around_block_braces_spec.rb → space_inside_block_braces_spec.rb}

@@ -2,19 +2,19 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
-  SUPPORTED_STYLES = %w(space_inside_braces no_space_inside_braces)
+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['SpaceAroundBlockBraces'].merge(cop_config)
+      .default_configuration['SpaceInsideBlockBraces'].merge(cop_config)
     Rubocop::Config.new('Blocks' => { 'Enabled' => false },
-                        'SpaceAroundBlockBraces' => merged)
+                        'SpaceInsideBlockBraces' => merged)
   end
   let(:cop_config) do
     {
-      'EnforcedStyle' => 'space_inside_braces',
+      'EnforcedStyle' => 'space',
       'SupportedStyles' => SUPPORTED_STYLES,
       'SpaceBeforeBlockParameters' => true
     }
@@ -34,7 +34,7 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
       expect(cop.messages).to be_empty
     end
 
-    it 'registers an offence for empty braces with space inside' do
+    it 'registers an offense for empty braces with space inside' do
       inspect_source(cop, ['each { }'])
       expect(cop.messages).to eq(['Space inside empty braces detected.'])
       expect(cop.highlights).to eq([' '])
@@ -64,7 +64,7 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
       expect(cop.messages).to be_empty
     end
 
-    it 'registers an offence for empty braces with no space inside' do
+    it 'registers an offense for empty braces with no space inside' do
       inspect_source(cop, ['each {}'])
       expect(cop.messages).to eq(['Space missing inside empty braces.'])
       expect(cop.highlights).to eq(['{}'])
@@ -82,26 +82,25 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
     expect(cop.highlights).to be_empty
   end
 
-  it 'registers an offence for left brace without outer space' do
+  it 'accepts left brace without outer space' do
     inspect_source(cop, ['each{ puts }'])
-    expect(cop.messages).to eq(['Space missing to the left of {.'])
-    expect(cop.highlights).to eq(['{'])
+    expect(cop.highlights).to be_empty
   end
 
-  it 'registers an offence for left brace without inner space' do
+  it 'registers an offense for left brace without inner space' do
     inspect_source(cop, ['each {puts }'])
     expect(cop.messages).to eq(['Space missing inside {.'])
     expect(cop.highlights).to eq(['p'])
   end
 
-  it 'registers an offence for right brace without inner space' do
+  it 'registers an offense for right brace without inner space' 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)
+    expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
   end
 
-  it 'registers offences for both braces without inner space' do
+  it 'registers offenses for both braces without inner space' do
     inspect_source(cop, ['a {}',
                          'b { }',
                          'each {puts}'])
@@ -112,9 +111,9 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
 
     # 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')
+    # be changed to get rid of the EnforcedStyle offenses.
+    expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' =>
+                                               'no_space')
   end
 
   it 'auto-corrects missing space' do
@@ -129,32 +128,32 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
       expect(cop.highlights).to be_empty
     end
 
-    it 'registers an offence for left brace without inner space' do
+    it 'registers an offense for left brace without inner space' do
       inspect_source(cop, ['each {|x| puts }'])
       expect(cop.messages).to eq(['Space between { and | missing.'])
       expect(cop.highlights).to eq(['{|'])
     end
 
     it 'auto-corrects missing space' do
-      new_source = autocorrect_source(cop, 'each{|x| puts }')
+      new_source = autocorrect_source(cop, 'each {|x| puts }')
       expect(new_source).to eq('each { |x| puts }')
     end
 
     context 'and Blocks cop enabled' do
       let(:config) do
         Rubocop::Config.new('Blocks'                 => { 'Enabled' => true },
-                            'SpaceAroundBlockBraces' => cop_config)
+                            'SpaceInsideBlockBraces' => cop_config)
       end
 
       it 'does auto-correction for single-line blocks' do
-        new_source = autocorrect_source(cop, 'each{|x| puts}')
+        new_source = autocorrect_source(cop, 'each {|x| puts}')
         expect(new_source).to eq('each { |x| puts }')
       end
 
       it 'does not do auto-correction for multi-line blocks' do
         # {} will be changed to do..end by the Blocks cop, and then this cop is
         # not relevant anymore.
-        old_source = ['each{|x|',
+        old_source = ['each {|x|',
                       '  puts',
                       '}']
         new_source = autocorrect_source(cop, old_source)
@@ -165,13 +164,13 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
     context 'and space before block parameters not allowed' do
       let(:cop_config) do
         {
-          'EnforcedStyle'              => 'space_inside_braces',
+          'EnforcedStyle'              => 'space',
           'SupportedStyles'            => SUPPORTED_STYLES,
           'SpaceBeforeBlockParameters' => false
         }
       end
 
-      it 'registers an offence for left brace with inner space' do
+      it 'registers an offense for left brace with inner space' do
         inspect_source(cop, ['each { |x| puts }'])
         expect(cop.messages).to eq(['Space between { and | detected.'])
         expect(cop.highlights).to eq([' '])
@@ -190,10 +189,10 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
     end
   end
 
-  context 'configured with no_space_inside_braces' do
+  context 'configured with no_space' do
     let(:cop_config) do
       {
-        'EnforcedStyle'              => 'no_space_inside_braces',
+        'EnforcedStyle'              => 'no_space',
         'SupportedStyles'            => SUPPORTED_STYLES,
         'SpaceBeforeBlockParameters' => true
       }
@@ -205,37 +204,36 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
       expect(cop.highlights).to be_empty
     end
 
-    it 'registers an offence for left brace with inner space' do
+    it 'registers an offense for left brace with inner space' 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)
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
-    it 'registers an offence for right brace with inner space' do
+    it 'registers an offense for right brace with inner space' do
       inspect_source(cop, ['each {puts  }'])
       expect(cop.messages).to eq(['Space inside } detected.'])
       expect(cop.highlights).to eq(['  '])
     end
 
-    it 'registers offences for both braces with inner space' do
+    it 'registers offenses 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')
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' =>
+                                                 'space')
     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 {.'])
-      expect(cop.highlights).to eq(['{'])
+    it 'accepts left brace without outer space' do
+      inspect_source(cop, ['each {puts}'])
+      expect(cop.highlights).to be_empty
     end
 
-    it 'auto-corrects missing space' do
+    it 'auto-corrects unwanted space' do
       new_source = autocorrect_source(cop, 'each{ puts }')
-      expect(new_source).to eq('each {puts}')
+      expect(new_source).to eq('each{puts}')
     end
 
     context 'with passed in parameters' do
@@ -246,7 +244,7 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
           expect(cop.highlights).to eq([])
         end
 
-        it 'registers an offence for left brace without inner space' do
+        it 'registers an offense for left brace without inner space' do
           inspect_source(cop, ['each {|x| puts}'])
           expect(cop.messages).to eq(['Space between { and | missing.'])
           expect(cop.highlights).to eq(['{|'])
@@ -261,13 +259,13 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces do
       context 'and space before block parameters not allowed' do
         let(:cop_config) do
           {
-            'EnforcedStyle'              => 'no_space_inside_braces',
+            'EnforcedStyle'              => 'no_space',
             'SupportedStyles'            => SUPPORTED_STYLES,
             'SpaceBeforeBlockParameters' => false
           }
         end
 
-        it 'registers an offence for left brace with inner space' do
+        it 'registers an offense for left brace with inner space' do
           inspect_source(cop, ['each { |x| puts}'])
           expect(cop.messages).to eq(['Space between { and | detected.'])
           expect(cop.highlights).to eq([' '])

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::SpaceInsideBrackets do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for an array literal with spaces inside' do
+  it 'registers an offense for an array literal with spaces inside' do
     inspect_source(cop, ['a = [1, 2 ]',
                          'b = [ 1, 2]'])
     expect(cop.messages).to eq(

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

@@ -14,7 +14,7 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
       expect(cop.messages).to be_empty
     end
 
-    it 'registers an offence for empty braces with space inside' do
+    it 'registers an offense for empty braces with space inside' do
       inspect_source(cop, ['h = { }'])
       expect(cop.messages)
         .to eq(['Space inside empty hash literal braces detected.'])
@@ -35,7 +35,7 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
       expect(cop.messages).to be_empty
     end
 
-    it 'registers an offence for empty braces with no space inside' do
+    it 'registers an offense for empty braces with no space inside' do
       inspect_source(cop, ['h = {}'])
       expect(cop.messages)
         .to eq(['Space inside empty hash literal braces missing.'])
@@ -48,7 +48,7 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
     end
   end
 
-  it 'registers an offence for hashes with no spaces if so configured' do
+  it 'registers an offense for hashes with no spaces if so configured' do
     inspect_source(cop,
                    ['h = {a: 1, b: 2}',
                     'h = {a => 1}'])
@@ -57,14 +57,14 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
                                 'Space inside { missing.',
                                 'Space inside } missing.'])
     expect(cop.highlights).to eq(['{', '}', '{', '}'])
-    expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'no_space')
+    expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'no_space')
   end
 
-  it 'registers an offence for correct + opposite' do
+  it 'registers an offense 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)
+    expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
   end
 
   it 'auto-corrects missing space' do
@@ -77,20 +77,20 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
   context 'when EnforcedStyle is no_space' do
     let(:cop_config) { { 'EnforcedStyle' => 'no_space' } }
 
-    it 'registers an offence for hashes with spaces' do
+    it 'registers an offense for hashes with spaces' do
       inspect_source(cop,
                      ['h = { a: 1, b: 2 }'])
       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')
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'space')
     end
 
-    it 'registers an offence for opposite + correct' do
+    it 'registers an offense 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)
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
     it 'auto-corrects unwanted space' do
@@ -104,7 +104,7 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
       inspect_source(cop,
                      ['h = {a: 1, b: 2}',
                       'h = {a => 1}'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'accepts multiline hashes for no space' do
@@ -113,7 +113,7 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
                       '      a: 1,',
                       '      b: 2,',
                       '}'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
@@ -121,18 +121,18 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
     inspect_source(cop,
                    ['h = { a: 1, b: 2 }',
                     'h = { a => 1 }'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts hash literals with no braces' do
     inspect_source(cop, ['x(a: b.c)'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'can handle interpolation in a braceless hash literal' do
     # A tricky special case where the closing brace of the
     # interpolation risks getting confused for a hash literal brace.
     inspect_source(cop, ['f(get: "#{x}")'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::SpaceInsideParens do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for spaces inside parens' do
+  it 'registers an offense for spaces inside parens' do
     inspect_source(cop, ['f( 3)',
                          'g(3 )'])
     expect(cop.messages).to eq(