rubocop-rspec 1.5.1 → 1.5.2

data/spec/rubocop/cop/rspec/file_path_spec.rb

@@ -1,8 +1,5 @@
-# encoding: utf-8
-
 describe RuboCop::Cop::RSpec::FilePath, :config do
   subject(:cop) { described_class.new(config) }
-  let(:cop_config) { { 'CustomTransform' => { 'FooFoo' => 'foofoo' } } }
 
   it 'checks the path' do
     inspect_source(
@@ -28,6 +25,36 @@ describe RuboCop::Cop::RSpec::FilePath, :config do
       .to eq(['Spec path should end with `my_class*foo*_spec.rb`'])
   end
 
+  it 'flags foo_spec.rb.rb' do
+    inspect_source(
+      cop,
+      "describe MyClass, '#foo' do; end",
+      'my_class/foo_spec.rb.rb'
+    )
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'flags foo_specorb' do
+    inspect_source(
+      cop,
+      "describe MyClass, '#foo' do; end",
+      'my_class/foo_specorb'
+    )
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'checks path even when metadata is included' do
+    inspect_source(
+      cop,
+      "describe MyClass, '#foo', blah: :blah do; end",
+      'wrong_class_foo_spec.rb'
+    )
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.offenses.map(&:line).sort).to eq([1])
+    expect(cop.messages)
+      .to eq(['Spec path should end with `my_class*foo*_spec.rb`'])
+  end
+
   it 'checks class spec paths' do
     inspect_source(
       cop,
@@ -112,8 +139,8 @@ describe RuboCop::Cop::RSpec::FilePath, :config do
   it 'handles alphanumeric class names' do
     inspect_source(
       cop,
-      'describe IPV6 do; end',
-      'ipv6_spec.rb'
+      'describe IPv4AndIPv6 do; end',
+      'i_pv4_and_i_pv6_spec.rb'
     )
     expect(cop.offenses).to be_empty
   end
@@ -181,39 +208,52 @@ describe RuboCop::Cop::RSpec::FilePath, :config do
     expect(cop.offenses).to be_empty
   end
 
-  it 'allows flexibility with predicates' do
+  it 'allows bang method' do
     inspect_source(
       cop,
-      "describe Some::Class, '#thing?' do; end",
-      'some/class/thing_predicate_spec.rb'
+      "describe Some::Class, '#bang!' do; end",
+      'some/class/bang_spec.rb'
     )
     expect(cop.offenses).to be_empty
   end
 
-  it 'allows flexibility with operators' do
+  it 'allows flexibility with predicates' do
     inspect_source(
       cop,
-      "describe MyClass, '#<=>' do; end",
-      'my_class/spaceship_operator_spec.rb'
+      "describe Some::Class, '#thing?' do; end",
+      'some/class/thing_predicate_spec.rb'
     )
     expect(cop.offenses).to be_empty
   end
 
-  it 'respects custom module name transformation' do
+  it 'allows flexibility with operators' do
     inspect_source(
       cop,
-      "describe FooFoo::Some::Class, '#bar' do; end",
-      'foofoo/some/class/bar_spec.rb'
+      "describe MyLittleClass, '#<=>' do; end",
+      'my_little_class/spaceship_operator_spec.rb'
     )
     expect(cop.offenses).to be_empty
   end
 
-  it 'ignores routing specs' do
-    inspect_source(
-      cop,
-      'describe MyController, type: :routing do; end',
-      'foofoo/some/class/bar_spec.rb'
-    )
-    expect(cop.offenses).to be_empty
+  context 'when configured' do
+    let(:cop_config) { { 'CustomTransform' => { 'FooFoo' => 'foofoo' } } }
+
+    it 'respects custom module name transformation' do
+      inspect_source(
+        cop,
+        "describe FooFoo::Some::Class, '#bar' do; end",
+        'foofoo/some/class/bar_spec.rb'
+      )
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'ignores routing specs' do
+      inspect_source(
+        cop,
+        'describe MyController, "#foo", type: :routing do; end',
+        'foofoo/some/class/bar_spec.rb'
+      )
+      expect(cop.offenses).to be_empty
+    end
   end
 end

data/spec/rubocop/cop/rspec/focus_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe RuboCop::Cop::RSpec::Focus do
   subject(:cop) { described_class.new }
 
@@ -12,7 +10,7 @@ describe RuboCop::Cop::RSpec::Focus do
       inspect_source(
         cop,
         [
-          "#{block_type} 'test', focus: true do",
+          "#{block_type} 'test', meta: true, focus: true do",
           'end'
         ]
       )
@@ -48,6 +46,16 @@ describe RuboCop::Cop::RSpec::Focus do
     end
   end
 
+  it 'does not flag a method that is focused twice' do
+    inspect_source(cop, 'fit "foo", :focus do; end')
+    expect(cop.offenses.size).to be(1)
+  end
+
+  it 'ignores non-rspec code with :focus blocks' do
+    inspect_source(cop, 'some_method "foo", focus: true do; end')
+    expect(cop.offenses).to be_empty
+  end
+
   [
     :fdescribe, :fcontext,
     :focus, :fexample, :fit, :fspecify,

data/spec/rubocop/cop/rspec/instance_variable_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe RuboCop::Cop::RSpec::InstanceVariable do
   subject(:cop) { described_class.new }
 
@@ -18,6 +16,19 @@ describe RuboCop::Cop::RSpec::InstanceVariable do
     expect(cop.messages).to eq(['Use `let` instead of an instance variable'])
   end
 
+  it 'ignores non-spec blocks' do
+    inspect_source(
+      cop,
+      [
+        'not_rspec do',
+        '  before { @foo = [] }',
+        '  it { expect(@foo).to be_empty }',
+        'end'
+      ]
+    )
+    expect(cop.offenses).to be_empty
+  end
+
   it 'finds an instance variable inside a shared example' do
     inspect_source(
       cop,

data/spec/rubocop/cop/rspec/multiple_describes_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe RuboCop::Cop::RSpec::MultipleDescribes do
   subject(:cop) { described_class.new }
 

data/spec/rubocop/cop/rspec/not_to_not_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe RuboCop::Cop::RSpec::NotToNot, :config do
   subject(:cop) { described_class.new(config) }
 

data/spec/rubocop/cop/rspec/verified_doubles_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe RuboCop::Cop::RSpec::VerifiedDoubles, :config do
   subject(:cop) { described_class.new(config) }
 
@@ -11,26 +9,33 @@ describe RuboCop::Cop::RSpec::VerifiedDoubles, :config do
       .to eq(['Prefer using verifying doubles over normal doubles.'])
     expect(cop.highlights).to eq(['double("Widget")'])
     expect(cop.offenses.map(&:line).sort).to eq([2])
+    expect(cop.offenses.map(&:to_s).sort).to all(
+      eql('C:  2:  9: Prefer using verifying doubles over normal doubles.')
+    )
   end
 
-  it 'finds a `spy` instead of an `instance_spy`' do
-    inspect_source(cop, ['it do',
-                         '  foo = spy("Widget")',
-                         'end'])
-    expect(cop.messages)
-      .to eq(['Prefer using verifying doubles over normal doubles.'])
-    expect(cop.highlights).to eq(['spy("Widget")'])
-    expect(cop.offenses.map(&:line).sort).to eq([2])
-  end
+  context 'when configuration does not specify IgnoreSymbolicNames' do
+    let(:cop_config) { Hash.new }
 
-  it 'find doubles whose name is a symbol' do
-    inspect_source(cop, ['it do',
-                         '  foo = double(:widget)',
-                         'end'])
-    expect(cop.messages)
-      .to eq(['Prefer using verifying doubles over normal doubles.'])
-    expect(cop.highlights).to eq(['double(:widget)'])
-    expect(cop.offenses.map(&:line).sort).to eq([2])
+    it 'find doubles whose name is a symbol' do
+      inspect_source(cop, ['it do',
+                           '  foo = double(:widget)',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Prefer using verifying doubles over normal doubles.'])
+      expect(cop.highlights).to eq(['double(:widget)'])
+      expect(cop.offenses.map(&:line).sort).to eq([2])
+    end
+
+    it 'finds a `spy` instead of an `instance_spy`' do
+      inspect_source(cop, ['it do',
+                           '  foo = spy("Widget")',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Prefer using verifying doubles over normal doubles.'])
+      expect(cop.highlights).to eq(['spy("Widget")'])
+      expect(cop.offenses.map(&:line).sort).to eq([2])
+    end
   end
 
   context 'when configured to ignore symbolic names' do
@@ -42,6 +47,16 @@ describe RuboCop::Cop::RSpec::VerifiedDoubles, :config do
                            'end'])
       expect(cop.messages).to be_empty
     end
+
+    it 'still flags doubles whose name is a string' do
+      inspect_source(cop, ['it do',
+                           '  foo = double("widget")',
+                           'end'])
+
+      expect(cop.messages.first).to eq(
+        'Prefer using verifying doubles over normal doubles.'
+      )
+    end
   end
 
   it 'ignores doubles without a name' do
@@ -50,4 +65,11 @@ describe RuboCop::Cop::RSpec::VerifiedDoubles, :config do
                          'end'])
     expect(cop.messages).to be_empty
   end
+
+  it 'ignores instance_doubles' do
+    inspect_source(cop, ['it do',
+                         '  foo = instance_double("Foo")',
+                         'end'])
+    expect(cop.messages).to be_empty
+  end
 end

data/spec/rubocop/rspec/util/one_spec.rb

@@ -0,0 +1,21 @@
+describe RuboCop::RSpec::Util, '.one' do
+  let(:first)  { instance_double(Object)                          }
+  let(:array)  { instance_double(Array, one?: true, first: first) }
+  let(:client) { Class.new.extend(described_class)                }
+
+  it 'returns first element' do
+    expect(client.one(array)).to be(first)
+  end
+
+  it 'fails if the list is empty' do
+    expect { client.one([]) }
+      .to raise_error(described_class::SizeError)
+      .with_message('expected size to be exactly 1 but size was 0')
+  end
+
+  it 'fails if the list has more than one element' do
+    expect { client.one([1, 2]) }
+      .to raise_error(described_class::SizeError)
+      .with_message('expected size to be exactly 1 but size was 2')
+  end
+end

data/spec/rubocop/rspec/wording_spec.rb

@@ -0,0 +1,44 @@
+describe RuboCop::RSpec::Wording do
+  let(:replacements) do
+    { 'have' => 'has', 'not' => 'does not' }
+  end
+
+  let(:ignores) do
+    %w(only really)
+  end
+
+  expected_rewrites =
+    {
+      'should return something'            => 'returns something',
+      'should not return something'        => 'does not return something',
+      'should do nothing'                  => 'does nothing',
+      'should have sweets'                 => 'has sweets',
+      'should worry about the future'      => 'worries about the future',
+      'should pay for pizza'               => 'pays for pizza',
+      'should obey my orders'              => 'obeys my orders',
+      'should deploy the app'              => 'deploys the app',
+      'should buy the product'             => 'buys the product',
+      'should miss me'                     => 'misses me',
+      'should fax the document'            => 'faxes the document',
+      'should amass debt'                  => 'amasses debt',
+      'should echo the input'              => 'echoes the input',
+      'should alias the method'            => 'aliases the method',
+      'should search the internet'         => 'searches the internet',
+      'should wish me luck'                => 'wishes me luck',
+      'should really only return one item' => 'really only returns one item',
+      "shouldn't return something"         => 'does not return something'
+    }
+
+  expected_rewrites.each do |old, new|
+    it %(rewrites "#{old}" as "#{new}") do
+      rewrite =
+        described_class.new(
+          old,
+          replace: replacements,
+          ignore:  ignores
+        ).rewrite
+
+      expect(rewrite).to eql(new)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,14 +1,6 @@
-# encoding: utf-8
-
 require 'rubocop'
 
-rubocop_path = File.join(File.dirname(__FILE__), '../vendor/rubocop')
-
-unless File.directory?(rubocop_path)
-  raise "Can't run specs without a local RuboCop checkout. Look in the README."
-end
-
-Dir["#{rubocop_path}/spec/support/**/*.rb"].each { |f| require f }
+require 'rubocop/rspec/support'
 
 if ENV['CI']
   require 'codeclimate-test-reporter'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Ian MacLeod
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: 0.42.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: 0.42.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,9 @@ files:
 - lib/rubocop/cop/rspec/verified_doubles.rb
 - lib/rubocop/rspec/inject.rb
 - lib/rubocop/rspec/top_level_describe.rb
+- lib/rubocop/rspec/util.rb
 - lib/rubocop/rspec/version.rb
+- lib/rubocop/rspec/wording.rb
 - rubocop-rspec.gemspec
 - spec/project_spec.rb
 - spec/rubocop/cop/rspec/any_instance_spec.rb
@@ -115,6 +117,8 @@ files:
 - spec/rubocop/cop/rspec/multiple_describes_spec.rb
 - spec/rubocop/cop/rspec/not_to_not_spec.rb
 - spec/rubocop/cop/rspec/verified_doubles_spec.rb
+- spec/rubocop/rspec/util/one_spec.rb
+- spec/rubocop/rspec/wording_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/nevir/rubocop-rspec
 licenses:
@@ -128,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -154,4 +158,6 @@ test_files:
 - spec/rubocop/cop/rspec/multiple_describes_spec.rb
 - spec/rubocop/cop/rspec/not_to_not_spec.rb
 - spec/rubocop/cop/rspec/verified_doubles_spec.rb
+- spec/rubocop/rspec/util/one_spec.rb
+- spec/rubocop/rspec/wording_spec.rb
 - spec/spec_helper.rb