New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement and_wrap_original #762

Merged

JonRowe merged 3 commits into master from and_wrap_original

Aug 24, 2014

Member

JonRowe commented Aug 20, 2014

This probably needs more specs and needs features but this converts and_call_original into and_wrap_original then uses and_wrap_original to implement the old and_call_original (thus nicely proving it works!).

Closes #650.

Member

myronmarston commented Aug 21, 2014

Thanks, @JonRowe, I plan to review this in the morning.

myronmarston reviewed Aug 21, 2014

View changes

lib/rspec/mocks/message_expectation.rb Outdated

  
              #

              # @example

              #

              #   expect(api).to receive(:large_list).and_wrap_original do |original_method|

myronmarston Aug 21, 2014

Member

Would be good for this to show that the block receives the method args and a block (if there is one).

myronmarston reviewed Aug 21, 2014

View changes

lib/rspec/mocks/message_expectation.rb Outdated

  
              end

              # Tells the object to delegate to the supplied block but passing the

              # original unmodified method for your use.

myronmarston Aug 21, 2014

Member

This is accurate but I think the use case is more clear with something like:

# Decorates the stubbed method with the supplied block. The original method
# is passed to the block as the first argument (before any method call args) so
# that you can delegate to it while being able to change what args are passed to
# it and/or mutate the return value.

Member

myronmarston commented Aug 21, 2014

The implementation looks great. I agree that it needs to have specs/cukes fleshed out more and it needs a changelog entry.

myronmarston referenced this pull request Aug 21, 2014

Closed

Feature suggestion: `and_wrap_original_with` #650

JonRowe force-pushed the and_wrap_original branch from `bf193ae` to `530cece` Aug 21, 2014

Member

JonRowe commented Aug 21, 2014

Ping, added some specs and a feature.

myronmarston reviewed Aug 21, 2014

View changes

features/configuring_responses/wrapping_the_original_implementation.feature Outdated

  
        Feature: Wrapping the original implementation

          Use `and_wrap_original` to make a partial double response as it normally would. This can

          be useful when you want to expect a message without interfering with how it responds. You

myronmarston Aug 21, 2014

Member

These sentences are confusing and inaccurate. It doesn't make it respond as it normally does...it makes it respond with whatever your block does (but your block has easy access to the original method). You use and_wrap_original (over and_call_original) specifically because you want to interfere with how it responds.

JonRowe Aug 23, 2014

Member

I knew I forgot to change something :P

myronmarston reviewed Aug 21, 2014

View changes

spec/rspec/mocks/and_wrap_original_spec.rb Outdated

  
              }.to change { instance.results.size }.from(100).to(10)

            end

            it "will raise a name error if the method does not exist" do

myronmarston Aug 21, 2014

Member

s/will raise/raises/

myronmarston reviewed Aug 21, 2014

View changes

spec/rspec/mocks/and_wrap_original_spec.rb Outdated

  
              value = nil

              allow(instance).to receive(:results).and_wrap_original { |m| value = m }

              instance.results

              expect(value).to be_a Method

myronmarston Aug 21, 2014

Member

You could make this expectation stronger:

original_method = instance.method(:results)
allow(instance).to receive(:results).and_wrap_original { |m| value = m }
instance.results
expect(value).to eq(original_method)

myronmarston reviewed Aug 21, 2014

View changes

spec/rspec/mocks/and_wrap_original_spec.rb Outdated

  
              expect(value).to eq block

            end

            it "will ignore previous stubs" do

myronmarston Aug 21, 2014

Member

s/will ignore/ignores/

myronmarston reviewed Aug 21, 2014

View changes

spec/rspec/mocks/and_wrap_original_spec.rb Outdated

  
              allow(instance).to receive(:results) { "results" }

              allow(instance).to receive(:results).and_wrap_original { |m| m.call }

              expect(instance.results).to_not eq "results"

            end

myronmarston Aug 21, 2014

Member

Is it worth adding a spec showing how with can be used to still specify a canned response for specific arguments, like the cuke has?

myronmarston reviewed Aug 21, 2014

View changes

spec/rspec/mocks/and_wrap_original_spec.rb Outdated

  
      @@ -0,0 +1,57 @@
    
        require 'delegate'

myronmarston Aug 21, 2014

Member

Why are you requiring this?

JonRowe force-pushed the and_wrap_original branch 3 times, most recently from `51c4a05` to `cb284c5` Aug 23, 2014

JonRowe added some commits Aug 20, 2014


      create and_wrap_original

59915d5


      cuke for wrapping original implementation

a05ebbf

JonRowe force-pushed the and_wrap_original branch from `cb284c5` to `a05ebbf` Aug 23, 2014

Member

JonRowe commented Aug 23, 2014

@myronmarston I addressed your feedback, waiting for travis though

Member

myronmarston commented Aug 23, 2014

Needs a changelog, then merge away once green.


      Changelog for #762

[skip ci]

c0a1b61

JonRowe added a commit that referenced this pull request Aug 24, 2014


      Merge pull request #762 from rspec/and_wrap_original

Implement and_wrap_original

fd9cd38

JonRowe merged commit `fd9cd38` into master Aug 24, 2014

JonRowe deleted the and_wrap_original branch Aug 24, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

You can’t perform that action at this time.