rubocop 0.18.1 → 0.19.0

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::OneLineConditional do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for one line if/then/end' do
+  it 'registers an offense for one line if/then/end' do
     inspect_source(cop, ['if cond then run else dont end'])
     expect(cop.messages).to eq(['Favor the ternary operator (?:)' \
                                 ' over if/then/else/end constructs.'])

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

@@ -5,12 +5,12 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::OpMethod do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for arg not named other' do
+  it 'registers an offense for arg not named other' do
     inspect_source(cop,
                    ['def +(another)',
                     '  another',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['When defining the + operator, name its argument *other*.'])
   end
@@ -20,44 +20,44 @@ describe Rubocop::Cop::Style::OpMethod do
                    ['def + another',
                     '  another',
                     'end'])
-    expect(cop.offences.size).to eq(1)
+    expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
       .to eq(['When defining the + operator, name its argument *other*.'])
   end
 
-  it 'does not register an offence for arg named other' do
+  it 'does not register an offense for arg named other' do
     inspect_source(cop,
                    ['def +(other)',
                     '  other',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for []' do
+  it 'does not register an offense for []' do
     inspect_source(cop,
                    ['def [](index)',
                     '  other',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for []=' do
+  it 'does not register an offense for []=' do
     inspect_source(cop,
                    ['def []=(index, value)',
                     '  other',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for <<' do
+  it 'does not register an offense for <<' do
     inspect_source(cop,
                    ['def <<(cop)',
                     '  other',
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
-  it 'does not register an offence for non binary operators' do
+  it 'does not register an offense for non binary operators' do
     inspect_source(cop,
                    ['def -@', # Unary minus
                     'end',
@@ -69,6 +69,6 @@ describe Rubocop::Cop::Style::OpMethod do
                     '',
                     'def *(a, b)', # Quite strange, but legal ruby.
                     'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 end

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

@@ -11,24 +11,24 @@ describe Rubocop::Cop::Style::ParameterLists, :config do
     }
   end
 
-  it 'registers an offence for a method def with 5 parameters' do
+  it 'registers an offense for a method def with 5 parameters' do
     inspect_source(cop, ['def meth(a, b, c, d, e)',
                          'end'])
-    expect(cop.offences.size).to eq(1)
-    expect(cop.config_to_allow_offences).to eq('Max' => 5)
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.config_to_allow_offenses).to eq('Max' => 5)
   end
 
   it 'accepts a method def with 4 parameters' do
     inspect_source(cop, ['def meth(a, b, c, d)',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   context 'When CountKeywordArgs is true' do
     it 'counts keyword arguments as well', ruby: 2.0 do
       inspect_source(cop, ['def meth(a, b, c, d: 1, e: 2)',
                            'end'])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 
@@ -38,7 +38,7 @@ describe Rubocop::Cop::Style::ParameterLists, :config do
     it 'it does not count keyword arguments', ruby: 2.0 do
       inspect_source(cop, ['def meth(a, b, c, d: 1, e: 2)',
                            'end'])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
   end
 end

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

@@ -6,7 +6,7 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'AllowSafeAssignment' => true } }
 
-  it 'registers an offence for parentheses around condition' do
+  it 'registers an offense for parentheses around condition' do
     inspect_source(cop, ['if (x > 10)',
                          'elsif (x < 3)',
                          'end',
@@ -21,7 +21,7 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
                          'x += 1 until (x < 10)',
                          'x += 1 while (x < 10)'
                         ])
-    expect(cop.offences.size).to eq(9)
+    expect(cop.offenses.size).to eq(9)
     expect(cop.messages.first)
       .to eq("Don't use parentheses around the condition of an if.")
     expect(cop.messages.last)
@@ -29,8 +29,9 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
   end
 
   it 'accepts parentheses if there is no space between the keyword and (.' do
-    inspect_source(cop, ['if(x > 5) then something end'])
-    expect(cop.offences).to be_empty
+    inspect_source(cop, ['if(x > 5) then something end',
+                         'do_something until(x > 5)'])
+    expect(cop.offenses).to be_empty
   end
 
   it 'auto-corrects parentheses around condition' do
@@ -78,23 +79,23 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
                          'x += 1 while x < 10',
                          'x += 1 until x < 10'
                         ])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'accepts parentheses around condition in a ternary' do
     inspect_source(cop, '(a == 0) ? b : a')
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'is not confused by leading parenthesis in subexpression' do
     inspect_source(cop, ['(a > b) && other ? one : two'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   it 'is not confused by unbalanced parentheses' do
     inspect_source(cop, ['if (a + b).c()',
                          'end'])
-    expect(cop.offences).to be_empty
+    expect(cop.offenses).to be_empty
   end
 
   context 'safe assignment is allowed' do
@@ -103,7 +104,7 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
                      ['if (test = 10)',
                       'end'
                      ])
-      expect(cop.offences).to be_empty
+      expect(cop.offenses).to be_empty
     end
 
   end
@@ -116,7 +117,7 @@ describe Rubocop::Cop::Style::ParenthesesAroundCondition, :config do
                      ['if (test = 10)',
                       'end'
                      ])
-      expect(cop.offences.size).to eq(1)
+      expect(cop.offenses.size).to eq(1)
     end
   end
 end

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

@@ -0,0 +1,250 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Rubocop::Cop::Style::PercentLiteralDelimiters, :config do
+  subject(:cop) { described_class.new(config) }
+
+  let(:cop_config) do
+    {
+      'PreferredDelimiters' => {
+        '%'  => '[]',
+        '%i' => '[]',
+        '%q' => '[]',
+        '%Q' => '[]',
+        '%r' => '[]',
+        '%s' => '[]',
+        '%w' => '[]',
+        '%W' => '[]',
+        '%x' => '[]'
+      }
+    }
+  end
+
+  context '`%` interpolated string' do
+    it 'does not register an offense for preferred delimiters' do
+      inspect_source(cop, ['%[string]'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters' do
+      inspect_source(cop, ['%(string)'])
+      expect(cop.messages).to eq([
+        '`%`-literals should be delimited by `[` and `]`'
+      ])
+    end
+
+    it 'does not register an offense for other delimiters ' \
+       'when containing preferred delimiter characters' do
+      inspect_source(cop, ['%([string])'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters ' \
+       'when containing preferred delimiter characters in interpolation' do
+      inspect_source(cop, ['%(#{[1].first})'])
+      expect(cop.messages.size).to eq(1)
+    end
+  end
+
+  context '`%q` string' do
+    it 'does not register an offense for preferred delimiters' do
+      inspect_source(cop, ['%q[string]'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters' do
+      inspect_source(cop, ['%q(string)'])
+      expect(cop.messages).to eq([
+        '`%q`-literals should be delimited by `[` and `]`'
+      ])
+    end
+
+    it 'does not register an offense for other delimiters ' \
+       'when containing preferred delimiter characters' do
+      inspect_source(cop, ['%q([string])'])
+      expect(cop.offenses).to be_empty
+    end
+  end
+
+  context '`%Q` interpolated string' do
+    it 'does not register an offense for preferred delimiters' do
+      inspect_source(cop, ['%Q[string]'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters' do
+      inspect_source(cop, ['%Q(string)'])
+      expect(cop.messages).to eq([
+        '`%Q`-literals should be delimited by `[` and `]`'
+      ])
+    end
+
+    it 'does not register an offense for other delimiters ' \
+       'when containing preferred delimiter characters' do
+      inspect_source(cop, ['%Q([string])'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters ' \
+       'when containing preferred delimiter characters in interpolation' do
+      inspect_source(cop, ['%Q(#{[1].first})'])
+      expect(cop.messages.size).to eq(1)
+    end
+  end
+
+  context '`%w` string array' do
+    it 'does not register an offense for preferred delimiters' do
+      inspect_source(cop, ['%w[some words]'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters' do
+      inspect_source(cop, ['%w(some words)'])
+      expect(cop.messages).to eq([
+        '`%w`-literals should be delimited by `[` and `]`'
+      ])
+    end
+
+    it 'does not register an offense for other delimiters ' \
+       'when containing preferred delimiter characters' do
+      inspect_source(cop, ['%w([some] [words])'])
+      expect(cop.offenses).to be_empty
+    end
+  end
+
+  context '`%W` interpolated string array' do
+    it 'does not register an offense for preferred delimiters' do
+      inspect_source(cop, ['%W[some words]'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters' do
+      inspect_source(cop, ['%W(some words)'])
+      expect(cop.messages).to eq([
+        '`%W`-literals should be delimited by `[` and `]`'
+      ])
+    end
+
+    it 'does not register an offense for other delimiters ' \
+       'when containing preferred delimiter characters' do
+      inspect_source(cop, ['%W([some] [words])'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters ' \
+       'when containing preferred delimiter characters in interpolation' do
+      inspect_source(cop, ['%W(#{[1].first})'])
+      expect(cop.messages.size).to eq(1)
+    end
+  end
+
+  context '`%r` interpolated regular expression' do
+    it 'does not register an offense for preferred delimiters' do
+      inspect_source(cop, ['%r[regexp]'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters' do
+      inspect_source(cop, ['%r(regexp)'])
+      expect(cop.messages).to eq([
+        '`%r`-literals should be delimited by `[` and `]`'
+      ])
+    end
+
+    it 'does not register an offense for other delimiters ' \
+       'when containing preferred delimiter characters' do
+      inspect_source(cop, ['%r([regexp])'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters ' \
+       'when containing preferred delimiter characters in interpolation' do
+      inspect_source(cop, ['%r(#{[1].first})'])
+      expect(cop.messages.size).to eq(1)
+    end
+  end
+
+  context '`%i` symbol array', ruby: 2.0 do
+    it 'does not register an offense for preferred delimiters' do
+      inspect_source(cop, ['%i[some symbols]'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters' do
+      inspect_source(cop, ['%i(some symbols)'])
+      expect(cop.messages).to eq([
+        '`%i`-literals should be delimited by `[` and `]`'
+      ])
+    end
+  end
+
+  context '`%s` symbol' do
+    it 'does not register an offense for preferred delimiters' do
+      inspect_source(cop, ['%s[symbol]'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters' do
+      inspect_source(cop, ['%s(symbol)'])
+      expect(cop.messages).to eq([
+        '`%s`-literals should be delimited by `[` and `]`'
+      ])
+    end
+  end
+
+  context '`%x` interpolated system call' do
+    it 'does not register an offense for preferred delimiters' do
+      inspect_source(cop, ['%x[command]'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters' do
+      inspect_source(cop, ['%x(command)'])
+      expect(cop.messages).to eq([
+        '`%x`-literals should be delimited by `[` and `]`'
+      ])
+    end
+
+    it 'does not register an offense for other delimiters ' \
+       'when containing preferred delimiter characters' do
+      inspect_source(cop, ['%x([command])'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for other delimiters ' \
+       'when containing preferred delimiter characters in interpolation' do
+      inspect_source(cop, ['%x(#{[1].first})'])
+      expect(cop.messages.size).to eq(1)
+    end
+  end
+
+  context 'auto-correct' do
+    it 'fixes a string' do
+      new_source = autocorrect_source(cop, '%(string)')
+      expect(new_source).to eq('%[string]')
+    end
+
+    it 'fixes a string array' do
+      new_source = autocorrect_source(cop, '%w(some words)')
+      expect(new_source).to eq('%w[some words]')
+    end
+
+    it 'fixes a regular expression' do
+      original_source = '%r(.*)'
+      new_source = autocorrect_source(cop, original_source)
+      expect(new_source).to eq('%r[.*]')
+    end
+
+    it 'fixes a regular expression with option' do
+      original_source = '%r(.*)i'
+      new_source = autocorrect_source(cop, original_source)
+      expect(new_source).to eq('%r[.*]i')
+    end
+
+    it 'preserves line breaks when fixing a multiline array' do
+      new_source = autocorrect_source(cop, ['%w(', 'some', 'words', ')'])
+      expect(new_source).to eq("%w[\nsome\nwords\n]")
+    end
+  end
+end