rubocop 0.13.1 → 0.14.0

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

@@ -2,50 +2,44 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe HashMethods do
-        subject(:cop) { described_class.new }
-
-        it 'registers an offence for has_key? with one arg' do
-          inspect_source(cop,
-                         ['o.has_key?(o)'])
-          expect(cop.offences.size).to eq(1)
-          expect(cop.messages)
-            .to eq(['has_key? is deprecated in favor of key?.'])
-        end
-
-        it 'accepts has_key? with no args' do
-          inspect_source(cop,
-                         ['o.has_key?'])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for has_value? with one arg' do
-          inspect_source(cop,
-                         ['o.has_value?(o)'])
-          expect(cop.offences.size).to eq(1)
-          expect(cop.messages)
-            .to eq(['has_value? is deprecated in favor of value?.'])
-        end
-
-        it 'accepts has_value? with no args' do
-          inspect_source(cop,
-                         ['o.has_value?'])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'auto-corrects has_key? with key?' do
-          new_source = autocorrect_source(cop, 'hash.has_key?(:test)')
-          expect(new_source).to eq('hash.key?(:test)')
-        end
-
-        it 'auto-corrects has_value? with value?' do
-          new_source = autocorrect_source(cop, 'hash.has_value?(value)')
-          expect(new_source).to eq('hash.value?(value)')
-        end
-      end
-    end
+describe Rubocop::Cop::Style::HashMethods do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offence for has_key? with one arg' do
+    inspect_source(cop,
+                   ['o.has_key?(o)'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['has_key? is deprecated in favor of key?.'])
+  end
+
+  it 'accepts has_key? with no args' do
+    inspect_source(cop,
+                   ['o.has_key?'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'registers an offence for has_value? with one arg' do
+    inspect_source(cop,
+                   ['o.has_value?(o)'])
+    expect(cop.offences.size).to eq(1)
+    expect(cop.messages)
+      .to eq(['has_value? is deprecated in favor of value?.'])
+  end
+
+  it 'accepts has_value? with no args' do
+    inspect_source(cop,
+                   ['o.has_value?'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'auto-corrects has_key? with key?' do
+    new_source = autocorrect_source(cop, 'hash.has_key?(:test)')
+    expect(new_source).to eq('hash.key?(:test)')
+  end
+
+  it 'auto-corrects has_value? with value?' do
+    new_source = autocorrect_source(cop, 'hash.has_value?(value)')
+    expect(new_source).to eq('hash.value?(value)')
   end
 end

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

@@ -2,71 +2,99 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe HashSyntax do
-        subject(:cop) { described_class.new }
-
-        it 'registers offence for hash rocket syntax when new is possible' do
-          inspect_source(cop, ['x = { :a => 0 }'])
-          expect(cop.messages).to eq(
-            ['Ruby 1.8 hash syntax detected'])
-        end
-
-        it 'registers an offence for mixed syntax when new is possible' do
-          inspect_source(cop, ['x = { :a => 0, b: 1 }'])
-          expect(cop.messages).to eq(
-            ['Ruby 1.8 hash syntax detected'])
-        end
-
-        it 'registers an offence for hash rockets in method calls' do
-          inspect_source(cop, ['func(3, :a => 0)'])
-          expect(cop.messages).to eq(
-            ['Ruby 1.8 hash syntax detected'])
-        end
-
-        it 'accepts hash rockets when keys have different types' do
-          inspect_source(cop, ['x = { :a => 0, "b" => 1 }'])
-          expect(cop.messages).to be_empty
-        end
-
-        it 'accepts hash rockets when keys have whitespaces in them' do
-          inspect_source(cop, ['x = { :"t o" => 0 }'])
-          expect(cop.messages).to be_empty
-        end
-
-        it 'accepts hash rockets when keys have special symbols in them' do
-          inspect_source(cop, ['x = { :"\tab" => 1 }'])
-          expect(cop.messages).to be_empty
-        end
-
-        it 'accepts hash rockets when keys start with a digit' do
-          inspect_source(cop, ['x = { :"1" => 1 }'])
-          expect(cop.messages).to be_empty
-        end
-
-        it 'registers offence when keys start with an uppercase letter' do
-          inspect_source(cop, ['x = { :A => 0 }'])
-          expect(cop.messages).to eq(
-            ['Ruby 1.8 hash syntax detected'])
-        end
-
-        it 'accepts new syntax in a hash literal' do
-          inspect_source(cop, ['x = { a: 0, b: 1 }'])
-          expect(cop.messages).to be_empty
-        end
-
-        it 'accepts new syntax in method calls' do
-          inspect_source(cop, ['func(3, a: 0)'])
-          expect(cop.messages).to be_empty
-        end
-
-        it 'auto-corrects old to new style' do
-          new_source = autocorrect_source(cop, '{ :a => 1, :b   =>  2}')
-          expect(new_source).to eq('{ a: 1, b: 2}')
-        end
-      end
+describe Rubocop::Cop::Style::HashSyntax, :config do
+  subject(:cop) { described_class.new(config) }
+
+  context 'configured to enforce ruby19 style' do
+    let(:cop_config) { { 'EnforcedStyle' => 'ruby19' } }
+
+    it 'registers offence for hash rocket syntax when new is possible' do
+      inspect_source(cop, ['x = { :a => 0 }'])
+      expect(cop.messages).to eq(['Use the new Ruby 1.9 hash syntax.'])
+    end
+
+    it 'registers an offence for mixed syntax when new is possible' do
+      inspect_source(cop, ['x = { :a => 0, b: 1 }'])
+      expect(cop.messages).to eq(['Use the new Ruby 1.9 hash syntax.'])
+    end
+
+    it 'registers an offence for hash rockets in method calls' do
+      inspect_source(cop, ['func(3, :a => 0)'])
+      expect(cop.messages).to eq(['Use the new Ruby 1.9 hash syntax.'])
+    end
+
+    it 'accepts hash rockets when keys have different types' do
+      inspect_source(cop, ['x = { :a => 0, "b" => 1 }'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'accepts hash rockets when keys have whitespaces in them' do
+      inspect_source(cop, ['x = { :"t o" => 0 }'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'accepts hash rockets when keys have special symbols in them' do
+      inspect_source(cop, ['x = { :"\tab" => 1 }'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'accepts hash rockets when keys start with a digit' do
+      inspect_source(cop, ['x = { :"1" => 1 }'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'registers offence when keys start with an uppercase letter' do
+      inspect_source(cop, ['x = { :A => 0 }'])
+      expect(cop.messages).to eq(['Use the new Ruby 1.9 hash syntax.'])
+    end
+
+    it 'accepts new syntax in a hash literal' do
+      inspect_source(cop, ['x = { a: 0, b: 1 }'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'accepts new syntax in method calls' do
+      inspect_source(cop, ['func(3, a: 0)'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'auto-corrects old to new style' do
+      new_source = autocorrect_source(cop, '{ :a => 1, :b   =>  2}')
+      expect(new_source).to eq('{ a: 1, b: 2}')
+    end
+  end
+
+  context 'configured to enforce ruby19 style' do
+    let(:cop_config) { { 'EnforcedStyle' => 'hash_rockets' } }
+
+    it 'registers offence for Ruby 1.9 style' do
+      inspect_source(cop, ['x = { a: 0 }'])
+      expect(cop.messages).to eq(['Always use hash rockets in hashes.'])
+    end
+
+    it 'registers an offence for mixed syntax' do
+      inspect_source(cop, ['x = { :a => 0, b: 1 }'])
+      expect(cop.messages).to eq(['Always use hash rockets in hashes.'])
+    end
+
+    it 'registers an offence for 1.9 style in method calls' do
+      inspect_source(cop, ['func(3, a: 0)'])
+      expect(cop.messages).to eq(['Always use hash rockets in hashes.'])
+    end
+
+    it 'accepts hash rockets in a hash literal' do
+      inspect_source(cop, ['x = { :a => 0, :b => 1 }'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'accepts hash rockets in method calls' do
+      inspect_source(cop, ['func(3, :a => 0)'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'auto-corrects new style to hash rockets' do
+      new_source = autocorrect_source(cop, '{ a: 1, b: 2}')
+      expect(new_source).to eq('{ :a => 1, :b => 2}')
     end
   end
 end

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

@@ -2,24 +2,18 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe IfWithSemicolon do
-        subject(:iws) { IfWithSemicolon.new }
+describe Rubocop::Cop::Style::IfWithSemicolon do
+  subject(:cop) { described_class.new }
 
-        it 'registers an offence for one line if/;/end' do
-          inspect_source(iws, ['if cond; run else dont end'])
-          expect(iws.messages).to eq(
-            ['Never use if x; Use the ternary operator instead.'])
-        end
+  it 'registers an offence for one line if/;/end' do
+    inspect_source(cop, ['if cond; run else dont end'])
+    expect(cop.messages).to eq(
+      ['Never use if x; Use the ternary operator instead.'])
+  end
 
-        it 'can handle modifier conditionals' do
-          inspect_source(iws, ['class Hash',
-                               'end if RUBY_VERSION < "1.8.7"'])
-          expect(iws.messages).to be_empty
-        end
-      end
-    end
+  it 'can handle modifier conditionals' do
+    inspect_source(cop, ['class Hash',
+                         'end if RUBY_VERSION < "1.8.7"'])
+    expect(cop.messages).to be_empty
   end
 end

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

@@ -2,389 +2,383 @@
 
 require 'spec_helper'
 
-module Rubocop
-  module Cop
-    module Style
-      describe IndentationWidth do
-        subject(:cop) { described_class.new }
-
-        context 'with if statement' do
-          it 'registers an offence for bad indentation of an if body' do
-            inspect_source(cop,
-                           ['if cond',
-                            ' func',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 1) spaces for indentation.'])
-          end
-
-          it 'registers an offence for bad indentation of an else body' do
-            inspect_source(cop,
-                           ['if cond',
-                            '  func1',
-                            'else',
-                            ' func2',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 1) spaces for indentation.'])
-          end
-
-          it 'registers an offence for bad indentation of an elsif body' do
-            inspect_source(cop,
-                           ['if a1',
-                            '  b1',
-                            'elsif a2',
-                            ' b2',
-                            'else',
-                            '  c',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 1) spaces for indentation.'])
-          end
-
-          it 'registers offence for bad indentation of ternary inside else' do
-            inspect_source(cop,
-                           ['if a',
-                            '  b',
-                            'else',
-                            '     x ? y : z',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 5) spaces for indentation.'])
-          end
-
-          it 'registers offence for bad indentation of modifier if in else' do
-            inspect_source(cop,
-                           ['if a',
-                            '  b',
-                            'else',
-                            '   x if y',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 3) spaces for indentation.'])
-          end
-
-          it 'accepts a one line if statement' do
-            inspect_source(cop,
-                           ['if cond then func1 else func2 end'])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'accepts a correctly aligned if/elsif/else/end' do
-            inspect_source(cop,
-                           ['if a1',
-                            '  b1',
-                            'elsif a2',
-                            '  b2',
-                            'else',
-                            '  c',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'accepts if/elsif/else/end laid out as a table' do
-            inspect_source(cop,
-                           ['if    @io == $stdout then str << "$stdout"',
-                            'elsif @io == $stdin  then str << "$stdin"',
-                            'elsif @io == $stderr then str << "$stderr"',
-                            'else                      str << @io.class.to_s',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'accepts if/then/else/end laid out as another table' do
-            inspect_source(cop,
-                           ["if File.exist?('config.save')",
-                            'then ConfigTable.load',
-                            'else ConfigTable.new',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'accepts an empty if' do
-            inspect_source(cop,
-                           ['if a',
-                            'else',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'accepts an if/else branches with rescue clauses' do
-            # Because of how the rescue clauses come out of Parser, these are
-            # special and need to be tested.
-            inspect_source(cop,
-                           ['if a',
-                            '  a rescue nil',
-                            'else',
-                            '  a rescue nil',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-        end
-
-        context 'with unless' do
-          it 'registers an offence for bad indentation of an unless body' do
-            inspect_source(cop,
-                           ['unless cond',
-                            ' func',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 1) spaces for indentation.'])
-          end
-
-          it 'accepts an empty unless' do
-            inspect_source(cop,
-                           ['unless a',
-                            'else',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-        end
-
-        context 'with case' do
-          it 'registers an offence for bad indentation in a case/when body' do
-            inspect_source(cop,
-                           ['case a',
-                            'when b',
-                            ' c',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 1) spaces for indentation.'])
-          end
-
-          it 'registers an offence for bad indentation in a case/else body' do
-            inspect_source(cop,
-                           ['case a',
-                            'when b',
-                            '  c',
-                            'when d',
-                            '  e',
-                            'else',
-                            '   f',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 3) spaces for indentation.'])
-          end
-
-          it 'accepts correctly indented case/when/else' do
-            inspect_source(cop,
-                           ['case a',
-                            'when b',
-                            '  c',
-                            'when d',
-                            'else',
-                            '  f',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'accepts case/when/else laid out as a table' do
-            inspect_source(cop,
-                           ['case sexp.loc.keyword.source',
-                            "when 'if'     then cond, body, _else = *sexp",
-                            "when 'unless' then cond, _else, body = *sexp",
-                            'else               cond, body = *sexp',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'accepts case/when/else with then beginning a line' do
-            inspect_source(cop,
-                           ['case sexp.loc.keyword.source',
-                            "when 'if'",
-                            'then cond, body, _else = *sexp',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'accepts indented when/else plus indented body' do
-            # "Indent when as deep as case" is the job of another cop.
-            inspect_source(cop,
-                           ['case code_type',
-                            "  when 'ruby', 'sql', 'plain'",
-                            '    code_type',
-                            "  when 'erb'",
-                            "    'ruby; html-script: true'",
-                            '  when "html"',
-                            "    'xml'",
-                            '  else',
-                            "    'plain'",
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'accepts an empty case' do
-            inspect_source(cop,
-                           ['case a',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-        end
-
-        context 'with while/until' do
-          it 'registers an offence for bad indentation of a while body' do
-            inspect_source(cop,
-                           ['while cond',
-                            ' func',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 1) spaces for indentation.'])
-          end
-
-          it 'registers an offence for bad indentation of begin/end/while' do
-            inspect_source(cop,
-                           ['begin',
-                            ' func1',
-                            '   func2',
-                            'end while cond'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 1) spaces for indentation.',
-                      'Use 2 (not 3) spaces for indentation.'])
-          end
-
-          it 'registers an offence for bad indentation of an until body' do
-            inspect_source(cop,
-                           ['until cond',
-                            ' func',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 1) spaces for indentation.'])
-          end
-
-          it 'accepts an empty while' do
-            inspect_source(cop,
-                           ['while a',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-        end
-
-        context 'with for' do
-          it 'registers an offence for bad indentation of a for body' do
-            inspect_source(cop,
-                           ['for var in 1..10',
-                            ' func',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 1) spaces for indentation.'])
-          end
-
-          it 'accepts an empty for' do
-            inspect_source(cop,
-                           ['for var in 1..10',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-        end
-
-        context 'with def/defs' do
-          it 'registers an offence for bad indentation of a def body' do
-            inspect_source(cop,
-                           ['def test',
-                            '    func1',
-                            '     func2', # No offence registered for this.
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 4) spaces for indentation.'])
-          end
-
-          it 'registers an offence for bad indentation of a defs body' do
-            inspect_source(cop,
-                           ['def self.test',
-                            '   func',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 3) spaces for indentation.'])
-          end
-
-          it 'accepts an empty def body' do
-            inspect_source(cop,
-                           ['def test',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'accepts an empty defs body' do
-            inspect_source(cop,
-                           ['def self.test',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-        end
-
-        context 'with class' do
-          it 'registers an offence for bad indentation of a class body' do
-            inspect_source(cop,
-                           ['class Test',
-                            '    def func',
-                            '    end',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 4) spaces for indentation.'])
-          end
-
-          it 'accepts an empty class body' do
-            inspect_source(cop,
-                           ['class Test',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-        end
-
-        context 'with module' do
-          it 'registers an offence for bad indentation of a module body' do
-            inspect_source(cop,
-                           ['module Test',
-                            '    def func',
-                            '    end',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 4) spaces for indentation.'])
-          end
-
-          it 'accepts an empty module body' do
-            inspect_source(cop,
-                           ['module Test',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-        end
-
-        context 'with block' do
-          it 'registers an offence for bad indentation of a do/end body' do
-            inspect_source(cop,
-                           ['a = func do',
-                            ' b',
-                            'end'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 1) spaces for indentation.'])
-          end
-
-          it 'registers an offence for bad indentation of a {} body' do
-            inspect_source(cop,
-                           ['func {',
-                            '   b',
-                            '}'])
-            expect(cop.messages)
-              .to eq(['Use 2 (not 3) spaces for indentation.'])
-          end
-
-          it 'accepts a correctly indented block body' do
-            inspect_source(cop,
-                           ['a = func do',
-                            '  b',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-
-          it 'accepts an empty block body' do
-            inspect_source(cop,
-                           ['a = func do',
-                            'end'])
-            expect(cop.offences).to be_empty
-          end
-        end
-      end
+describe Rubocop::Cop::Style::IndentationWidth do
+  subject(:cop) { described_class.new }
+
+  context 'with if statement' do
+    it 'registers an offence for bad indentation of an if body' do
+      inspect_source(cop,
+                     ['if cond',
+                      ' func',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 1) spaces for indentation.'])
+    end
+
+    it 'registers an offence for bad indentation of an else body' do
+      inspect_source(cop,
+                     ['if cond',
+                      '  func1',
+                      'else',
+                      ' func2',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 1) spaces for indentation.'])
+    end
+
+    it 'registers an offence for bad indentation of an elsif body' do
+      inspect_source(cop,
+                     ['if a1',
+                      '  b1',
+                      'elsif a2',
+                      ' b2',
+                      'else',
+                      '  c',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 1) spaces for indentation.'])
+    end
+
+    it 'registers offence for bad indentation of ternary inside else' do
+      inspect_source(cop,
+                     ['if a',
+                      '  b',
+                      'else',
+                      '     x ? y : z',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 5) spaces for indentation.'])
+    end
+
+    it 'registers offence for bad indentation of modifier if in else' do
+      inspect_source(cop,
+                     ['if a',
+                      '  b',
+                      'else',
+                      '   x if y',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 3) spaces for indentation.'])
+    end
+
+    it 'accepts a one line if statement' do
+      inspect_source(cop,
+                     ['if cond then func1 else func2 end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts a correctly aligned if/elsif/else/end' do
+      inspect_source(cop,
+                     ['if a1',
+                      '  b1',
+                      'elsif a2',
+                      '  b2',
+                      'else',
+                      '  c',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts if/elsif/else/end laid out as a table' do
+      inspect_source(cop,
+                     ['if    @io == $stdout then str << "$stdout"',
+                      'elsif @io == $stdin  then str << "$stdin"',
+                      'elsif @io == $stderr then str << "$stderr"',
+                      'else                      str << @io.class.to_s',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts if/then/else/end laid out as another table' do
+      inspect_source(cop,
+                     ["if File.exist?('config.save')",
+                      'then ConfigTable.load',
+                      'else ConfigTable.new',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts an empty if' do
+      inspect_source(cop,
+                     ['if a',
+                      'else',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts an if/else branches with rescue clauses' do
+      # Because of how the rescue clauses come out of Parser, these are
+      # special and need to be tested.
+      inspect_source(cop,
+                     ['if a',
+                      '  a rescue nil',
+                      'else',
+                      '  a rescue nil',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+  end
+
+  context 'with unless' do
+    it 'registers an offence for bad indentation of an unless body' do
+      inspect_source(cop,
+                     ['unless cond',
+                      ' func',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 1) spaces for indentation.'])
+    end
+
+    it 'accepts an empty unless' do
+      inspect_source(cop,
+                     ['unless a',
+                      'else',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+  end
+
+  context 'with case' do
+    it 'registers an offence for bad indentation in a case/when body' do
+      inspect_source(cop,
+                     ['case a',
+                      'when b',
+                      ' c',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 1) spaces for indentation.'])
+    end
+
+    it 'registers an offence for bad indentation in a case/else body' do
+      inspect_source(cop,
+                     ['case a',
+                      'when b',
+                      '  c',
+                      'when d',
+                      '  e',
+                      'else',
+                      '   f',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 3) spaces for indentation.'])
+    end
+
+    it 'accepts correctly indented case/when/else' do
+      inspect_source(cop,
+                     ['case a',
+                      'when b',
+                      '  c',
+                      'when d',
+                      'else',
+                      '  f',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts case/when/else laid out as a table' do
+      inspect_source(cop,
+                     ['case sexp.loc.keyword.source',
+                      "when 'if'     then cond, body, _else = *sexp",
+                      "when 'unless' then cond, _else, body = *sexp",
+                      'else               cond, body = *sexp',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts case/when/else with then beginning a line' do
+      inspect_source(cop,
+                     ['case sexp.loc.keyword.source',
+                      "when 'if'",
+                      'then cond, body, _else = *sexp',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts indented when/else plus indented body' do
+      # "Indent when as deep as case" is the job of another cop.
+      inspect_source(cop,
+                     ['case code_type',
+                      "  when 'ruby', 'sql', 'plain'",
+                      '    code_type',
+                      "  when 'erb'",
+                      "    'ruby; html-script: true'",
+                      '  when "html"',
+                      "    'xml'",
+                      '  else',
+                      "    'plain'",
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts an empty case' do
+      inspect_source(cop,
+                     ['case a',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+  end
+
+  context 'with while/until' do
+    it 'registers an offence for bad indentation of a while body' do
+      inspect_source(cop,
+                     ['while cond',
+                      ' func',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 1) spaces for indentation.'])
+    end
+
+    it 'registers an offence for bad indentation of begin/end/while' do
+      inspect_source(cop,
+                     ['begin',
+                      ' func1',
+                      '   func2',
+                      'end while cond'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 1) spaces for indentation.',
+                'Use 2 (not 3) spaces for indentation.'])
+    end
+
+    it 'registers an offence for bad indentation of an until body' do
+      inspect_source(cop,
+                     ['until cond',
+                      ' func',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 1) spaces for indentation.'])
+    end
+
+    it 'accepts an empty while' do
+      inspect_source(cop,
+                     ['while a',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+  end
+
+  context 'with for' do
+    it 'registers an offence for bad indentation of a for body' do
+      inspect_source(cop,
+                     ['for var in 1..10',
+                      ' func',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 1) spaces for indentation.'])
+    end
+
+    it 'accepts an empty for' do
+      inspect_source(cop,
+                     ['for var in 1..10',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+  end
+
+  context 'with def/defs' do
+    it 'registers an offence for bad indentation of a def body' do
+      inspect_source(cop,
+                     ['def test',
+                      '    func1',
+                      '     func2', # No offence registered for this.
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 4) spaces for indentation.'])
+    end
+
+    it 'registers an offence for bad indentation of a defs body' do
+      inspect_source(cop,
+                     ['def self.test',
+                      '   func',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 3) spaces for indentation.'])
+    end
+
+    it 'accepts an empty def body' do
+      inspect_source(cop,
+                     ['def test',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts an empty defs body' do
+      inspect_source(cop,
+                     ['def self.test',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+  end
+
+  context 'with class' do
+    it 'registers an offence for bad indentation of a class body' do
+      inspect_source(cop,
+                     ['class Test',
+                      '    def func',
+                      '    end',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 4) spaces for indentation.'])
+    end
+
+    it 'accepts an empty class body' do
+      inspect_source(cop,
+                     ['class Test',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+  end
+
+  context 'with module' do
+    it 'registers an offence for bad indentation of a module body' do
+      inspect_source(cop,
+                     ['module Test',
+                      '    def func',
+                      '    end',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 4) spaces for indentation.'])
+    end
+
+    it 'accepts an empty module body' do
+      inspect_source(cop,
+                     ['module Test',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+  end
+
+  context 'with block' do
+    it 'registers an offence for bad indentation of a do/end body' do
+      inspect_source(cop,
+                     ['a = func do',
+                      ' b',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 1) spaces for indentation.'])
+    end
+
+    it 'registers an offence for bad indentation of a {} body' do
+      inspect_source(cop,
+                     ['func {',
+                      '   b',
+                      '}'])
+      expect(cop.messages)
+        .to eq(['Use 2 (not 3) spaces for indentation.'])
+    end
+
+    it 'accepts a correctly indented block body' do
+      inspect_source(cop,
+                     ['a = func do',
+                      '  b',
+                      'end'])
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts an empty block body' do
+      inspect_source(cop,
+                     ['a = func do',
+                      'end'])
+      expect(cop.offences).to be_empty
     end
   end
 end