rubocop 0.27.1 → 0.28.0

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

@@ -18,7 +18,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
       end
 
       context 'regarding assignment where the right hand side is a case' do
-        it 'accepts a correcty indented assignment' do
+        it 'accepts a correctly indented assignment' do
           source = ['output = case variable',
                     "         when 'value1'",
                     "           'output1'",
@@ -156,7 +156,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
       end
 
       context 'regarding assignment where the right hand side is a case' do
-        it 'accepts a correcty indented assignment' do
+        it 'accepts a correctly indented assignment' do
           source = ['output = case variable',
                     "           when 'value1'",
                     "             'output1'",
@@ -220,7 +220,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
       end
 
       context 'regarding assignment where the right hand side is a case' do
-        it 'accepts a correcty indented assignment' do
+        it 'accepts a correctly indented assignment' do
           source = ['output = case variable',
                     "when 'value1'",
                     "  'output1'",
@@ -250,7 +250,7 @@ describe RuboCop::Cop::Style::CaseIndentation do
       end
 
       context 'regarding assignment where the right hand side is a case' do
-        it 'accepts a correcty indented assignment' do
+        it 'accepts a correctly indented assignment' do
           source = ['output = case variable',
                     "  when 'value1'",
                     "    'output1'",

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

@@ -3,7 +3,6 @@
 require 'spec_helper'
 
 describe RuboCop::Cop::Style::Documentation do
-
   subject(:cop) { described_class.new(config) }
   let(:config) do
     RuboCop::Config.new('Style/CommentAnnotation' => {

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

@@ -84,7 +84,7 @@ describe RuboCop::Cop::Style::ElseAlignment do
     context 'with assignment' do
       context 'when alignment style is variable' do
         context 'and end is aligned with variable' do
-          it 'accepts an if with end aligned with setter' do
+          it 'accepts an if-else with end aligned with setter' do
             inspect_source(cop,
                            ['foo.bar = if baz',
                             '  derp1',
@@ -94,6 +94,18 @@ describe RuboCop::Cop::Style::ElseAlignment do
             expect(cop.offenses).to be_empty
           end
 
+          it 'accepts an if-elsif-else with end aligned with setter' do
+            inspect_source(cop,
+                           ['foo.bar = if baz',
+                            '  derp1',
+                            'elsif meh',
+                            '  derp2',
+                            'else',
+                            '  derp3',
+                            'end'])
+            expect(cop.offenses).to be_empty
+          end
+
           it 'accepts an if with end aligned with element assignment' do
             inspect_source(cop,
                            ['foo[bar] = if baz',
@@ -134,14 +146,17 @@ describe RuboCop::Cop::Style::ElseAlignment do
         end
 
         context 'and end is aligned with keyword' do
-          it 'registers an offense for an if with setter' do
+          it 'registers offenses for an if with setter' do
             inspect_source(cop,
                            ['foo.bar = if baz',
                             '            derp1',
-                            '          else',
+                            '          elsif meh',
                             '            derp2',
+                            '          else',
+                            '            derp3',
                             '          end'])
-            expect(cop.messages).to eq(['Align `else` with `foo.bar`.'])
+            expect(cop.messages).to eq(['Align `elsif` with `foo.bar`.',
+                                        'Align `else` with `foo.bar`.'])
           end
 
           it 'registers an offense for an if with element assignment' do
@@ -431,7 +446,51 @@ describe RuboCop::Cop::Style::ElseAlignment do
     end
   end
 
+  context 'with def/rescue/else/ensure/end' do
+    it 'accepts a correctly aligned else' do
+      inspect_source(cop,
+                     ['def my_func(string)',
+                      '  puts string',
+                      'rescue => e',
+                      '  puts e',
+                      'else',
+                      '  puts e',
+                      'ensure',
+                      "  puts 'I love methods that print'",
+                      'end'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for misaligned else' do
+      inspect_source(cop,
+                     ['def my_func(string)',
+                      '  puts string',
+                      'rescue => e',
+                      '  puts e',
+                      '  else',
+                      '  puts e',
+                      'ensure',
+                      "  puts 'I love methods that print'",
+                      'end'])
+      expect(cop.messages).to eq(['Align `else` with `def`.'])
+    end
+  end
+
   context 'with def/rescue/else/end' do
+    it 'accepts a correctly aligned else' do
+      inspect_source(cop,
+                     ['def my_func',
+                      "  puts 'do something error prone'",
+                      'rescue SomeException',
+                      "  puts 'error handling'",
+                      'rescue',
+                      "  puts 'error handling'",
+                      'else',
+                      "  puts 'normal handling'",
+                      'end'])
+      expect(cop.messages).to be_empty
+    end
+
     it 'registers an offense for misaligned else' do
       inspect_source(cop,
                      ['def my_func',

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

@@ -0,0 +1,100 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::EmptyElse do
+  subject(:cop) { described_class.new(config) }
+  let(:config) do
+    RuboCop::Config.new
+  end
+
+  context 'given an if-statement' do
+    context 'with a completely empty else-clause' do
+      it 'registers an offense' do
+        inspect_source(cop, 'if a; foo else end')
+        expect(cop.messages).to eq(['Redundant empty `else`-clause.'])
+      end
+    end
+
+    context 'with an else-clause containing only the literal nil' do
+      it 'registers an offense' do
+        inspect_source(cop, 'if a; foo elsif b; bar else nil end')
+        expect(cop.messages).to eq(['Redundant empty `else`-clause.'])
+      end
+    end
+
+    context 'with an else-clause with side-effects' do
+      it "doesn't register an offence" do
+        inspect_source(cop, 'if cond; foo else bar; nil end')
+        expect(cop.messages).to be_empty
+      end
+    end
+
+    context 'with no else-clause' do
+      it "doesn't register an offence" do
+        inspect_source(cop, 'if cond; foo end')
+        expect(cop.messages).to be_empty
+      end
+    end
+  end
+
+  context 'given an unless-statement' do
+    context 'with a completely empty else-clause' do
+      it 'registers an offense' do
+        inspect_source(cop, 'unless cond; foo else end')
+        expect(cop.messages).to eq(['Redundant empty `else`-clause.'])
+      end
+    end
+
+    context 'with an else-clause containing only the literal nil' do
+      it 'registers an offense' do
+        inspect_source(cop, 'unless cond; foo else nil end')
+        expect(cop.messages).to eq(['Redundant empty `else`-clause.'])
+      end
+    end
+
+    context 'with an else-clause with side-effects' do
+      it "doesn't register an offence" do
+        inspect_source(cop, 'unless cond; foo else bar; nil end')
+        expect(cop.messages).to be_empty
+      end
+    end
+
+    context 'with no else-clause' do
+      it "doesn't register an offence" do
+        inspect_source(cop, 'unless cond; foo end')
+        expect(cop.messages).to be_empty
+      end
+    end
+  end
+
+  context 'given a case statement' do
+    context 'with a completely empty else-clause' do
+      it 'registers an offense' do
+        inspect_source(cop, 'case v; when a; foo else end')
+        expect(cop.messages).to eq(['Redundant empty `else`-clause.'])
+      end
+    end
+
+    context 'with an else-clause containing only the literal nil' do
+      it 'registers an offense' do
+        inspect_source(cop, 'case v; when a; foo; when b; bar; else nil end')
+        expect(cop.messages).to eq(['Redundant empty `else`-clause.'])
+      end
+    end
+
+    context 'with an else-clause with side-effects' do
+      it "doesn't register an offence" do
+        inspect_source(cop, 'case v; when a; foo; else b; nil end')
+        expect(cop.messages).to be_empty
+      end
+    end
+
+    context 'with no else-clause' do
+      it "doesn't register an offence" do
+        inspect_source(cop, 'case v; when a; foo; when b; bar; end')
+        expect(cop.messages).to be_empty
+      end
+    end
+  end
+end

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

@@ -0,0 +1,103 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::EmptyLinesAroundBlockBody, :config do
+  subject(:cop) { described_class.new(config) }
+
+  # Test blocks using both {} and do..end
+  [%w({ }), %w(do end)].each do |open, close|
+    context "when EnforcedStyle is no_empty_lines for #{open} #{close} block" do
+      let(:cop_config) { { 'EnforcedStyle' => 'no_empty_lines' } }
+
+      it 'registers an offense for block body starting with a blank' do
+        inspect_source(cop,
+                       ["some_method #{open}",
+                        '',
+                        '  do_something',
+                        "#{close}"])
+        expect(cop.messages)
+          .to eq(['Extra empty line detected at block body beginning.'])
+      end
+
+      it 'autocorrects block body containing only a blank' do
+        corrected = autocorrect_source(cop,
+                                       ["some_method #{open}",
+                                        '',
+                                        "#{close}"])
+        expect(corrected).to eq ["some_method #{open}",
+                                 "#{close}"].join("\n")
+      end
+
+      it 'registers an offense for block body ending with a blank' do
+        inspect_source(cop,
+                       ["some_method #{open}",
+                        '  do_something',
+                        '',
+                        "#{close}"])
+        expect(cop.messages)
+          .to eq(['Extra empty line detected at block body end.'])
+      end
+
+      it 'accepts block body starting with a line with spaces' do
+        inspect_source(cop,
+                       ["some_method #{open}",
+                        '  ',
+                        '  do_something',
+                        "#{close}"])
+        expect(cop.offenses).to be_empty
+      end
+
+      it 'is not fooled by single line blocks' do
+        inspect_source(cop,
+                       ["some_method #{open} do_something #{close}",
+                        '',
+                        'something_else'])
+        expect(cop.offenses).to be_empty
+      end
+    end
+
+    context "when EnforcedStyle is empty_lines for #{open} #{close} block" do
+      let(:cop_config) { { 'EnforcedStyle' => 'empty_lines' } }
+
+      it 'registers an offense for block body not starting or ending with a ' \
+         'blank' do
+        inspect_source(cop,
+                       ["some_method #{open}",
+                        '  do_something',
+                        "#{close}"])
+        expect(cop.messages).to eq(['Empty line missing at block body '\
+                                    'beginning.',
+                                    'Empty line missing at block body end.'])
+      end
+
+      it 'autocorrects block body containing nothing' do
+        corrected = autocorrect_source(cop,
+                                       ["some_method #{open}",
+                                        "#{close}"])
+        expect(corrected).to eq ["some_method #{open}",
+                                 '',
+                                 "#{close}"].join("\n")
+      end
+
+      it 'autocorrects beginning and end' do
+        new_source = autocorrect_source(cop,
+                                        ["some_method #{open}",
+                                         '  do_something',
+                                         "#{close}"])
+        expect(new_source).to eq(["some_method #{open}",
+                                  '',
+                                  '  do_something',
+                                  '',
+                                  "#{close}"].join("\n"))
+      end
+
+      it 'is not fooled by single line blocks' do
+        inspect_source(cop,
+                       ["some_method #{open} do_something #{close}",
+                        'something_else'])
+        expect(cop.offenses).to be_empty
+      end
+    end
+  end
+end

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

@@ -15,7 +15,7 @@ describe RuboCop::Cop::Style::EmptyLinesAroundMethodBody do
       .to eq(['Extra empty line detected at method body beginning.'])
   end
 
-  # The cop only registers an offense if the extra line is completely emtpy. If
+  # The cop only registers an offense if the extra line is completely empty. If
   # there is trailing whitespace, then that must be dealt with first. Having
   # two cops registering offense for the line with only spaces would cause
   # havoc in auto-correction.

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

@@ -11,7 +11,7 @@ describe RuboCop::Cop::Style::EndOfLine do
     expect(cop.messages).to eq(['Carriage return character detected.'])
   end
 
-  it 'highlights the whole offendng line' do
+  it 'highlights the whole offending line' do
     inspect_source_file(cop, ['x=0', '', "y=1\r"])
     expect(cop.highlights).to eq(["y=1\r"])
   end
@@ -56,7 +56,7 @@ describe RuboCop::Cop::Style::EndOfLine do
   end
 
   context 'when source is a string' do
-    it 'registers an offence' do
+    it 'registers an offense' do
       inspect_source(cop, ["x=0\r"])
 
       expect(cop.messages).to eq(['Carriage return character detected.'])

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

@@ -0,0 +1,68 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Style::ExtraSpacing do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offense for double extra spacing on variable assignment' do
+    inspect_source(cop, ['m    = "hello"'])
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'ignores whitespace at the beginning of the line' do
+    inspect_source(cop, ['  m = "hello"'])
+    expect(cop.offenses.size).to eq(0)
+  end
+
+  it 'ignores whitespace inside a string' do
+    inspect_source(cop, ['m = "hello   this"'])
+    expect(cop.offenses.size).to eq(0)
+  end
+
+  it 'does not permit you to line up assignments' do
+    inspect_source(cop, [
+      'website = "example.org"',
+      'name    = "Jill"'
+    ])
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'gives the correct line' do
+    inspect_source(cop, [
+      'website = "example.org"',
+      'name    = "Jill"'
+    ])
+    expect(cop.offenses.first.location.line).to eq(2)
+  end
+
+  it 'registers an offense on class inheritance' do
+    inspect_source(cop, [
+      'class A   < String',
+      'end'
+    ])
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'auto-corrects a line indented with mixed whitespace' do
+    new_source = autocorrect_source(cop, [
+      'website = "example.org"',
+      'name    = "Jill"'
+    ])
+    expect(new_source).to eq([
+      'website = "example.org"',
+      'name = "Jill"'
+    ].join("\n"))
+  end
+
+  it 'auto-corrects the class inheritance' do
+    new_source = autocorrect_source(cop, [
+      'class A   < String',
+      'end'
+    ])
+    expect(new_source).to eq([
+      'class A < String',
+      'end'
+    ].join("\n"))
+  end
+end

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

@@ -57,6 +57,11 @@ describe RuboCop::Cop::Style::LeadingCommentSpace do
     expect(cop.offenses).to be_empty
   end
 
+  it 'accepts sprockets directives' do
+    inspect_source(cop, '#= require_tree .')
+    expect(cop.offenses).to be_empty
+  end
+
   it 'auto-corrects missing space' do
     new_source = autocorrect_source(cop, '#comment')
     expect(new_source).to eq('# comment')