rubocop 0.18.1 → 0.19.0

data/spec/rubocop/cop/lint/handle_exceptions_spec.rb

@@ -5,19 +5,19 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::HandleExceptions do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for empty rescue block' do
+  it 'registers an offense for empty rescue block' do
     inspect_source(cop,
                    ['begin',
                     '  something',
                     'rescue',
                     '  #do nothing',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Do not suppress exceptions.'])
   end
 
-  it 'does not register an offence for rescue with body' do
+  it 'does not register an offense for rescue with body' do
     inspect_source(cop,
                    ['begin',
                     '  something',
@@ -25,6 +25,6 @@ describe Rubocop::Cop::Lint::HandleExceptions do
                     'rescue',
                     '  file.close',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

data/spec/rubocop/cop/lint/invalid_character_literal_spec.rb

@@ -19,13 +19,13 @@ describe Rubocop::Cop::Lint::InvalidCharacterLiteral do
   context 'with a non-escaped whitespace character literal ' do
     let(:source) { 'p(? )' }
 
-    it 'registers an offence' do
+    it 'registers an offense' do
       pending 'Is there a way to emit this warning without syntax errors?'
 
       inspect_source(cop, source)
 
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Invalid character literal; use ?\s')
       expect(cop.highlights).to eq([' '])
     end

data/spec/rubocop/cop/lint/literal_in_condition_spec.rb

@@ -6,40 +6,95 @@ describe Rubocop::Cop::Lint::LiteralInCondition do
   subject(:cop) { described_class.new }
 
   %w(1 2.0 [1] {}).each do |lit|
-    it "registers an offence for literal #{lit} in &&" do
+    it "registers an offense for literal #{lit} in if" do
+      inspect_source(cop,
+                     ["if #{lit}",
+                      '  top',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq(1)
+    end
+
+    it "registers an offense for literal #{lit} in while" do
+      inspect_source(cop,
+                     ["while #{lit}",
+                      '  top',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq(1)
+    end
+
+    it "registers an offense for literal #{lit} in until" do
+      inspect_source(cop,
+                     ["until #{lit}",
+                      '  top',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq(1)
+    end
+
+    it "registers an offense for literal #{lit} in case" do
+      inspect_source(cop,
+                     ["case #{lit}",
+                      'when x then top',
+                      'end'
+                     ])
+      expect(cop.offenses.size).to eq(1)
+    end
+
+    it "registers an offense for literal #{lit} in a when " \
+       'of a case without anything after case keyword' do
+      inspect_source(cop,
+                     ['case',
+                      "when #{lit} then top",
+                      'end'])
+      expect(cop.offenses.size).to eq(1)
+    end
+
+    it "accepts literal #{lit} in a when of a case with " \
+       'something after case keyword' do
+      inspect_source(cop,
+                     ['case x',
+                      "when #{lit} then top",
+                      'end'
+                     ])
+      expect(cop.offenses).to be_empty
+    end
+
+    it "registers an offense for literal #{lit} in &&" do
       inspect_source(cop,
                      ["if x && #{lit}",
                       '  top',
                       'end'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
-    it "registers an offence for literal #{lit} in complex cond" do
+    it "registers an offense for literal #{lit} in complex cond" do
       inspect_source(cop,
                      ["if x && !(a && #{lit}) && y && z",
                       '  top',
                       'end'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
-    it "registers an offence for literal #{lit} in !" do
+    it "registers an offense for literal #{lit} in !" do
       inspect_source(cop,
                      ["if !#{lit}",
                       '  top',
                       'end'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
-    it "registers an offence for literal #{lit} in complex !" do
+    it "registers an offense for literal #{lit} in complex !" do
       inspect_source(cop,
                      ["if !(x && (y && #{lit}))",
                       '  top',
                       'end'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
 
     it "accepts literal #{lit} if it's not an and/or operand" do
@@ -48,7 +103,7 @@ describe Rubocop::Cop::Lint::LiteralInCondition do
                       '  top',
                       'end'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it "accepts literal #{lit} in non-toplevel and/or" do
@@ -57,7 +112,7 @@ describe Rubocop::Cop::Lint::LiteralInCondition do
                       '  top',
                       'end'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 end

data/spec/rubocop/cop/lint/literal_in_interpolation_spec.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Lint::LiteralInInterpolation do
+  subject(:cop) { described_class.new }
+
+  %w(1 2.0 [1] {}).each do |lit|
+    it "registers an offense for #{lit} in interpolation" do
+      inspect_source(cop,
+                     ["\"this is the \#{#{lit}}\""])
+      expect(cop.offenses.size).to eq(1)
+    end
+
+    it "registers an offense only for final #{lit} in interpolation" do
+      inspect_source(cop,
+                     ["\"this is the \#{#{lit};#{lit}}\""])
+      expect(cop.offenses.size).to eq(1)
+    end
+  end
+end

data/spec/rubocop/cop/lint/loop_spec.rb

@@ -5,23 +5,23 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::Loop do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for begin/end/while' do
+  it 'registers an offense for begin/end/while' do
     inspect_source(cop, ['begin something; top; end while test'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for begin/end/until' do
+  it 'registers an offense for begin/end/until' do
     inspect_source(cop, ['begin something; top; end until test'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts normal while' do
     inspect_source(cop, ['while test; one; two; end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts normal until' do
     inspect_source(cop, ['until test; one; two; end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

data/spec/rubocop/cop/lint/parentheses_as_grouped_expression_spec.rb

@@ -5,53 +5,53 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::ParenthesesAsGroupedExpression do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for method call with space before the ' \
-    'parenthesis' do
+  it 'registers an offense for method call with space before the ' \
+     'parenthesis' do
     inspect_source(cop, ['a.func (x)'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for predicate method call with space ' \
-    'before the parenthesis' do
+  it 'registers an offense for predicate method call with space ' \
+     'before the parenthesis' do
     inspect_source(cop, ['is? (x)'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for math expression' do
+  it 'registers an offense for math expression' do
     inspect_source(cop, ['puts (2 + 3) * 4'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts a method call without arguments' do
     inspect_source(cop, ['func'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts a method call with arguments but no parentheses' do
     inspect_source(cop, ['puts x'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts a chain of method calls' do
     inspect_source(cop, ['a.b',
                          'a.b 1',
                          'a.b(1)'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts method with parens as arg to method without' do
     inspect_source(cop, ['a b(c)'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts an operator call with argument in parentheses' do
     inspect_source(cop, ['a % (b + c)',
                          'a.b = (c == d)'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts a space inside opening paren followed by left paren' do
     inspect_source(cop, ['a( (b) )'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

data/spec/rubocop/cop/lint/require_parentheses_spec.rb

@@ -5,8 +5,8 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::RequireParentheses do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for missing parentheses around expression with ' \
-    '&& operator' do
+  it 'registers an offense for missing parentheses around expression with ' \
+     '&& operator' do
     inspect_source(cop, ["if day.is? 'monday' && month == :jan",
                          '  foo',
                          'end'])
@@ -16,14 +16,14 @@ describe Rubocop::Cop::Lint::RequireParentheses do
               'precedence.'])
   end
 
-  it 'registers an offence for missing parentheses around expression with ' \
-    '|| operator' do
+  it 'registers an offense for missing parentheses around expression with ' \
+     '|| operator' do
     inspect_source(cop, "day_is? 'tuesday' || true")
     expect(cop.highlights).to eq(["day_is? 'tuesday' || true"])
   end
 
-  it 'registers an offence for missing parentheses around expression in ' \
-    'ternary' do
+  it 'registers an offense for missing parentheses around expression in ' \
+     'ternary' do
     inspect_source(cop, "wd.include? 'tuesday' && true == true ? a : b")
     expect(cop.highlights).to eq(["wd.include? 'tuesday' && true == true"])
   end
@@ -31,7 +31,7 @@ describe Rubocop::Cop::Lint::RequireParentheses do
   it 'accepts missing parentheses around expression with + operator' do
     inspect_source(cop, ["if day_is? 'tuesday' + rest",
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts method calls without parentheses followed by keyword and/or' do
@@ -39,44 +39,44 @@ describe Rubocop::Cop::Lint::RequireParentheses do
                          'end',
                          "if day.is? 'tuesday' or month == :jan",
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts method calls that are all operations' do
     inspect_source(cop, ['if current_level == max + 1',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts condition that is not a call' do
     inspect_source(cop, ['if @debug',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts parentheses around expression with boolean operator' do
     inspect_source(cop, ["if day.is?('tuesday' && true == true)",
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts method call with parentheses in ternary' do
     inspect_source(cop, "wd.include?('tuesday' && true == true) ? a : b")
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts missing parentheses when method is not a predicate' do
     inspect_source(cop, "weekdays.foo 'tuesday' && true == true")
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts calls to methods that are setters' do
     inspect_source(cop, 's.version = @version || ">= 1.8.5"')
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts calls to methods that are operators' do
     inspect_source(cop, 'a[b || c]')
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

data/spec/rubocop/cop/lint/rescue_exception_spec.rb

@@ -5,55 +5,55 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::RescueException do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for rescue from Exception' do
+  it 'registers an offense for rescue from Exception' do
     inspect_source(cop,
                    ['begin',
                     '  something',
                     'rescue Exception',
                     '  #do nothing',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Avoid rescuing the Exception class.'])
   end
 
-  it 'registers an offence for rescue with ::Exception' do
+  it 'registers an offense for rescue with ::Exception' do
     inspect_source(cop,
                    ['begin',
                     '  something',
                     'rescue ::Exception',
                     '  #do nothing',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Avoid rescuing the Exception class.'])
   end
 
-  it 'registers an offence for rescue with StandardError, Exception' do
+  it 'registers an offense for rescue with StandardError, Exception' do
     inspect_source(cop,
                    ['begin',
                     '  something',
                     'rescue StandardError, Exception',
                     '  #do nothing',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Avoid rescuing the Exception class.'])
   end
 
-  it 'registers an offence for rescue with Exception => e' do
+  it 'registers an offense for rescue with Exception => e' do
     inspect_source(cop,
                    ['begin',
                     '  something',
                     'rescue Exception => e',
                     '  #do nothing',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['Avoid rescuing the Exception class.'])
   end
 
-  it 'does not register an offence for rescue with no class' do
+  it 'does not register an offense for rescue with no class' do
     inspect_source(cop,
                    ['begin',
                     '  something',
@@ -61,10 +61,10 @@ describe Rubocop::Cop::Lint::RescueException do
                     'rescue',
                     '  file.close',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for rescue with no class and => e' do
+  it 'does not register an offense for rescue with no class and => e' do
     inspect_source(cop,
                    ['begin',
                     '  something',
@@ -72,10 +72,10 @@ describe Rubocop::Cop::Lint::RescueException do
                     'rescue => e',
                     '  file.close',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for rescue with other class' do
+  it 'does not register an offense for rescue with other class' do
     inspect_source(cop,
                    ['begin',
                     '  something',
@@ -83,10 +83,10 @@ describe Rubocop::Cop::Lint::RescueException do
                     'rescue ArgumentError => e',
                     '  file.close',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for rescue with other classes' do
+  it 'does not register an offense for rescue with other classes' do
     inspect_source(cop,
                    ['begin',
                     '  something',
@@ -94,10 +94,10 @@ describe Rubocop::Cop::Lint::RescueException do
                     'rescue EOFError, ArgumentError => e',
                     '  file.close',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for rescue with a module prefix' do
+  it 'does not register an offense for rescue with a module prefix' do
     inspect_source(cop,
                    ['begin',
                     '  something',
@@ -105,7 +105,7 @@ describe Rubocop::Cop::Lint::RescueException do
                     'rescue Test::Exception => e',
                     '  file.close',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not crash when the splat operator is used in a rescue' do
@@ -116,16 +116,16 @@ describe Rubocop::Cop::Lint::RescueException do
                     'rescue *ERRORS',
                     '  puts e',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'does not crash when the namespace of a rescued class is in a local ' \
-    'variable' do
+     'variable' do
     inspect_source(cop,
                    ['adapter = current_adapter',
                     'begin',
                     'rescue adapter::ParseError',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end