rubocop 0.9.1 → 0.10.0

data/spec/rubocop/cops/lint/assignment_in_condition_spec.rb

@@ -99,10 +99,10 @@ module Rubocop
 
           it 'does not accepts = in condition surrounded with braces' do
             inspect_source(cop,
-                           ['if (test == 10)',
+                           ['if (test = 10)',
                            'end'
                            ])
-            expect(cop.offences).to be_empty
+            expect(cop.offences.size).to eq(1)
           end
         end
       end

data/spec/rubocop/cops/lint/block_alignment_spec.rb

@@ -0,0 +1,357 @@
+# encoding: utf-8
+# rubocop:disable LineLength
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Lint
+      describe BlockAlignment do
+        let(:cop) { BlockAlignment.new }
+
+        it 'registers an offence for mismatched block end' do
+          inspect_source(cop,
+                         ['test do |ala|',
+                          '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        context 'when the block is a logical operand' do
+          it 'accepts a correctly aligned block end' do
+            inspect_source(cop,
+                           ['(value.is_a? Array) && value.all? do |subvalue|',
+                            '  type_check_value(subvalue, array_type)',
+                            'end',
+                            'a || b do',
+                            'end',
+                           ])
+            expect(cop.offences).to be_empty
+          end
+        end
+
+        it 'accepts end aligned with a variable' do
+          inspect_source(cop,
+                         ['variable = test do |ala|',
+                         'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        context 'when there is an assignment chain' do
+          it 'registers an offence for an end aligned with the 2nd variable' do
+            inspect_source(cop,
+                           ['a = b = c = test do |ala|',
+                            '    end'
+                           ])
+            expect(cop.offences.size).to eq(1)
+          end
+
+          it 'accepts end aligned with the first variable' do
+            inspect_source(cop,
+                           ['a = b = c = test do |ala|',
+                            'end',
+                           ])
+            expect(cop.offences).to be_empty
+          end
+        end
+
+        context 'and the block is an operand' do
+          it 'accepts end aligned with a variable' do
+            inspect_source(cop,
+                           ['b = 1 + preceding_line.reduce(0) do |a, e|',
+                           '  a + e.length + newline_length',
+                           'end + 1'
+                           ])
+            expect(cop.offences).to be_empty
+          end
+        end
+
+        it 'registers an offence for mismatched block end with a variable' do
+          inspect_source(cop,
+                         ['variable = test do |ala|',
+                         '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        context 'when the block is defined on the next line' do
+          it 'accepts end aligned with the block expression' do
+            inspect_source(cop,
+                           ['variable =',
+                            '  a_long_method_that_dont_fit_on_the_line do |v|',
+                            '    v.foo',
+                            '  end'
+                           ])
+            expect(cop.offences).to be_empty
+          end
+
+          it 'registers an offences for mismatched end alignment' do
+            inspect_source(cop,
+                           ['variable =',
+                            '  a_long_method_that_dont_fit_on_the_line do |v|',
+                            '    v.foo',
+                            'end'
+                           ])
+            expect(cop.offences.size).to eq(1)
+          end
+        end
+
+        context 'when the method part is a call chain that spans several lines' do
+          it 'accepts end aligned with first character of line where do is' do
+            src = ['def foo(bar)',
+                   '  bar.get_stuffs',
+                   '      .reject do |stuff| ',
+                   '        stuff.with_a_very_long_expression_that_doesnt_fit_the_line',
+                   '      end.select do |stuff|',
+                   '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
+                   '      end',
+                   '      .select do |stuff|',
+                   '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
+                   '      end',
+                   'end']
+            inspect_source(cop, src)
+            expect(cop.offences.map(&:message)).to eq([])
+          end
+
+          it 'registers offences for misaligned ends' do
+            src = ['def foo(bar)',
+                   '  bar.get_stuffs',
+                   '      .reject do |stuff| ',
+                   '        stuff.with_a_very_long_expression_that_doesnt_fit_the_line',
+                   '        end.select do |stuff|',
+                   '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
+                   '    end',
+                   '      .select do |stuff|',
+                   '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
+                   '        end',
+                   'end']
+            inspect_source(cop, src)
+            expect(cop.offences).to have(3).items
+          end
+        end
+
+        context 'when variables of a mass assignment spans several lines' do
+          it 'accepts end aligned with the variables' do
+            src = ['e,',
+                   'f = [5, 6].map do |i|',
+                   '  i - 5',
+                   'end']
+            inspect_source(cop, src)
+            expect(cop.offences.map(&:message)).to eq([])
+          end
+
+          it 'registers an offence for end aligned with the block' do
+            src = ['e,',
+                   'f = [5, 6].map do |i|',
+                   '  i - 5',
+                   '    end']
+            inspect_source(cop, src)
+            expect(cop.offences).to have(1).item
+          end
+        end
+
+        it 'accepts end aligned with an instance variable' do
+          inspect_source(cop,
+                         ['@variable = test do |ala|',
+                         'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'registers an offence for mismatched block end with an instance variable' do
+          inspect_source(cop,
+                         ['@variable = test do |ala|',
+                         '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'accepts end aligned with a class variable' do
+          inspect_source(cop,
+                         ['@@variable = test do |ala|',
+                         'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'registers an offence for mismatched block end with a class variable' do
+          inspect_source(cop,
+                         ['@@variable = test do |ala|',
+                         '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'accepts end aligned with a global variable' do
+          inspect_source(cop,
+                         ['$variable = test do |ala|',
+                         'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'registers an offence for mismatched block end with a global variable' do
+          inspect_source(cop,
+                         ['$variable = test do |ala|',
+                         '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'accepts end aligned with a constant' do
+          inspect_source(cop,
+                         ['CONSTANT = test do |ala|',
+                         'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'registers an offence for mismatched block end with a constant' do
+          inspect_source(cop,
+                         ['Module::CONSTANT = test do |ala|',
+                         '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'accepts end aligned with a method call' do
+          inspect_source(cop,
+                         ['parser.childs << lambda do |token|',
+                         '  token << 1',
+                         'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'registers an offence for mismatched block end with a method call' do
+          inspect_source(cop,
+                         ['parser.childs << lambda do |token|',
+                         '  token << 1',
+                         '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'accepts end aligned with a method call with arguments' do
+          inspect_source(cop,
+                         ['@h[:f] = f.each_pair.map do |f, v|',
+                         '  v = 1',
+                         'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'registers an offence for mismatched end with a method call with arguments' do
+          inspect_source(cop,
+                         ['@h[:f] = f.each_pair.map do |f, v|',
+                         '  v = 1',
+                         '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'does not raise an error for nested block in a method call' do
+          inspect_source(cop,
+                         ['expect(arr.all? { |o| o.valid? })'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts end aligned with the block when the block is a method argument' do
+          inspect_source(cop,
+                         ['expect(arr.all? do |o|',
+                          '         o.valid?',
+                          '       end)'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'registers an offence for mismatched end not aligned with the block that is an argument' do
+          inspect_source(cop,
+                         ['expect(arr.all? do |o|',
+                          '  o.valid?',
+                          '  end)'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'accepts end aligned with an op-asgn (+=, -=)' do
+          inspect_source(cop,
+                         ['rb += files.select do |file|',
+                         '  file << something',
+                         'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'registers an offence for mismatched block end with an op-asgn (+=, -=)' do
+          inspect_source(cop,
+                         ['rb += files.select do |file|',
+                         '  file << something',
+                         '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'accepts end aligned with an and-asgn (&&=)' do
+          inspect_source(cop,
+                         ['variable &&= test do |ala|',
+                         'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'registers an offence for mismatched block end with an and-asgn (&&=)' do
+          inspect_source(cop,
+                         ['variable &&= test do |ala|',
+                         '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'accepts end aligned with an or-asgn (||=)' do
+          inspect_source(cop,
+                         ['variable ||= test do |ala|',
+                         'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'registers an offence for mismatched block end with an or-asgn (||=)' do
+          inspect_source(cop,
+                         ['variable ||= test do |ala|',
+                         '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+
+        it 'accepts end aligned with a mass assignment' do
+          inspect_source(cop,
+                         ['var1, var2 = lambda do |test|',
+                         '  [1, 2]',
+                         'end'
+                         ])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'accepts end aligned with a call chain left hand side' do
+          inspect_source(cop,
+                         ['parser.diagnostics.consumer = lambda do |diagnostic|',
+                          '  diagnostics << diagnostic',
+                          'end'])
+          expect(cop.offences).to be_empty
+        end
+
+        it 'registers an offence for mismatched block end with a mass assignment' do
+          inspect_source(cop,
+                         ['var1, var2 = lambda do |test|',
+                         '  [1, 2]',
+                         '  end'
+                         ])
+          expect(cop.offences.size).to eq(1)
+        end
+      end
+    end
+  end
+end

data/spec/rubocop/cops/lint/empty_ensure_spec.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    module Lint
+      describe EmptyEnsure do
+        let(:cop) { EmptyEnsure.new }
+
+        it 'registers an offence for empty ensure' do
+          inspect_source(cop,
+                         ['begin',
+                          '  something',
+                          'ensure',
+                          'end'])
+          expect(cop.offences).to have(1).item
+        end
+
+        it 'does not register an offence for non-empty ensure' do
+          inspect_source(cop,
+                         ['begin',
+                          '  something',
+                          '  return',
+                          'ensure',
+                          '  file.close',
+                          'end'])
+          expect(cop.offences).to be_empty
+        end
+      end
+    end
+  end
+end

data/spec/rubocop/cops/lint/end_alignment_spec.rb

@@ -64,269 +64,6 @@ module Rubocop
                          ])
           expect(cop.offences.size).to eq(1)
         end
-
-        it 'registers an offence for mismatched block end' do
-          inspect_source(cop,
-                         ['test do |ala|',
-                          '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        context 'when the block is a logical operand' do
-          it 'accepts a correctly aligned block end' do
-            inspect_source(cop,
-                           ['(value.is_a? Array) && value.all? do |subvalue|',
-                            '  type_check_value(subvalue, array_type)',
-                            'end',
-                            'a || b do',
-                            'end',
-                           ])
-            expect(cop.offences).to be_empty
-          end
-        end
-
-        it 'accepts end aligned with a variable' do
-          inspect_source(cop,
-                         ['variable = test do |ala|',
-                         'end'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        context 'and the block is an operand' do
-          it 'accepts end aligned with a variable' do
-            inspect_source(cop,
-                           ['b = 1 + preceding_line.reduce(0) do |a, e|',
-                           '  a + e.length + newline_length',
-                           'end + 1'
-                           ])
-            expect(cop.offences).to be_empty
-          end
-        end
-
-        it 'registers an offence for mismatched block end with a variable' do
-          inspect_source(cop,
-                         ['variable = test do |ala|',
-                         '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        context 'when the block is defined on the next line' do
-          it 'accepts end aligned with the block expression' do
-            inspect_source(cop,
-                           ['variable =',
-                            '  a_long_method_that_dont_fit_on_the_line do |v|',
-                            '    v.foo',
-                            '  end'
-                           ])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'registers an offences for mismatched end alignment' do
-            inspect_source(cop,
-                           ['variable =',
-                            '  a_long_method_that_dont_fit_on_the_line do |v|',
-                            '    v.foo',
-                            'end'
-                           ])
-            expect(cop.offences.size).to eq(1)
-          end
-        end
-
-        it 'accepts end aligned with an instance variable' do
-          inspect_source(cop,
-                         ['@variable = test do |ala|',
-                         'end'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mismatched block end with an instance variable' do
-          inspect_source(cop,
-                         ['@variable = test do |ala|',
-                         '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'accepts end aligned with a class variable' do
-          inspect_source(cop,
-                         ['@@variable = test do |ala|',
-                         'end'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mismatched block end with a class variable' do
-          inspect_source(cop,
-                         ['@@variable = test do |ala|',
-                         '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'accepts end aligned with a global variable' do
-          inspect_source(cop,
-                         ['$variable = test do |ala|',
-                         'end'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mismatched block end with a global variable' do
-          inspect_source(cop,
-                         ['$variable = test do |ala|',
-                         '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'accepts end aligned with a constant' do
-          inspect_source(cop,
-                         ['CONSTANT = test do |ala|',
-                         'end'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mismatched block end with a constant' do
-          inspect_source(cop,
-                         ['Module::CONSTANT = test do |ala|',
-                         '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'accepts end aligned with a method call' do
-          inspect_source(cop,
-                         ['parser.childs << lambda do |token|',
-                         '  token << 1',
-                         'end'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mismatched block end with a method call' do
-          inspect_source(cop,
-                         ['parser.childs << lambda do |token|',
-                         '  token << 1',
-                         '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'accepts end aligned with a method call with arguments' do
-          inspect_source(cop,
-                         ['@h[:f] = f.each_pair.map do |f, v|',
-                         '  v = 1',
-                         'end'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mismatched end with a method call with arguments' do
-          inspect_source(cop,
-                         ['@h[:f] = f.each_pair.map do |f, v|',
-                         '  v = 1',
-                         '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'does not raise an error for nested block in a method call' do
-          inspect_source(cop,
-                         ['expect(arr.all? { |o| o.valid? })'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'accepts end aligned with the outermost method in the method chain that calls the block' do
-          inspect_source(cop,
-                         ['expect(arr.all? do |o|',
-                         '  o.valid?',
-                         'end)'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mismatched end aligned with the outermost method in the method chain that calls the block' do
-          inspect_source(cop,
-                         ['expect(arr.all? do |o|',
-                         '  o.valid?',
-                         '  end)'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'accepts end aligned with an op-asgn (+=, -=)' do
-          inspect_source(cop,
-                         ['rb += files.select do |file|',
-                         '  file << something',
-                         'end'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mismatched block end with an op-asgn (+=, -=)' do
-          inspect_source(cop,
-                         ['rb += files.select do |file|',
-                         '  file << something',
-                         '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'accepts end aligned with an and-asgn (&&=)' do
-          inspect_source(cop,
-                         ['variable &&= test do |ala|',
-                         'end'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mismatched block end with an and-asgn (&&=)' do
-          inspect_source(cop,
-                         ['variable &&= test do |ala|',
-                         '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'accepts end aligned with an or-asgn (||=)' do
-          inspect_source(cop,
-                         ['variable ||= test do |ala|',
-                         'end'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mismatched block end with an or-asgn (||=)' do
-          inspect_source(cop,
-                         ['variable ||= test do |ala|',
-                         '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
-
-        it 'accepts end aligned with a mass assignment' do
-          inspect_source(cop,
-                         ['var1, var2 = lambda do |test|',
-                         '  [1, 2]',
-                         'end'
-                         ])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mismatched block end with a mass assignment' do
-          inspect_source(cop,
-                         ['var1, var2 = lambda do |test|',
-                         '  [1, 2]',
-                         '  end'
-                         ])
-          expect(cop.offences.size).to eq(1)
-        end
       end
     end
   end