rubocop 0.18.1 → 0.19.0

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

@@ -6,25 +6,25 @@ describe Rubocop::Cop::Lint::UselessComparison do
   subject(:cop) { described_class.new }
 
   described_class::OPS.each do |op|
-    it "registers an offence for a simple comparison with #{op}" do
+    it "registers an offense for a simple comparison with #{op}" do
       inspect_source(cop,
                      ["5 #{op} 5",
                       "a #{op} a"
                      ])
-      expect(cop.offences.size).to eq(2)
+      expect(cop.offenses.size).to eq(2)
     end
 
-    it "registers an offence for a complex comparison with #{op}" do
+    it "registers an offense for a complex comparison with #{op}" do
       inspect_source(cop,
                      ["5 + 10 * 30 #{op} 5 + 10 * 30",
                       "a.top(x) #{op} a.top(x)"
                      ])
-      expect(cop.offences.size).to eq(2)
+      expect(cop.offenses.size).to eq(2)
     end
   end
 
   it 'works with lambda.()' do
     inspect_source(cop, ['a.(x) > a.(x)'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 end

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

@@ -20,9 +20,9 @@ describe Rubocop::Cop::Lint::UselessElseWithoutRescue do
       ]
     end
 
-    it 'registers an offence' do
-      expect(cop.offences.size).to eq(1)
-      expect(cop.offences.first.message)
+    it 'registers an offense' do
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
         .to eq('Else without rescue is useless')
       expect(cop.highlights).to eq(['else'])
     end
@@ -42,7 +42,7 @@ describe Rubocop::Cop::Lint::UselessElseWithoutRescue do
     end
 
     it 'accepts' do
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 end

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

@@ -5,24 +5,24 @@ require 'spec_helper'
 describe Rubocop::Cop::Lint::UselessSetterCall do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for def ending with lvar attr assignment' do
+  it 'registers an offense for def ending with lvar attr assignment' do
     inspect_source(cop,
                    ['def test',
                     '  top = Top.new',
                     '  top.attr = 5',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for defs ending with lvar attr assignment' do
+  it 'registers an offense for defs ending with lvar attr assignment' do
     inspect_source(cop,
                    ['def Top.test',
                     '  top = Top.new',
                     '  top.attr = 5',
                     'end'
                    ])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts def ending with ivar assignment' do
@@ -32,7 +32,7 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
                     '  @top = 5',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts def ending ivar attr assignment' do
@@ -42,7 +42,7 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
                     '  @top.attr = 5',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts def ending with argument attr assignment' do
@@ -52,7 +52,7 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
                     '  some_arg.attr = 5',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   context 'when a lvar has an object passed as argument ' \
@@ -67,7 +67,7 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
                       '  some_lvar.attr = 5',
                       'end'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
@@ -80,20 +80,20 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
                       '  some_lvar.attr = 5',
                       'end'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
   context 'when a lvar does not have any object passed as argument ' \
           'with multiple-assignment at the end of the method' do
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop,
                      ['def test(some_arg)',
                       '  _first, some_lvar, _third  = do_something',
                       '  some_lvar.attr = 5',
                       'end'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 
@@ -107,13 +107,13 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
                       '  some_lvar.attr = 5',
                       'end'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
   context 'when a lvar does not have any object passed as argument ' \
           'by binary-operator-assignment at the end of the method' do
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop,
                      ['def test(some_arg)',
                       '  some_lvar = some_arg',
@@ -121,20 +121,20 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
                       '  some_lvar.attr = 5',
                       'end'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 
   context 'when a lvar declared as an argument ' \
           'is no longer the passed object at the end of the method' do
-    it 'registers an offence for the lvar attr assignment' do
+    it 'registers an offense for the lvar attr assignment' do
       inspect_source(cop,
                      ['def test(some_arg)',
                       '  some_arg = Top.new',
                       '  some_arg.attr = 5',
                       'end'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 
@@ -144,6 +144,6 @@ describe Rubocop::Cop::Lint::UselessSetterCall do
                     '  top.attr == 5',
                     'end'
                    ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -6,13 +6,13 @@ describe Rubocop::Cop::Lint::Void do
   subject(:cop) { described_class.new }
 
   described_class::OPS.each do |op|
-    it "registers an offence for void op #{op} if not on last line" do
+    it "registers an offense for void op #{op} if not on last line" do
       inspect_source(cop,
                      ["a #{op} b",
                       "a #{op} b",
                       "a #{op} b"
                      ])
-      expect(cop.offences.size).to eq(2)
+      expect(cop.offenses.size).to eq(2)
     end
   end
 
@@ -22,35 +22,35 @@ describe Rubocop::Cop::Lint::Void do
                      ['something',
                       "a #{op} b"
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
   described_class::OPS.each do |op|
     it "accepts void op #{op} by itself without a begin block" do
       inspect_source(cop, ["a #{op} b"])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 
   %w(var @var @@var VAR).each do |var|
-    it "registers an offence for void var #{var} if not on last line" do
+    it "registers an offense for void var #{var} if not on last line" do
       inspect_source(cop,
                      ["#{var} = 5",
                       "#{var}",
                       'top'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 
   %w(1 2.0 /test/ [1] {}).each do |lit|
-    it "registers an offence for void lit #{lit} if not on last line" do
+    it "registers an offense for void lit #{lit} if not on last line" do
       inspect_source(cop,
                      ["#{lit}",
                       'top'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 

data/spec/rubocop/cop/{offence_spec.rb → offense_spec.rb}

@@ -2,36 +2,36 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Offence do
+describe Rubocop::Cop::Offense do
   let(:location) do
     source_buffer = Parser::Source::Buffer.new('test', 1)
     source_buffer.source = "a\n"
     Parser::Source::Range.new(source_buffer, 0, 1)
   end
-  subject(:offence) do
+  subject(:offense) do
     described_class.new(:convention, location, 'message', 'CopName', true)
   end
 
   it 'has a few required attributes' do
-    expect(offence.severity).to eq(:convention)
-    expect(offence.line).to eq(1)
-    expect(offence.message).to eq('message')
-    expect(offence.cop_name).to eq('CopName')
-    expect(offence.corrected?).to be_true
+    expect(offense.severity).to eq(:convention)
+    expect(offense.line).to eq(1)
+    expect(offense.message).to eq('message')
+    expect(offense.cop_name).to eq('CopName')
+    expect(offense.corrected?).to be_true
   end
 
   it 'overrides #to_s' do
-    expect(offence.to_s).to eq('C:  1:  1: message')
+    expect(offense.to_s).to eq('C:  1:  1: message')
   end
 
   it 'does not blow up if a message contains %' do
-    offence = described_class.new(:convention, location, 'message % test',
+    offense = described_class.new(:convention, location, 'message % test',
                                   'CopName')
 
-    expect(offence.to_s).to eq('C:  1:  1: message % test')
+    expect(offense.to_s).to eq('C:  1:  1: message % test')
   end
 
-  it 'redefines == to compare offences based on their contents' do
+  it 'redefines == to compare offenses based on their contents' do
     o1 = described_class.new(:convention, location, 'message', 'CopName')
     o2 = described_class.new(:convention, location, 'message', 'CopName')
 
@@ -39,13 +39,13 @@ describe Rubocop::Cop::Offence do
   end
 
   it 'is frozen' do
-    expect(offence).to be_frozen
+    expect(offense).to be_frozen
   end
 
   [:severity, :location, :line, :column, :message, :cop_name].each do |a|
     describe "##{a}" do
       it 'is frozen' do
-        expect(offence.send(a)).to be_frozen
+        expect(offense.send(a)).to be_frozen
       end
     end
   end
@@ -80,7 +80,7 @@ describe Rubocop::Cop::Offence do
   end
 
   describe '#<=>' do
-    def offence(hash = {})
+    def offense(hash = {})
       attrs = {
         sev:  :convention,
         line: 5,
@@ -123,9 +123,9 @@ describe Rubocop::Cop::Offence do
     ].each do |one, other, expectation|
       context "when receiver has #{one} and other has #{other}" do
         it "returns #{expectation}" do
-          an_offence = offence(one)
-          other_offence = offence(other)
-          expect(an_offence <=> other_offence).to eq(expectation)
+          an_offense = offense(one)
+          other_offense = offense(other)
+          expect(an_offense <=> other_offense).to eq(expectation)
         end
       end
     end

data/spec/rubocop/cop/rails/action_filter_spec.rb

@@ -0,0 +1,69 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Rails::ActionFilter, :config do
+  subject(:cop) { described_class.new(config) }
+
+  context 'when style is action' do
+    let(:cop_config) { { 'EnforcedStyle' => 'action' } }
+
+    described_class::FILTER_METHODS.each do |method|
+      it "registers an offense for #{method}" do
+        inspect_source(cop,
+                       ["#{method} :name"])
+        expect(cop.offenses.size).to eq(1)
+      end
+
+      it "registers an offense for #{method} with block" do
+        inspect_source(cop,
+                       ["#{method} { |controller| something }"])
+        expect(cop.offenses.size).to eq(1)
+      end
+    end
+
+    described_class::ACTION_METHODS.each do |method|
+      it "accepts #{method}" do
+        inspect_source(cop,
+                       ["#{method} :something"])
+        expect(cop.offenses).to be_empty
+      end
+    end
+
+    it 'auto-corrects to preferred method' do
+      new_source = autocorrect_source(cop, 'before_filter :test')
+      expect(new_source).to eq('before_action :test')
+    end
+  end
+
+  context 'when style is filter' do
+    let(:cop_config) { { 'EnforcedStyle' => 'filter' } }
+
+    described_class::ACTION_METHODS.each do |method|
+      it "registers an offense for #{method}" do
+        inspect_source(cop,
+                       ["#{method} :name"])
+        expect(cop.offenses.size).to eq(1)
+      end
+
+      it "registers an offense for #{method} with block" do
+        inspect_source(cop,
+                       ["#{method} { |controller| something }"])
+        expect(cop.offenses.size).to eq(1)
+      end
+    end
+
+    described_class::FILTER_METHODS.each do |method|
+      it "accepts #{method}" do
+        inspect_source(cop,
+                       ["#{method} :something"])
+        expect(cop.offenses).to be_empty
+      end
+    end
+
+    it 'auto-corrects to preferred method' do
+      new_source = autocorrect_source(cop, 'before_action :test')
+      expect(new_source).to eq('before_filter :test')
+    end
+  end
+end

data/spec/rubocop/cop/rails/default_scope_spec.rb

@@ -5,33 +5,33 @@ require 'spec_helper'
 describe Rubocop::Cop::Rails::DefaultScope do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for default scope with a lambda arg' do
+  it 'registers an offense for default scope with a lambda arg' do
     inspect_source(cop,
                    ['default_scope -> { something }'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for default scope with a proc arg' do
+  it 'registers an offense for default scope with a proc arg' do
     inspect_source(cop,
                    ['default_scope proc { something }'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for default scope with a proc(Proc.new) arg' do
+  it 'registers an offense for default scope with a proc(Proc.new) arg' do
     inspect_source(cop,
                    ['default_scope Proc.new { something }'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for non blocks' do
+  it 'registers an offense for non blocks' do
     inspect_source(cop,
                    ['default_scope order: "position"'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 
   it 'accepts a block arg' do
     inspect_source(cop,
                    ['default_scope { something }'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

data/spec/rubocop/cop/rails/has_and_belongs_to_many_spec.rb

@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Rubocop::Cop::Rails::HasAndBelongsToMany do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for has_and_belongs_to_many' do
+  it 'registers an offense for has_and_belongs_to_many' do
     inspect_source(cop,
                    ['has_and_belongs_to_many :groups'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
   end
 end