rubocop 0.13.1 → 0.14.0

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

@@ -2,61 +2,55 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe Encoding do
-        subject(:encoding) { Encoding.new }
-
-        it 'registers an offence when no encoding present', ruby: 1.9 do
-          inspect_source(encoding, ['def foo() end'])
-
-          expect(encoding.messages).to eq(
-            ['Missing utf-8 encoding comment.'])
-        end
-
-        it 'accepts encoding on first line', ruby: 1.9 do
-          inspect_source(encoding, ['# encoding: utf-8',
-                                    'def foo() end'])
-
-          expect(encoding.offences).to be_empty
-        end
-
-        it 'accepts encoding on second line when shebang present', ruby: 1.9 do
-          inspect_source(encoding, ['#!/usr/bin/env ruby',
-                                    '# encoding: utf-8',
-                                    'def foo() end'])
-
-          expect(encoding.messages).to be_empty
-        end
-
-        it 'books an offence when encoding is in the wrong place', ruby: 1.9 do
-          inspect_source(encoding, ['def foo() end',
-                                    '# encoding: utf-8'])
-
-          expect(encoding.messages).to eq(
-            ['Missing utf-8 encoding comment.'])
-        end
-
-        it 'does not register an offence on Ruby 2.0', ruby: 2.0 do
-          inspect_source(encoding, ['def foo() end'])
-
-          expect(encoding.offences).to be_empty
-        end
-
-        it 'accepts encoding inserted by magic_encoding gem', ruby: 1.9 do
-          inspect_source(encoding, ['# -*- encoding : utf-8 -*-',
-                                    'def foo() end'])
-
-          expect(encoding.messages).to be_empty
-        end
-
-        it 'accepts vim-style encoding comments', ruby: 1.9 do
-          inspect_source(encoding, ['# vim:fileencoding=utf-8',
-                                    'def foo() end'])
-          expect(encoding.messages).to be_empty
-        end
-      end
-    end
+describe Rubocop::Cop::Style::Encoding do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offence when no encoding present', ruby: 1.9 do
+    inspect_source(cop, ['def foo() end'])
+
+    expect(cop.messages).to eq(
+      ['Missing utf-8 encoding comment.'])
+  end
+
+  it 'accepts encoding on first line', ruby: 1.9 do
+    inspect_source(cop, ['# encoding: utf-8',
+                         'def foo() end'])
+
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts encoding on second line when shebang present', ruby: 1.9 do
+    inspect_source(cop, ['#!/usr/bin/env ruby',
+                         '# encoding: utf-8',
+                         'def foo() end'])
+
+    expect(cop.messages).to be_empty
+  end
+
+  it 'books an offence when encoding is in the wrong place', ruby: 1.9 do
+    inspect_source(cop, ['def foo() end',
+                         '# encoding: utf-8'])
+
+    expect(cop.messages).to eq(
+      ['Missing utf-8 encoding comment.'])
+  end
+
+  it 'does not register an offence on Ruby 2.0', ruby: 2.0 do
+    inspect_source(cop, ['def foo() end'])
+
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts encoding inserted by magic_encoding gem', ruby: 1.9 do
+    inspect_source(cop, ['# -*- encoding : utf-8 -*-',
+                         'def foo() end'])
+
+    expect(cop.messages).to be_empty
+  end
+
+  it 'accepts vim-style encoding comments', ruby: 1.9 do
+    inspect_source(cop, ['# vim:fileencoding=utf-8',
+                         'def foo() end'])
+    expect(cop.messages).to be_empty
   end
 end

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

@@ -2,18 +2,12 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe EndBlock do
-        subject(:cop) { EndBlock.new }
+describe Rubocop::Cop::Style::EndBlock do
+  subject(:cop) { described_class.new }
 
-        it 'reports an offence for an END block' do
-          src = ['END { test }']
-          inspect_source(cop, src)
-          expect(cop.offences.size).to eq(1)
-        end
-      end
-    end
+  it 'reports an offence for an END block' do
+    src = ['END { test }']
+    inspect_source(cop, src)
+    expect(cop.offences.size).to eq(1)
   end
 end

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

@@ -2,26 +2,20 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe EndOfLine do
-        subject(:eol) { EndOfLine.new }
+describe Rubocop::Cop::Style::EndOfLine do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for CR+LF' do
-          pending 'Fails after upgdate to parser-2.0.0.pre3.'
-          inspect_source(eol, ["x=0\r", ''])
-          expect(eol.messages).to eq(
-            ['Carriage return character detected.'])
-        end
+  it 'registers an offence for CR+LF' do
+    pending 'Fails after upgdate to parser-2.0.0.pre3.'
+    inspect_source(cop, ["x=0\r", ''])
+    expect(cop.messages).to eq(
+      ['Carriage return character detected.'])
+  end
 
-        it 'registers an offence for CR at end of file' do
-          pending
-          inspect_source(eol, ["x=0\r"])
-          expect(eol.messages).to eq(
-            ['Carriage return character detected.'])
-        end
-      end
-    end
+  it 'registers an offence for CR at end of file' do
+    pending
+    inspect_source(cop, ["x=0\r"])
+    expect(cop.messages).to eq(
+      ['Carriage return character detected.'])
   end
 end

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

@@ -2,46 +2,74 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe EvenOdd do
-        subject(:cop) { described_class.new }
-
-        it 'registers an offence for x % 2 == 0' do
-          inspect_source(cop,
-                         ['x % 2 == 0'])
-          expect(cop.offences.size).to eq(1)
-          expect(cop.messages).to eq([EvenOdd::MSG_EVEN])
-        end
-
-        it 'registers an offence for (x % 2) == 0' do
-          inspect_source(cop,
-                         ['(x % 2) == 0'])
-          expect(cop.offences.size).to eq(1)
-          expect(cop.messages).to eq([EvenOdd::MSG_EVEN])
-        end
-
-        it 'registers an offence for x % 2 == 1' do
-          inspect_source(cop,
-                         ['x % 2 == 1'])
-          expect(cop.offences.size).to eq(1)
-          expect(cop.messages).to eq([EvenOdd::MSG_ODD])
-        end
-
-        it 'registers an offence for (x % 2) == 1' do
-          inspect_source(cop,
-                         ['(x % 2) == 1'])
-          expect(cop.offences.size).to eq(1)
-          expect(cop.messages).to eq([EvenOdd::MSG_ODD])
-        end
-
-        it 'accepts x % 3 == 0' do
-          inspect_source(cop,
-                         ['x % 3 == 0'])
-          expect(cop.offences).to be_empty
-        end
-      end
-    end
+describe Rubocop::Cop::Style::EvenOdd do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offence for x % 2 == 0' do
+    inspect_source(cop,
+                   ['x % 2 == 0'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages).to eq(['Use Fixnum.even?'])
+  end
+
+  it 'registers an offence for x % 2 != 0' do
+    inspect_source(cop,
+                   ['x % 2 != 0'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages).to eq(['Use Fixnum.odd?'])
+  end
+
+  it 'registers an offence for (x % 2) == 0' do
+    inspect_source(cop,
+                   ['(x % 2) == 0'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages).to eq(['Use Fixnum.even?'])
+  end
+
+  it 'registers an offence for (x % 2) != 0' do
+    inspect_source(cop,
+                   ['(x % 2) != 0'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages).to eq(['Use Fixnum.odd?'])
+  end
+
+  it 'registers an offence for x % 2 == 1' do
+    inspect_source(cop,
+                   ['x % 2 == 1'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages).to eq(['Use Fixnum.odd?'])
+  end
+
+  it 'registers an offence for x % 2 != 1' do
+    inspect_source(cop,
+                   ['x % 2 != 1'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages).to eq(['Use Fixnum.even?'])
+  end
+
+  it 'registers an offence for (x % 2) == 1' do
+    inspect_source(cop,
+                   ['(x % 2) == 1'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages).to eq(['Use Fixnum.odd?'])
+  end
+
+  it 'registers an offence for (x % 2) != 1' do
+    inspect_source(cop,
+                   ['(x % 2) != 1'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages).to eq(['Use Fixnum.even?'])
+  end
+
+  it 'accepts x % 3 == 0' do
+    inspect_source(cop,
+                   ['x % 3 == 0'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts x % 3 != 0' do
+    inspect_source(cop,
+                   ['x % 3 != 0'])
+    expect(cop.offences).to be_empty
   end
 end

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

@@ -2,36 +2,30 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe FavorJoin do
-        subject(:fj) { FavorJoin.new }
+describe Rubocop::Cop::Style::FavorJoin do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for an array followed by string' do
-          inspect_source(fj,
-                         ['%w(one two three) * ", "'])
-          expect(fj.offences.size).to eq(1)
-          expect(fj.messages)
-            .to eq([FavorJoin::MSG])
-        end
+  it 'registers an offence for an array followed by string' do
+    inspect_source(cop,
+                   ['%w(one two three) * ", "'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Favor Array#join over Array#*.'])
+  end
 
-        it 'does not register an offence for numbers' do
-          inspect_source(fj,
-                         ['%w(one two three) * 4'])
-          expect(fj.offences).to be_empty
-        end
+  it 'does not register an offence for numbers' do
+    inspect_source(cop,
+                   ['%w(one two three) * 4'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'does not register an offence for ambiguous cases' do
-          inspect_source(fj,
-                         ['test * ", "'])
-          expect(fj.offences).to be_empty
+  it 'does not register an offence for ambiguous cases' do
+    inspect_source(cop,
+                   ['test * ", "'])
+    expect(cop.offences).to be_empty
 
-          inspect_source(fj,
-                         ['%w(one two three) * test'])
-          expect(fj.offences).to be_empty
-        end
-      end
-    end
+    inspect_source(cop,
+                   ['%w(one two three) * test'])
+    expect(cop.offences).to be_empty
   end
 end

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

@@ -2,181 +2,185 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe FavorModifier do
-        let(:if_unless) { IfUnlessModifier.new(config) }
-        let(:while_until) { WhileUntilModifier.new(config) }
-        let(:config) do
-          hash = { 'LineLength' => { 'Max' => 79 } }
-          Rubocop::Config.new(hash)
-        end
-
-        it 'registers an offence for multiline if that fits on one line' do
-          # This if statement fits exactly on one line if written as a
-          # modifier.
-          condition = 'a' * 38
-          body = 'b' * 35
-          expect("  #{body} if #{condition}".length).to eq(79)
-
-          inspect_source(if_unless,
-                         ["  if #{condition}",
-                          "    #{body}",
-                          '  end'])
-          expect(if_unless.messages).to eq(
-            ['Favor modifier if/unless usage when you have a single-line' +
-             ' body. Another good alternative is the usage of control flow' +
-             ' &&/||.'])
-        end
-
-        it 'registers an offence for short multiline if near an else etc' do
-          inspect_source(if_unless,
-                         ['if x',
-                          '  y',
-                          'elsif x1',
-                          '  y1',
-                          'else',
-                          '  z',
-                          'end',
-                          'n = a ? 0 : 1',
-                          'm = 3 if m0',
-                          '',
-                          'if a',
-                          '  b',
-                          'end'])
-          expect(if_unless.offences.size).to eq(1)
-        end
-
-        it "accepts multiline if that doesn't fit on one line" do
-          check_too_long(if_unless, 'if')
-        end
-
-        it 'accepts multiline if whose body is more than one line' do
-          check_short_multiline(if_unless, 'if')
-        end
-
-        it 'registers an offence for multiline unless that fits on one line' do
-          inspect_source(if_unless, ['unless a',
-                                     '  b',
-                                     'end'])
-          expect(if_unless.messages).to eq(
-            ['Favor modifier if/unless usage when you have a single-line' +
-             ' body. Another good alternative is the usage of control flow' +
-             ' &&/||.'])
-        end
-
-        it 'accepts code with EOL comment since user might want to keep it' do
-          inspect_source(if_unless, ['unless a',
-                                     '  b # A comment',
-                                     'end'])
-          expect(if_unless.offences).to be_empty
-        end
-
-        it 'accepts if-else-end' do
-          inspect_source(if_unless,
-                         ['if args.last.is_a? Hash then args.pop else ' +
-                          'Hash.new end'])
-          expect(if_unless.messages).to be_empty
-        end
-
-        it "accepts multiline unless that doesn't fit on one line" do
-          check_too_long(while_until, 'unless')
-        end
-
-        it 'accepts multiline unless whose body is more than one line' do
-          check_short_multiline(while_until, 'unless')
-        end
-
-        it 'registers an offence for multiline while that fits on one line' do
-          check_really_short(while_until, 'while')
-        end
-
-        it "accepts multiline while that doesn't fit on one line" do
-          check_too_long(while_until, 'while')
-        end
-
-        it 'accepts multiline while whose body is more than one line' do
-          check_short_multiline(while_until, 'while')
-        end
-
-        it 'registers an offence for multiline until that fits on one line' do
-          check_really_short(while_until, 'until')
-        end
-
-        it "accepts multiline until that doesn't fit on one line" do
-          check_too_long(while_until, 'until')
-        end
-
-        it 'accepts multiline until whose body is more than one line' do
-          check_short_multiline(while_until, 'until')
-        end
-
-        it 'accepts an empty condition' do
-          check_empty(if_unless, 'if')
-          check_empty(if_unless, 'unless')
-          check_empty(while_until, 'while')
-          check_empty(while_until, 'until')
-        end
-
-        it 'accepts if/elsif' do
-          inspect_source(if_unless, ['if test',
-                                     '  something',
-                                     'elsif test2',
-                                     '  something_else',
-                                     'end'])
-          expect(if_unless.offences).to be_empty
-        end
-
-        it 'accepts modifier while' do
-          inspect_source(while_until, ['ala while bala'])
-          expect(while_until.offences).to be_empty
-        end
-
-        it 'accepts modifier until' do
-          inspect_source(while_until, ['ala until bala'])
-          expect(while_until.offences).to be_empty
-        end
-
-        def check_empty(cop, keyword)
-          inspect_source(cop, ["#{keyword} cond",
-                               'end'])
-          expect(cop.offences).to be_empty
-        end
-
-        def check_really_short(cop, keyword)
-          inspect_source(cop, ["#{keyword} a",
-                               '  b',
-                               'end'])
-          expect(cop.messages).to eq(
-            ['Favor modifier while/until usage when you have a single-line ' +
-             'body.'])
-          expect(cop.offences.map { |o| o.location.source }).to eq([keyword])
-        end
-
-        def check_too_long(cop, keyword)
-          # This statement is one character too long to fit.
-          condition = 'a' * (40 - keyword.length)
-          body = 'b' * 36
-          expect("  #{body} #{keyword} #{condition}".length).to eq(80)
-
-          inspect_source(cop,
-                         ["  #{keyword} #{condition}",
-                          "    #{body}",
-                          '  end'])
-
-          expect(cop.offences).to be_empty
-        end
-
-        def check_short_multiline(cop, keyword)
-          inspect_source(cop,
-                         ["#{keyword} ENV['COVERAGE']",
-                          "  require 'simplecov'",
-                          '  SimpleCov.start',
-                          'end'])
-          expect(cop.messages).to be_empty
-        end
-      end
-    end
+describe Rubocop::Cop::Style::IfUnlessModifier do
+  subject(:cop) { described_class.new(config) }
+  let(:config) do
+    hash = { 'LineLength' => { 'Max' => 79 } }
+    Rubocop::Config.new(hash)
   end
+
+  it 'registers an offence for multiline if that fits on one line' do
+    # This if statement fits exactly on one line if written as a
+    # modifier.
+    condition = 'a' * 38
+    body = 'b' * 35
+    expect("  #{body} if #{condition}".length).to eq(79)
+
+    inspect_source(cop,
+                   ["  if #{condition}",
+                    "    #{body}",
+                    '  end'])
+    expect(cop.messages).to eq(
+      ['Favor modifier if/unless usage when you have a single-line' +
+       ' body. Another good alternative is the usage of control flow' +
+       ' &&/||.'])
+  end
+
+  it 'registers an offence for short multiline if near an else etc' do
+    inspect_source(cop,
+                   ['if x',
+                    '  y',
+                    'elsif x1',
+                    '  y1',
+                    'else',
+                    '  z',
+                    'end',
+                    'n = a ? 0 : 1',
+                    'm = 3 if m0',
+                    '',
+                    'if a',
+                    '  b',
+                    'end'])
+    expect(cop.offences.size).to eq(1)
+  end
+
+  it "accepts multiline if that doesn't fit on one line" do
+    check_too_long(cop, 'if')
+  end
+
+  it 'accepts multiline if whose body is more than one line' do
+    check_short_multiline(cop, 'if')
+  end
+
+  it 'registers an offence for multiline unless that fits on one line' do
+    inspect_source(cop, ['unless a',
+                         '  b',
+                         'end'])
+    expect(cop.messages).to eq(
+      ['Favor modifier if/unless usage when you have a single-line' +
+       ' body. Another good alternative is the usage of control flow' +
+       ' &&/||.'])
+  end
+
+  it 'accepts code with EOL comment since user might want to keep it' do
+    inspect_source(cop, ['unless a',
+                         '  b # A comment',
+                         'end'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts if-else-end' do
+    inspect_source(cop,
+                   ['if args.last.is_a? Hash then args.pop else ' +
+                    'Hash.new end'])
+    expect(cop.messages).to be_empty
+  end
+
+  it 'accepts an empty condition' do
+    check_empty(cop, 'if')
+    check_empty(cop, 'unless')
+  end
+
+  it 'accepts if/elsif' do
+    inspect_source(cop, ['if test',
+                         '  something',
+                         'elsif test2',
+                         '  something_else',
+                         'end'])
+    expect(cop.offences).to be_empty
+  end
+end
+
+describe Rubocop::Cop::Style::WhileUntilModifier do
+  subject(:cop) { described_class.new(config) }
+  let(:config) do
+    hash = { 'LineLength' => { 'Max' => 79 } }
+    Rubocop::Config.new(hash)
+  end
+
+  it "accepts multiline unless that doesn't fit on one line" do
+    check_too_long(cop, 'unless')
+  end
+
+  it 'accepts multiline unless whose body is more than one line' do
+    check_short_multiline(cop, 'unless')
+  end
+
+  it 'registers an offence for multiline while that fits on one line' do
+    check_really_short(cop, 'while')
+  end
+
+  it "accepts multiline while that doesn't fit on one line" do
+    check_too_long(cop, 'while')
+  end
+
+  it 'accepts multiline while whose body is more than one line' do
+    check_short_multiline(cop, 'while')
+  end
+
+  it 'registers an offence for multiline until that fits on one line' do
+    check_really_short(cop, 'until')
+  end
+
+  it "accepts multiline until that doesn't fit on one line" do
+    check_too_long(cop, 'until')
+  end
+
+  it 'accepts multiline until whose body is more than one line' do
+    check_short_multiline(cop, 'until')
+  end
+
+  it 'accepts an empty condition' do
+    check_empty(cop, 'while')
+    check_empty(cop, 'until')
+  end
+
+  it 'accepts modifier while' do
+    inspect_source(cop, ['ala while bala'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'accepts modifier until' do
+    inspect_source(cop, ['ala until bala'])
+    expect(cop.offences).to be_empty
+  end
+end
+
+def check_empty(cop, keyword)
+  inspect_source(cop, ["#{keyword} cond",
+                       'end'])
+  expect(cop.offences).to be_empty
+end
+
+def check_really_short(cop, keyword)
+  inspect_source(cop, ["#{keyword} a",
+                       '  b',
+                       'end'])
+  expect(cop.messages).to eq(
+    ['Favor modifier while/until usage when you have a single-line ' +
+     'body.'])
+  expect(cop.offences.map { |o| o.location.source }).to eq([keyword])
+end
+
+def check_too_long(cop, keyword)
+  # This statement is one character too long to fit.
+  condition = 'a' * (40 - keyword.length)
+  body = 'b' * 36
+  expect("  #{body} #{keyword} #{condition}".length).to eq(80)
+
+  inspect_source(cop,
+                 ["  #{keyword} #{condition}",
+                  "    #{body}",
+                  '  end'])
+
+  expect(cop.offences).to be_empty
+end
+
+def check_short_multiline(cop, keyword)
+  inspect_source(cop,
+                 ["#{keyword} ENV['COVERAGE']",
+                  "  require 'simplecov'",
+                  '  SimpleCov.start',
+                  'end'])
+  expect(cop.messages).to be_empty
 end