Skip to content
This repository has been archived by the owner on Apr 12, 2018. It is now read-only.

Adding new stub shortcuts to 4.0 docs #199

Merged
merged 1 commit into from Jul 20, 2014

Conversation

ciaranmcnulty
Copy link
Contributor

Documentation for the new optional expects and the new willReturn shortcut.

@ciaranmcnulty
Copy link
Contributor Author

I was not sure if I should manually copy to 4.1 and 4.2 or if there is a tool for this?

@whatthejeff
Copy link
Collaborator

@ciaranmcnulty Sorry, missed this one. We have no standard workflow/tool for copying between the branches. I generally just use a diffing tool. I can do the copying if you'd like :)

@ciaranmcnulty
Copy link
Contributor Author

I guess if you are happy with it I can copy across before merge.

Any comments before I do that?

@whatthejeff
Copy link
Collaborator

Looks great to me!

whatthejeff added a commit that referenced this pull request Jul 20, 2014
Adding new stub shortcuts to 4.0 docs
@whatthejeff whatthejeff merged commit a0c9cd9 into sebastianbergmann:master Jul 20, 2014
@whatthejeff
Copy link
Collaborator

Thanks, @ciaranmcnulty! I'll take care of the copying :)

@ciaranmcnulty
Copy link
Contributor Author

Thanks for picking up my shameful slack, @whatthejeff

@whatthejeff
Copy link
Collaborator

Thank you for your wonderful contributions, @ciaranmcnulty :)

PS: No one slacks as shamefully as I do 😛

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants