transpec 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1947cf230f025d55b5b315662b49e4a0c6807199
-  data.tar.gz: 674a547e1df20db31651518199adc63889ae78b8
+  metadata.gz: fa52c57bc733f1dfe6a1c635a6338bd54cc39c0d
+  data.tar.gz: 54c31463aff3d7f8a0f52588da49914a4cb597d9
 SHA512:
-  metadata.gz: ff571e89b51badd2ad5ba7d26beef1651ec37686597653e4e647e4c6931aebf36090269f0e2eeea8081813f7d8fe3579523c817fdc260c0fa9b1b6af241eea7a
-  data.tar.gz: a5d24e1e775928e1e412d415faeaa62dd6fceb7c0a93589b49bf6c723c2a625d9f686d51d498d707e2d76c2b76f944430a261c05bda4fee6216f45ac8ddc1993
+  metadata.gz: af49f12b94003b1b14f426044d349c03d76c53a8ca78470e75765e1e15f1a1b3c431d2a5c64a0fae7329a74053d80759a0ada4c9282b251eac112a85bd71cdf9
+  data.tar.gz: 9c160cd00df22d3a0f0f52c1318ca10ebafd3b1fe6b8ddf4d4215a71121fd6448edba07ba649945d0e0aad187b7addb35760d7f4a714320f5cb706cf1ff38429

data/.rubocop.yml

@@ -54,4 +54,4 @@ BracesAroundHashParameters:
 
 # TODO: Shorten to 100.
 ClassLength:
-  Max: 160
+  Max: 170

data/.travis.yml

@@ -3,6 +3,6 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - jruby-19mode
+  - jruby
 before_install: gem update --remote bundler
 script: bundle exec rake travis

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Development
 
+## v1.9.0
+
+* Support conversion of `and_return { value }` and `and_return` without arguments
+* Fix a bug where conversion of `.any_number_of_times` and `at_least(0)` with `obj.stub(:message)` weren't reported in the final summary
+* Fix a bug where arguments of `any_instance` implementation blocks weren't converted when a `receive` matcher was chained by the fluent interface (e.g. `expect_any_instance_of(Klass).to receive(:message).once { |arg| }`)
+
 ## v1.8.0
 
 * Conversion of `obj.stub(:message => value)` to `allow(obj).to receive(:message).and_return(value)` is now opt-in with `-t/--convert-stub-with-hash` option when `receive_messages` is unavailable

data/README.md

@@ -416,6 +416,7 @@ The one-liner (implicit receiver) `should`:
 * [`have(n).items` matcher](#havenitems-matcher)
 * [One-liner expectations with `have(n).items` matcher](#one-liner-expectations-with-havenitems-matcher)
 * [Expectations on block](#expectations-on-block)
+* [Expectations on attribute of subject with `its`](#expectations-on-attribute-of-subject-with-its)
 * [Negative error expectations with specific error](#negative-error-expectations-with-specific-error)
 * [Message expectations](#message-expectations)
 * [Message expectations that are actually method stubs](#message-expectations-that-are-actually-method-stubs)
@@ -423,9 +424,9 @@ The one-liner (implicit receiver) `should`:
 * [Method stubs with a hash argument](#method-stubs-with-a-hash-argument)
 * [Deprecated method stub aliases](#deprecated-method-stub-aliases)
 * [Method stubs with deprecated specification of number of times](#method-stubs-with-deprecated-specification-of-number-of-times)
+* [Useless `and_return`](#useless-and_return)
 * [`any_instance` implementation blocks](#any_instance-implementation-blocks)
 * [Deprecated test double aliases](#deprecated-test-double-aliases)
-* [Expectations on attribute of subject with `its`](#expectations-on-attribute-of-subject-with-its)
 * [Current example object](#current-example-object)
 * [Custom matcher DSL](#custom-matcher-dsl)
 
@@ -661,6 +662,59 @@ expect { do_something }.to raise_error
 * Deprecation: deprecated since RSpec 3.0
 * See also: [Unification of Block vs. Value Syntaxes - RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax#unification_of_block_vs_value_syntaxes)
 
+### Expectations on attribute of subject with `its`
+
+**This conversion will be disabled automatically if `rspec-its` is loaded in your spec.**
+
+Targets:
+
+```ruby
+describe 'example' do
+  subject { { foo: 1, bar: 2 } }
+  its(:size) { should == 2 }
+  its([:foo]) { should == 1 }
+  its('keys.first') { should == :foo }
+end
+```
+
+Will be converted to:
+
+```ruby
+describe 'example' do
+  subject { { foo: 1, bar: 2 } }
+
+  describe '#size' do
+    subject { super().size }
+    it { should == 2 }
+  end
+
+  describe '[:foo]' do
+    subject { super()[:foo] }
+    it { should == 1 }
+  end
+
+  describe '#keys' do
+    subject { super().keys }
+    describe '#first' do
+      subject { super().first }
+      it { should == :foo }
+    end
+  end
+end
+```
+
+There's an option to continue using `its` with [rspec-its](https://github.com/rspec/rspec-its) which is a gem extracted from `rspec-core`.
+If you choose to do so, disable this conversion by either:
+
+* Specify `--keep its` option manually.
+* Require `rspec-its` in your spec so that Transpec automatically disables this conversion.
+
+---
+
+* This conversion can be disabled by: `--keep its`
+* Deprecation: deprecated since RSpec 2.99, removed in RSpec 3.0
+* See also: [Core: `its` will be moved into an external gem - The Plan for RSpec 3](http://myronmars.to/n/dev-blog/2013/07/the-plan-for-rspec-3#core__will_be_moved_into_an_external_gem)
+
 ### Negative error expectations with specific error
 
 Targets:
@@ -688,15 +742,15 @@ lambda { do_something }.should_not raise_error # with `--keep should`
 Targets:
 
 ```ruby
-obj.should_receive(:foo)
-Klass.any_instance.should_receive(:foo)
+obj.should_receive(:message)
+Klass.any_instance.should_receive(:message)
 ```
 
 Will be converted to:
 
 ```ruby
-expect(obj).to receive(:foo)
-expect_any_instance_of(Klass).to receive(:foo)
+expect(obj).to receive(:message)
+expect_any_instance_of(Klass).to receive(:message)
 ```
 
 * This conversion can be disabled by: `--keep should_receive`
@@ -708,21 +762,21 @@ expect_any_instance_of(Klass).to receive(:foo)
 Targets:
 
 ```ruby
-obj.should_receive(:foo).any_number_of_times
-obj.should_receive(:foo).at_least(0)
+obj.should_receive(:message).any_number_of_times
+obj.should_receive(:message).at_least(0)
 
-Klass.any_instance.should_receive(:foo).any_number_of_times
-Klass.any_instance.should_receive(:foo).at_least(0)
+Klass.any_instance.should_receive(:message).any_number_of_times
+Klass.any_instance.should_receive(:message).at_least(0)
 ```
 
 Will be converted to:
 
 ```ruby
-allow(obj).to receive(:foo)
-obj.stub(:foo) # with `--keep stub`
+allow(obj).to receive(:message)
+obj.stub(:message) # with `--keep stub`
 
-allow_any_instance_of(Klass).to receive(:foo)
-Klass.any_instance.stub(:foo) # with `--keep stub`
+allow_any_instance_of(Klass).to receive(:message)
+Klass.any_instance.stub(:message) # with `--keep stub`
 ```
 
 * This conversion can be disabled by: `--keep deprecated`
@@ -734,24 +788,24 @@ Klass.any_instance.stub(:foo) # with `--keep stub`
 Targets:
 
 ```ruby
-obj.stub(:foo)
-obj.stub!(:foo)
+obj.stub(:message)
+obj.stub!(:message)
 
 obj.stub_chain(:foo, :bar, :baz)
 
-Klass.any_instance.stub(:foo)
+Klass.any_instance.stub(:message)
 ```
 
 Will be converted to:
 
 ```ruby
-allow(obj).to receive(:foo)
+allow(obj).to receive(:message)
 
 # Conversion from `stub_chain` to `receive_message_chain` is available
 # only if the target project's RSpec is 3.0.0.beta2 (not yet released) or later
 allow(obj).to receive_message_chain(:foo, :bar, :baz)
 
-allow_any_instance_of(Klass).to receive(:foo)
+allow_any_instance_of(Klass).to receive(:message)
 ```
 
 There's no replacement for `unstub` in the `expect` syntax. See [this discussion](https://github.com/rspec/rspec-mocks/issues/153#issuecomment-12208638) for more details.
@@ -805,15 +859,15 @@ Or if you're going to stay RSpec 2.14 for now but want to convert all `stub` to
 Targets:
 
 ```ruby
-obj.stub!(:foo)
-obj.unstub!(:foo)
+obj.stub!(:message)
+obj.unstub!(:message)
 ```
 
 Will be converted to:
 
 ```ruby
-obj.stub(:foo) # with `--keep stub`
-obj.unstub(:foo)
+obj.stub(:message) # with `--keep stub`
+obj.unstub(:message)
 ```
 
 * This conversion can be disabled by: `--keep deprecated`
@@ -825,21 +879,47 @@ obj.unstub(:foo)
 Targets:
 
 ```ruby
-obj.stub(:foo).any_number_of_times
-obj.stub(:foo).at_least(0)
+obj.stub(:message).any_number_of_times
+obj.stub(:message).at_least(0)
 ```
 
 Will be converted to:
 
 ```ruby
-allow(obj).to receive(:foo)
-obj.stub(:foo) # with `--keep stub`
+allow(obj).to receive(:message)
+obj.stub(:message) # with `--keep stub`
 ```
 
 * This conversion can be disabled by: `--keep deprecated`
 * Deprecation: deprecated since RSpec 2.14, removed in RSpec 3.0
 * See also: [Don't allow at_least(0) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/133)
 
+### Useless `and_return`
+
+Targets:
+
+```ruby
+expect(obj).to receive(:message).and_return { 1 }
+allow(obj).to receive(:message).and_return { 1 }
+
+expect(obj).to receive(:message).and_return
+allow(obj).to receive(:message).and_return
+```
+
+Will be converted to:
+
+```ruby
+expect(obj).to receive(:message) { 1 }
+allow(obj).to receive(:message) { 1 }
+
+expect(obj).to receive(:message)
+allow(obj).to receive(:message)
+```
+
+* This conversion can be disabled by: `--keep deprecated`
+* Deprecation: deprecated since RSpec 2.99, removed in RSpec 3.0
+* See also: [Consider deprecating `and_return { value }` · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/558)
+
 ### `any_instance` implementation blocks
 
 **This conversion is available only if your project's RSpec is `>= 2.99.0.beta1` and `< 3.0.0.beta1`.**
@@ -937,59 +1017,6 @@ double('something')
 * Deprecation: deprecated since RSpec 2.14, removed in RSpec 3.0
 * See also: [myronmarston / why_double.md - Gist](https://gist.github.com/myronmarston/6576665)
 
-### Expectations on attribute of subject with `its`
-
-**This conversion will be disabled automatically if `rspec-its` is loaded in your spec.**
-
-Targets:
-
-```ruby
-describe 'example' do
-  subject { { foo: 1, bar: 2 } }
-  its(:size) { should == 2 }
-  its([:foo]) { should == 1 }
-  its('keys.first') { should == :foo }
-end
-```
-
-Will be converted to:
-
-```ruby
-describe 'example' do
-  subject { { foo: 1, bar: 2 } }
-
-  describe '#size' do
-    subject { super().size }
-    it { should == 2 }
-  end
-
-  describe '[:foo]' do
-    subject { super()[:foo] }
-    it { should == 1 }
-  end
-
-  describe '#keys' do
-    subject { super().keys }
-    describe '#first' do
-      subject { super().first }
-      it { should == :foo }
-    end
-  end
-end
-```
-
-There's an option to continue using `its` with [rspec-its](https://github.com/rspec/rspec-its) which is a gem extracted from `rspec-core`.
-If you choose to do so, disable this conversion by either:
-
-* Specify `--keep its` option manually.
-* Require `rspec-its` in your spec so that Transpec automatically disables this conversion.
-
----
-
-* This conversion can be disabled by: `--keep its`
-* Deprecation: deprecated since RSpec 2.99, removed in RSpec 3.0
-* See also: [Core: `its` will be moved into an external gem - The Plan for RSpec 3](http://myronmars.to/n/dev-blog/2013/07/the-plan-for-rspec-3#core__will_be_moved_into_an_external_gem)
-
 ### Current example object
 
 **This conversion is available only if your project's RSpec is `2.99.0.beta1` or later.**

data/README.md.erb

@@ -407,21 +407,13 @@ The one-liner (implicit receiver) `should`:
 
 <%=
 
-sections = text.each_line.slice_before(/^## /)
+sections = readme.each_line.slice_before(/^## /)
 
-supported_conversion_section = sections.find do |section|
+supported_conversions_section = sections.find do |section|
   section.first.include?('Supported Conversions')
 end
 
-titles = supported_conversion_section.map do |line|
-  next unless line.start_with?('### ')
-  line.sub(/^[#\s]*/, '').chomp
-end.compact
-
-titles.map do |title|
-  anchor = '#' + title.gsub(/[^\w_\- ]/, '').downcase.gsub(' ', '-')
-  "* [#{title}](#{anchor})"
-end.join("\n")
+table_of_contents(supported_conversions_section, 3)
 
 %>
 
@@ -657,6 +649,43 @@ expect { do_something }.to raise_error
 * Deprecation: deprecated since RSpec 3.0
 * See also: [Unification of Block vs. Value Syntaxes - RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax#unification_of_block_vs_value_syntaxes)
 
+### Expectations on attribute of subject with `its`
+
+**This conversion will be disabled automatically if `rspec-its` is loaded in your spec.**
+
+Targets:
+
+```ruby
+<%=
+its_target = <<END
+describe 'example' do
+  subject { { foo: 1, bar: 2 } }
+  its(:size) { should == 2 }
+  its([:foo]) { should == 1 }
+  its('keys.first') { should == :foo }
+end
+END
+-%>
+```
+
+Will be converted to:
+
+```ruby
+<%= Transpec::Converter.new.convert(its_target) -%>
+```
+
+There's an option to continue using `its` with [rspec-its](https://github.com/rspec/rspec-its) which is a gem extracted from `rspec-core`.
+If you choose to do so, disable this conversion by either:
+
+* Specify `--keep its` option manually.
+* Require `rspec-its` in your spec so that Transpec automatically disables this conversion.
+
+---
+
+* This conversion can be disabled by: `--keep its`
+* Deprecation: deprecated since RSpec 2.99, removed in RSpec 3.0
+* See also: [Core: `its` will be moved into an external gem - The Plan for RSpec 3](http://myronmars.to/n/dev-blog/2013/07/the-plan-for-rspec-3#core__will_be_moved_into_an_external_gem)
+
 ### Negative error expectations with specific error
 
 Targets:
@@ -684,15 +713,15 @@ lambda { do_something }.should_not raise_error # with `--keep should`
 Targets:
 
 ```ruby
-obj.should_receive(:foo)
-Klass.any_instance.should_receive(:foo)
+obj.should_receive(:message)
+Klass.any_instance.should_receive(:message)
 ```
 
 Will be converted to:
 
 ```ruby
-expect(obj).to receive(:foo)
-expect_any_instance_of(Klass).to receive(:foo)
+expect(obj).to receive(:message)
+expect_any_instance_of(Klass).to receive(:message)
 ```
 
 * This conversion can be disabled by: `--keep should_receive`
@@ -704,21 +733,21 @@ expect_any_instance_of(Klass).to receive(:foo)
 Targets:
 
 ```ruby
-obj.should_receive(:foo).any_number_of_times
-obj.should_receive(:foo).at_least(0)
+obj.should_receive(:message).any_number_of_times
+obj.should_receive(:message).at_least(0)
 
-Klass.any_instance.should_receive(:foo).any_number_of_times
-Klass.any_instance.should_receive(:foo).at_least(0)
+Klass.any_instance.should_receive(:message).any_number_of_times
+Klass.any_instance.should_receive(:message).at_least(0)
 ```
 
 Will be converted to:
 
 ```ruby
-allow(obj).to receive(:foo)
-obj.stub(:foo) # with `--keep stub`
+allow(obj).to receive(:message)
+obj.stub(:message) # with `--keep stub`
 
-allow_any_instance_of(Klass).to receive(:foo)
-Klass.any_instance.stub(:foo) # with `--keep stub`
+allow_any_instance_of(Klass).to receive(:message)
+Klass.any_instance.stub(:message) # with `--keep stub`
 ```
 
 * This conversion can be disabled by: `--keep deprecated`
@@ -730,24 +759,24 @@ Klass.any_instance.stub(:foo) # with `--keep stub`
 Targets:
 
 ```ruby
-obj.stub(:foo)
-obj.stub!(:foo)
+obj.stub(:message)
+obj.stub!(:message)
 
 obj.stub_chain(:foo, :bar, :baz)
 
-Klass.any_instance.stub(:foo)
+Klass.any_instance.stub(:message)
 ```
 
 Will be converted to:
 
 ```ruby
-allow(obj).to receive(:foo)
+allow(obj).to receive(:message)
 
 # Conversion from `stub_chain` to `receive_message_chain` is available
 # only if the target project's RSpec is <%= Transpec::RSpecVersion.receive_message_chain_available_version %> (not yet released) or later
 allow(obj).to receive_message_chain(:foo, :bar, :baz)
 
-allow_any_instance_of(Klass).to receive(:foo)
+allow_any_instance_of(Klass).to receive(:message)
 ```
 
 There's no replacement for `unstub` in the `expect` syntax. See [this discussion](https://github.com/rspec/rspec-mocks/issues/153#issuecomment-12208638) for more details.
@@ -801,15 +830,15 @@ Or if you're going to stay RSpec 2.14 for now but want to convert all `stub` to
 Targets:
 
 ```ruby
-obj.stub!(:foo)
-obj.unstub!(:foo)
+obj.stub!(:message)
+obj.unstub!(:message)
 ```
 
 Will be converted to:
 
 ```ruby
-obj.stub(:foo) # with `--keep stub`
-obj.unstub(:foo)
+obj.stub(:message) # with `--keep stub`
+obj.unstub(:message)
 ```
 
 * This conversion can be disabled by: `--keep deprecated`
@@ -821,21 +850,47 @@ obj.unstub(:foo)
 Targets:
 
 ```ruby
-obj.stub(:foo).any_number_of_times
-obj.stub(:foo).at_least(0)
+obj.stub(:message).any_number_of_times
+obj.stub(:message).at_least(0)
 ```
 
 Will be converted to:
 
 ```ruby
-allow(obj).to receive(:foo)
-obj.stub(:foo) # with `--keep stub`
+allow(obj).to receive(:message)
+obj.stub(:message) # with `--keep stub`
 ```
 
 * This conversion can be disabled by: `--keep deprecated`
 * Deprecation: deprecated since RSpec 2.14, removed in RSpec 3.0
 * See also: [Don't allow at_least(0) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/133)
 
+### Useless `and_return`
+
+Targets:
+
+```ruby
+<%=
+useless_and_return_target = <<END
+expect(obj).to receive(:message).and_return { 1 }
+allow(obj).to receive(:message).and_return { 1 }
+
+expect(obj).to receive(:message).and_return
+allow(obj).to receive(:message).and_return
+END
+-%>
+```
+
+Will be converted to:
+
+```ruby
+<%= Transpec::Converter.new.convert(useless_and_return_target) -%>
+```
+
+* This conversion can be disabled by: `--keep deprecated`
+* Deprecation: deprecated since RSpec 2.99, removed in RSpec 3.0
+* See also: [Consider deprecating `and_return { value }` · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/558)
+
 ### `any_instance` implementation blocks
 
 **This conversion is available only if your project's RSpec is `>= <%= Transpec::RSpecVersion::ANY_INSTANCE_IMPLEMENTATION_BLOCK_MIGRATION_BEGIN %>` and `< <%= Transpec::RSpecVersion::ANY_INSTANCE_IMPLEMENTATION_BLOCK_MIGRATION_EXCLUSIVE_END %>`.**
@@ -919,43 +974,6 @@ double('something')
 * Deprecation: deprecated since RSpec 2.14, removed in RSpec 3.0
 * See also: [myronmarston / why_double.md - Gist](https://gist.github.com/myronmarston/6576665)
 
-### Expectations on attribute of subject with `its`
-
-**This conversion will be disabled automatically if `rspec-its` is loaded in your spec.**
-
-Targets:
-
-```ruby
-<%=
-its_target = <<END
-describe 'example' do
-  subject { { foo: 1, bar: 2 } }
-  its(:size) { should == 2 }
-  its([:foo]) { should == 1 }
-  its('keys.first') { should == :foo }
-end
-END
--%>
-```
-
-Will be converted to:
-
-```ruby
-<%= Transpec::Converter.new.convert(its_target) -%>
-```
-
-There's an option to continue using `its` with [rspec-its](https://github.com/rspec/rspec-its) which is a gem extracted from `rspec-core`.
-If you choose to do so, disable this conversion by either:
-
-* Specify `--keep its` option manually.
-* Require `rspec-its` in your spec so that Transpec automatically disables this conversion.
-
----
-
-* This conversion can be disabled by: `--keep its`
-* Deprecation: deprecated since RSpec 2.99, removed in RSpec 3.0
-* See also: [Core: `its` will be moved into an external gem - The Plan for RSpec 3](http://myronmars.to/n/dev-blog/2013/07/the-plan-for-rspec-3#core__will_be_moved_into_an_external_gem)
-
 ### Current example object
 
 **This conversion is available only if your project's RSpec is `<%= Transpec::RSpecVersion.yielded_example_available_version %>` or later.**