diaspora/diaspora — pull request #3266 by Raven24 (2012-05-17 00:02:10+00:00)
Title: updated webmock, hopefully fix cucumber

This updates the webmock gem to 1.8.7 and removes the diaspora-client gem, since everything involving it is broken anyway and it blocked updating webmock.
I had to make a few adaptions to the `http_multi_spec.rb` to work with the new webmock, I don't see any easy way for that spec to not use Typhoeus/Hydra with the way it is currently used...

The `not_safe_for_work.feature` seemed to fail, because since the reshares are not appended to the stream anymore, there only is one post, not two, after resharing.
... correct me if I am wrong, but it also seems that the original post and the reshare are "collapsed" to only the reshare after the refresh(?).

Please gaze your watchful eyes upon these changes, and impart your all-knowingness to me.