rubocop 0.18.1 → 0.19.0

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

@@ -2,40 +2,30 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Rails::Output, :config do
-  subject(:cop) { described_class.new(config) }
-  let(:cop_config) { { 'Ignore' => ['^.*\.rake$'] } }
+describe Rubocop::Cop::Rails::Output do
+  subject(:cop) { described_class.new }
 
-  it 'should record an offence for puts statements' do
+  it 'should record an offense for puts statements' do
     source = ['p "edmond dantes"',
               'puts "sinbad"',
               'print "abbe busoni"',
               'pp "monte cristo"']
     inspect_source(cop, source)
-    expect(cop.offences.size).to eq(4)
+    expect(cop.offenses.size).to eq(4)
   end
 
-  it 'should not record an offence for methods' do
+  it 'should not record an offense for methods' do
     source = ['obj.print',
               'something.p',
               'nothing.pp']
     inspect_source(cop, source)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'should not record an offence for comments' do
+  it 'should not record an offense for comments' do
     source = ['# print "test"',
               '# p']
     inspect_source(cop, source)
-    expect(cop.offences).to be_empty
-  end
-
-  it 'should ignore certain files' do
-    source = ['print 1']
-    processed_source = parse_source(source)
-    allow(processed_source.buffer)
-      .to receive(:name).and_return('/var/lib/test.rake')
-    _investigate(cop, processed_source)
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

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

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

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Rails::ScopeArgs do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offense a scope with a method arg' do
+    inspect_source(cop,
+                   ['scope :active, where(active: true)'])
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'accepts a lambda arg' do
+    inspect_source(cop,
+                   ['scope :active, -> { where(active: true) }'])
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts a proc arg' do
+    inspect_source(cop,
+                   ['scope :active, proc { where(active: true) }'])
+    expect(cop.offenses).to be_empty
+  end
+end

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

@@ -6,16 +6,16 @@ describe Rubocop::Cop::Rails::Validation do
   subject(:cop) { described_class.new }
 
   described_class::BLACKLIST.each do |validation|
-    it "registers an offence for #{validation}" do
+    it "registers an offense for #{validation}" do
       inspect_source(cop,
                      ["#{validation} :name"])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 
   it 'accepts sexy validations' do
     inspect_source(cop,
                    ['validates :name'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -8,7 +8,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
   context 'when EnforcedStyle is set to indent' do
     let(:cop_config) { { 'EnforcedStyle' => 'indent' } }
 
-    it 'registers an offence for misaligned private' do
+    it 'registers an offense for misaligned private' do
       inspect_source(cop,
                      ['class Test',
                       '',
@@ -16,13 +16,13 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Indent access modifiers like private.'])
-      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'outdent')
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'outdent')
     end
 
-    it 'registers an offence for misaligned private in module' do
+    it 'registers an offense for misaligned private in module' do
       inspect_source(cop,
                      ['module Test',
                       '',
@@ -30,13 +30,13 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq(['Indent access modifiers like private.'])
       # Not aligned according to `indent` or `outdent` style:
-      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 correct + opposite alignment' do
+    it 'registers an offense for correct + opposite alignment' do
       inspect_source(cop,
                      ['module Test',
                       '',
@@ -46,13 +46,13 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq(['Indent access modifiers like private.'])
       # No EnforcedStyle can allow both aligments:
-      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 opposite + correct alignment' do
+    it 'registers an offense for opposite + correct alignment' do
       inspect_source(cop,
                      ['module Test',
                       '',
@@ -62,13 +62,13 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq(['Indent access modifiers like public.'])
       # No EnforcedStyle can allow both aligments:
-      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 misaligned private in singleton class' do
+    it 'registers an offense for misaligned private in singleton class' do
       inspect_source(cop,
                      ['class << self',
                       '',
@@ -76,12 +76,12 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Indent access modifiers like private.'])
     end
 
-    it 'registers an offence for misaligned private in class ' \
+    it 'registers an offense for misaligned private in class ' \
        'defined with Class.new' do
       inspect_source(cop,
                      ['Test = Class.new do',
@@ -90,12 +90,12 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Indent access modifiers like private.'])
     end
 
-    it 'registers an offence for misaligned private in module ' \
+    it 'registers an offense for misaligned private in module ' \
        'defined with Module.new' do
       inspect_source(cop,
                      ['Test = Module.new do',
@@ -104,12 +104,12 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Indent access modifiers like private.'])
     end
 
-    it 'registers an offence for misaligned protected' do
+    it 'registers an offense for misaligned protected' do
       inspect_source(cop,
                      ['class Test',
                       '',
@@ -117,7 +117,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Indent access modifiers like protected.'])
     end
@@ -130,7 +130,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'accepts properly indented protected' do
@@ -141,14 +141,14 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'accepts an empty class' do
       inspect_source(cop,
                      ['class Test',
                       'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'handles properly nested classes' do
@@ -166,7 +166,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Indent access modifiers like private.'])
     end
@@ -195,7 +195,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
     let(:cop_config) { { 'EnforcedStyle' => 'outdent' } }
     let(:indent_msg) { 'Outdent access modifiers like private.' }
 
-    it 'registers offence for private indented to method depth in a class' do
+    it 'registers offense for private indented to method depth in a class' do
       inspect_source(cop,
                      ['class Test',
                       '',
@@ -203,12 +203,12 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq([indent_msg])
-      expect(cop.config_to_allow_offences).to eq('EnforcedStyle' => 'indent')
+      expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'indent')
     end
 
-    it 'registers offence for private indented to method depth in a module' do
+    it 'registers offense for private indented to method depth in a module' do
       inspect_source(cop,
                      ['module Test',
                       '',
@@ -216,11 +216,11 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq([indent_msg])
     end
 
-    it 'registers offence for private indented to method depth in singleton' \
+    it 'registers offense for private indented to method depth in singleton' \
        'class' do
       inspect_source(cop,
                      ['class << self',
@@ -229,11 +229,11 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq([indent_msg])
     end
 
-    it 'registers offence for private indented to method depth in class ' \
+    it 'registers offense for private indented to method depth in class ' \
        'defined with Class.new' do
       inspect_source(cop,
                      ['Test = Class.new do',
@@ -242,11 +242,11 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq([indent_msg])
     end
 
-    it 'registers offence for private indented to method depth in module ' \
+    it 'registers offense for private indented to method depth in module ' \
        'defined with Module.new' do
       inspect_source(cop,
                      ['Test = Module.new do',
@@ -255,7 +255,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq([indent_msg])
     end
 
@@ -267,7 +267,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'accepts protected indented to the containing class indent level' do
@@ -278,7 +278,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
     it 'handles properly nested classes' do
@@ -296,7 +296,7 @@ describe Rubocop::Cop::Style::AccessModifierIndentation, :config do
                       '',
                       '  def test; end',
                       'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq([indent_msg])
     end
 

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

@@ -5,19 +5,19 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::AccessorMethodName do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for method get_... with no args' do
+  it 'registers an offense for method get_... with no args' do
     inspect_source(cop, ['def get_attr',
                          '  # ...',
                          'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.highlights).to eq(['get_attr'])
   end
 
-  it 'registers an offence for singleton method get_... with no args' do
+  it 'registers an offense for singleton method get_... with no args' do
     inspect_source(cop, ['def self.get_attr',
                          '  # ...',
                          'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.highlights).to eq(['get_attr'])
   end
 
@@ -25,29 +25,29 @@ describe Rubocop::Cop::Style::AccessorMethodName do
     inspect_source(cop, ['def get_something(arg)',
                          '  # ...',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts singleton method get_something with args' do
     inspect_source(cop, ['def self.get_something(arg)',
                          '  # ...',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offence for method set_something with one arg' do
+  it 'registers an offense for method set_something with one arg' do
     inspect_source(cop, ['def set_attr(arg)',
                          '  # ...',
                          'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.highlights).to eq(['set_attr'])
   end
 
-  it 'registers an offence for singleton method set_... with one args' do
+  it 'registers an offense for singleton method set_... with one args' do
     inspect_source(cop, ['def self.set_attr(arg)',
                          '  # ...',
                          'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.highlights).to eq(['set_attr'])
   end
 
@@ -55,27 +55,27 @@ describe Rubocop::Cop::Style::AccessorMethodName do
     inspect_source(cop, ['def set_something',
                          '  # ...',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts singleton method set_something with no args' do
     inspect_source(cop, ['def self.set_something',
                          '  # ...',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts method set_something with two args' do
     inspect_source(cop, ['def set_something(arg1, arg2)',
                          '  # ...',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts singleton method set_something with two args' do
     inspect_source(cop, ['def self.get_something(arg1, arg2)',
                          '  # ...',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end