On 23/02/12 14:43 +0100, Tomas Sedovic wrote:
On 02/22/2012 04:31 PM, Petr Blaho wrote:
>Refactored some tests code to bypass VCR request matching problem
>
>https://bugzilla.redhat.com/show_bug.cgi?id=791216
>---
> spec/models/factory/base.rb | 82 ------------------------
> spec/models/factory/base_spec.rb | 94 ++++++++++++++++++++++++++++
> spec/models/factory/builder.rb | 31 ---------
> spec/models/factory/builder_spec.rb | 31 +++++++++
> spec/models/factory/provider_image.rb | 21 ------
> spec/models/factory/provider_image_spec.rb | 21 ++++++
> spec/models/factory/target_image.rb | 21 ------
> spec/models/factory/target_image_spec.rb | 21 ++++++
> spec/spec_helper.rb | 1 +
> spec/vcr/cassettes/oauth.yml | 80 -----------------------
> spec/vcr/cassettes/oauth_fail_invalid.yml | 30 +++++++++
> spec/vcr/cassettes/oauth_fail_no.yml | 22 +++++++
> spec/vcr/cassettes/oauth_success_valid.yml | 30 +++++++++
> spec/vcr_setup.rb | 16 +++---
> 14 files changed, 258 insertions(+), 243 deletions(-)
> delete mode 100644 spec/models/factory/base.rb
> create mode 100644 spec/models/factory/base_spec.rb
> delete mode 100644 spec/models/factory/builder.rb
> create mode 100644 spec/models/factory/builder_spec.rb
> delete mode 100644 spec/models/factory/provider_image.rb
> create mode 100644 spec/models/factory/provider_image_spec.rb
> delete mode 100644 spec/models/factory/target_image.rb
> create mode 100644 spec/models/factory/target_image_spec.rb
> delete mode 100644 spec/vcr/cassettes/oauth.yml
> create mode 100644 spec/vcr/cassettes/oauth_fail_invalid.yml
> create mode 100644 spec/vcr/cassettes/oauth_fail_no.yml
> create mode 100644 spec/vcr/cassettes/oauth_success_valid.yml
>
<snip>
>+# # We want to add :body, but not :headers because
they're too fickle with OAuth
>+# VCR.use_cassette('oauth', :record => :new_episodes,
:match_requests_on => [:method, :uri, :body]) do
>+# request_with_oauth(method, path, *args)
>+# end
>+# end
>+# end
ACK, it fixes the failing tests.
2 comments: if the commented-out section in vcr_setup.rb is no longer
needed, please remove it.
Second, it's much better to have file rename operations in a separate
commit. It makes it much easier to see the actual changes.
Thomas
Alternatively, you can add the snip below to your ~/.gitconfig. This
makes renames a single line:
[diff]
renames = true
Personally, I think with quiet diffs here, it makes sense to include
renames, at leats sometimes - though otherwise I agree it is much
harder to read.
-j