rubocop 0.13.1 → 0.14.0

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

@@ -2,27 +2,21 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe AsciiComments do
-        subject(:ascii) { AsciiComments.new }
+describe Rubocop::Cop::Style::AsciiComments do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for a comment with non-ascii chars' do
-          inspect_source(ascii,
-                         ['# encoding: utf-8',
-                          '# 这是什么？'])
-          expect(ascii.offences.size).to eq(1)
-          expect(ascii.messages)
-            .to eq([AsciiComments::MSG])
-        end
+  it 'registers an offence for a comment with non-ascii chars' do
+    inspect_source(cop,
+                   ['# encoding: utf-8',
+                    '# 这是什么？'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Use only ascii symbols in comments.'])
+  end
 
-        it 'accepts comments with only ascii chars' do
-          inspect_source(ascii,
-                         ['# AZaz1@$%~,;*_`|'])
-          expect(ascii.offences).to be_empty
-        end
-      end
-    end
+  it 'accepts comments with only ascii chars' do
+    inspect_source(cop,
+                   ['# AZaz1@$%~,;*_`|'])
+    expect(cop.offences).to be_empty
   end
 end

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

@@ -2,41 +2,35 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe AsciiIdentifiers do
-        subject(:ascii) { AsciiIdentifiers.new }
+describe Rubocop::Cop::Style::AsciiIdentifiers do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for a variable name with non-ascii chars' do
-          inspect_source(ascii,
-                         ['# encoding: utf-8',
-                          'älg = 1'])
-          expect(ascii.offences.size).to eq(1)
-          expect(ascii.messages)
-            .to eq([AsciiIdentifiers::MSG])
-        end
+  it 'registers an offence for a variable name with non-ascii chars' do
+    inspect_source(cop,
+                   ['# encoding: utf-8',
+                    'älg = 1'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['Use only ascii symbols in identifiers.'])
+  end
 
-        it 'accepts identifiers with only ascii chars' do
-          inspect_source(ascii,
-                         ['x.empty?'])
-          expect(ascii.offences).to be_empty
-        end
+  it 'accepts identifiers with only ascii chars' do
+    inspect_source(cop,
+                   ['x.empty?'])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'does not get confused by a byte order mark' do
-          bom = "\xef\xbb\xbf"
-          inspect_source(ascii,
-                         [bom + '# encoding: utf-8',
-                          "puts 'foo'"])
-          expect(ascii.offences).to be_empty
-        end
+  it 'does not get confused by a byte order mark' do
+    bom = "\xef\xbb\xbf"
+    inspect_source(cop,
+                   [bom + '# encoding: utf-8',
+                    "puts 'foo'"])
+    expect(cop.offences).to be_empty
+  end
 
-        it 'does not get confused by an empty file' do
-          inspect_source(ascii,
-                         [''])
-          expect(ascii.offences).to be_empty
-        end
-      end
-    end
+  it 'does not get confused by an empty file' do
+    inspect_source(cop,
+                   [''])
+    expect(cop.offences).to be_empty
   end
 end

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

@@ -2,24 +2,18 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe Attr do
-        subject(:cop) { described_class.new }
+describe Rubocop::Cop::Style::Attr do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence attr' do
-          inspect_source(cop, ['class SomeClass',
-                               '  attr :name',
-                               'end'])
-          expect(cop.offences.size).to eq(1)
-        end
+  it 'registers an offence attr' do
+    inspect_source(cop, ['class SomeClass',
+                         '  attr :name',
+                         'end'])
+    expect(cop.offences.size).to eq(1)
+  end
 
-        it 'auto-corrects attr to attr_reader' do
-          new_source = autocorrect_source(cop, 'attr')
-          expect(new_source).to eq('attr_reader')
-        end
-      end
-    end
+  it 'auto-corrects attr to attr_reader' do
+    new_source = autocorrect_source(cop, 'attr')
+    expect(new_source).to eq('attr_reader')
   end
 end

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

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

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

@@ -2,26 +2,20 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe BlockComments do
-        subject(:block) { BlockComments.new }
+describe Rubocop::Cop::Style::BlockComments do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for block comments' do
-          inspect_source(block,
-                         ['=begin',
-                          'comment',
-                          '=end'])
-          expect(block.offences.size).to eq(1)
-        end
+  it 'registers an offence for block comments' do
+    inspect_source(cop,
+                   ['=begin',
+                    'comment',
+                    '=end'])
+    expect(cop.offences.size).to eq(1)
+  end
 
-        it 'accepts regular comments' do
-          inspect_source(block,
-                         ['# comment'])
-          expect(block.offences).to be_empty
-        end
-      end
-    end
+  it 'accepts regular comments' do
+    inspect_source(cop,
+                   ['# comment'])
+    expect(cop.offences).to be_empty
   end
 end

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

@@ -2,158 +2,152 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe BlockNesting, :config do
-        subject(:block_nesting) { BlockNesting.new(config) }
-        let(:cop_config) { { 'Max' => 2 } }
+describe Rubocop::Cop::Style::BlockNesting, :config do
+  subject(:cop) { described_class.new(config) }
+  let(:cop_config) { { 'Max' => 2 } }
 
-        it 'accepts `Max` levels of nesting' do
-          source = ['if a',
-                    '  if b',
-                    '    puts b',
-                    '  end',
-                    'end']
-          expect_nesting_offences(source, [])
-        end
+  it 'accepts `Max` levels of nesting' do
+    source = ['if a',
+              '  if b',
+              '    puts b',
+              '  end',
+              'end']
+    expect_nesting_offences(source, [])
+  end
 
-        it 'registers an offence for `Max + 1` levels of `if` nesting' do
-          source = ['if a',
-                    '  if b',
-                    '    if c',
-                    '      puts c',
-                    '    end',
-                    '  end',
-                    'end']
-          expect_nesting_offences(source, [3])
-        end
+  it 'registers an offence for `Max + 1` levels of `if` nesting' do
+    source = ['if a',
+              '  if b',
+              '    if c',
+              '      puts c',
+              '    end',
+              '  end',
+              'end']
+    expect_nesting_offences(source, [3])
+  end
 
-        it 'registers a single offence for `Max + 2` levels of `if` nesting' do
-          source = ['if a',
-                    '  if b',
-                    '    if c',
-                    '      if d',
-                    '        puts d',
-                    '      end',
-                    '    end',
-                    '  end',
-                    'end']
-          expect_nesting_offences(source, [3])
-        end
+  it 'registers a single offence for `Max + 2` levels of `if` nesting' do
+    source = ['if a',
+              '  if b',
+              '    if c',
+              '      if d',
+              '        puts d',
+              '      end',
+              '    end',
+              '  end',
+              'end']
+    expect_nesting_offences(source, [3])
+  end
 
-        it 'registers 2 offences' do
-          source = ['if a',
-                    '  if b',
-                    '    if c',
-                    '      puts c',
-                    '    end',
-                    '  end',
-                    '  if d',
-                    '    if e',
-                    '      puts e',
-                    '    end',
-                    '  end',
-                    'end']
-          expect_nesting_offences(source, [3, 8])
-        end
+  it 'registers 2 offences' do
+    source = ['if a',
+              '  if b',
+              '    if c',
+              '      puts c',
+              '    end',
+              '  end',
+              '  if d',
+              '    if e',
+              '      puts e',
+              '    end',
+              '  end',
+              'end']
+    expect_nesting_offences(source, [3, 8])
+  end
 
-        it 'registers an offence for nested `case`' do
-          source = ['if a',
-                    '  if b',
-                    '    case c',
-                    '      when C',
-                    '        puts C',
-                    '    end',
-                    '  end',
-                    'end']
-          expect_nesting_offences(source, [3])
-        end
+  it 'registers an offence for nested `case`' do
+    source = ['if a',
+              '  if b',
+              '    case c',
+              '      when C',
+              '        puts C',
+              '    end',
+              '  end',
+              'end']
+    expect_nesting_offences(source, [3])
+  end
 
-        it 'registers an offence for nested `while`' do
-          source = ['if a',
-                    '  if b',
-                    '    while c',
-                    '      puts c',
-                    '    end',
-                    '  end',
-                    'end']
-          expect_nesting_offences(source, [3])
-        end
+  it 'registers an offence for nested `while`' do
+    source = ['if a',
+              '  if b',
+              '    while c',
+              '      puts c',
+              '    end',
+              '  end',
+              'end']
+    expect_nesting_offences(source, [3])
+  end
 
-        it 'registers an offence for nested modifier `while`' do
-          source = ['if a',
-                    '  if b',
-                    '    begin',
-                    '      puts c',
-                    '    end while c',
-                    '  end',
-                    'end']
-          expect_nesting_offences(source, [3])
-        end
+  it 'registers an offence for nested modifier `while`' do
+    source = ['if a',
+              '  if b',
+              '    begin',
+              '      puts c',
+              '    end while c',
+              '  end',
+              'end']
+    expect_nesting_offences(source, [3])
+  end
 
-        it 'registers an offence for nested `until`' do
-          source = ['if a',
-                    '  if b',
-                    '    until c',
-                    '      puts c',
-                    '    end',
-                    '  end',
-                    'end']
-          expect_nesting_offences(source, [3])
-        end
+  it 'registers an offence for nested `until`' do
+    source = ['if a',
+              '  if b',
+              '    until c',
+              '      puts c',
+              '    end',
+              '  end',
+              'end']
+    expect_nesting_offences(source, [3])
+  end
 
-        it 'registers an offence for nested modifier `until`' do
-          source = ['if a',
-                    '  if b',
-                    '    begin',
-                    '      puts c',
-                    '    end until c',
-                    '  end',
-                    'end']
-          expect_nesting_offences(source, [3])
-        end
+  it 'registers an offence for nested modifier `until`' do
+    source = ['if a',
+              '  if b',
+              '    begin',
+              '      puts c',
+              '    end until c',
+              '  end',
+              'end']
+    expect_nesting_offences(source, [3])
+  end
 
-        it 'registers an offence for nested `for`' do
-          source = ['if a',
-                    '  if b',
-                    '    for c in [1,2] do',
-                    '      puts c',
-                    '    end',
-                    '  end',
-                    'end']
-          expect_nesting_offences(source, [3])
-        end
+  it 'registers an offence for nested `for`' do
+    source = ['if a',
+              '  if b',
+              '    for c in [1,2] do',
+              '      puts c',
+              '    end',
+              '  end',
+              'end']
+    expect_nesting_offences(source, [3])
+  end
 
-        it 'registers an offence for nested `rescue`' do
-          source = ['if a',
-                    '  if b',
-                    '    begin',
-                    '      puts c',
-                    '    rescue',
-                    '      puts x',
-                    '    end',
-                    '  end',
-                    'end']
-          expect_nesting_offences(source, [5])
-        end
+  it 'registers an offence for nested `rescue`' do
+    source = ['if a',
+              '  if b',
+              '    begin',
+              '      puts c',
+              '    rescue',
+              '      puts x',
+              '    end',
+              '  end',
+              'end']
+    expect_nesting_offences(source, [5])
+  end
 
-        it 'accepts if/elsif' do
-          source = ['if a',
-                    'elsif b',
-                    'elsif c',
-                    'elsif d',
-                    'end']
-          expect_nesting_offences(source, [])
-        end
+  it 'accepts if/elsif' do
+    source = ['if a',
+              'elsif b',
+              'elsif c',
+              'elsif d',
+              'end']
+    expect_nesting_offences(source, [])
+  end
 
-        def expect_nesting_offences(source, lines)
-          inspect_source(block_nesting, source)
-          expect(block_nesting.offences.map(&:line)).to eq(lines)
-          expect(block_nesting.messages).to eq(
-            ['Avoid more than 2 levels of block nesting.'] * lines.length)
-        end
-      end
-    end
+  def expect_nesting_offences(source, lines)
+    inspect_source(cop, source)
+    expect(cop.offences.map(&:line)).to eq(lines)
+    expect(cop.messages).to eq(
+      ['Avoid more than 2 levels of block nesting.'] * lines.length)
   end
 end