[DRE-commits] [ruby-httparty] 02/05: Refresh clean_spec_helper.patch and newer_rspec.patch

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-httparty.

commit d1ffceb9298f3f055e467ea2556b15a1f3fb7362
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Feb 28 11:41:39 2014 +0100

    Refresh clean_spec_helper.patch and newer_rspec.patch
---
 debian/patches/clean_spec_helper.patch |  9 ++++-----
 debian/patches/newer_rspec.patch       | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/debian/patches/clean_spec_helper.patch b/debian/patches/clean_spec_helper.patch
index b90e076..82914d4 100644
--- a/debian/patches/clean_spec_helper.patch
+++ b/debian/patches/clean_spec_helper.patch
@@ -5,17 +5,16 @@ Description: clean spec_helper
 Author: Cédric Boutillier <boutil at debian.org>
 Origin: vendor
 Forwarded: no
-Last-Update: 2014-01-11
+Last-Update: 2014-02-27
 
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -1,9 +1,11 @@
+@@ -1,10 +1,8 @@
 -$:.push File.expand_path("../lib", __FILE__)
-+#$:.push File.expand_path("../lib", __FILE__)
+-
  require "httparty"
- 
+-
 -require 'spec/autorun'
-+#require 'spec/autorun'
  require 'fakeweb'
  
 +Encoding.default_external = "utf-8" if defined? Encoding
diff --git a/debian/patches/newer_rspec.patch b/debian/patches/newer_rspec.patch
index a5aa493..6430d6b 100644
--- a/debian/patches/newer_rspec.patch
+++ b/debian/patches/newer_rspec.patch
@@ -2,7 +2,7 @@ Description: run specs with RSpec 2
 Author: Bohuslav Kabrda <bkabrda at redhat.com>
 Origin: https://github.com/jnunemaker/httparty/pull/192
 Reviewed-by: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-01-11
+Last-Update: 2014-02-27
 
 --- a/spec/httparty/connection_adapter_spec.rb
 +++ b/spec/httparty/connection_adapter_spec.rb
@@ -26,7 +26,7 @@ Last-Update: 2014-01-11
              adapter.connection
 --- a/spec/httparty/request_spec.rb
 +++ b/spec/httparty/request_spec.rb
-@@ -330,7 +330,7 @@
+@@ -360,7 +360,7 @@
            response.request.path.to_s.should == "http://foo.com/foo"
            response.request.uri.request_uri.should == "/foo"
            response.request.uri.to_s.should == "http://foo.com/foo"
@@ -35,7 +35,7 @@ Last-Update: 2014-01-11
          end
  
          it "calls block given to perform with each redirect" do
-@@ -352,7 +352,7 @@
+@@ -382,7 +382,7 @@
            response.request.path.to_s.should == "/foo/bar"
            response.request.uri.request_uri.should == "/foo/bar"
            response.request.uri.to_s.should == "http://api.foo.com/foo/bar"
@@ -44,7 +44,7 @@ Last-Update: 2014-01-11
          end
  
          it "handles multiple redirects and relative location headers on different hosts" do
-@@ -365,7 +365,7 @@
+@@ -395,7 +395,7 @@
            response.request.path.to_s.should == "/v3"
            response.request.uri.request_uri.should == "/v3"
            response.request.uri.to_s.should == "http://api.foo.com/v3"
@@ -53,7 +53,7 @@ Last-Update: 2014-01-11
          end
  
          it "returns the HTTParty::Response when the 300 does not contain a location header" do
-@@ -414,7 +414,7 @@
+@@ -444,7 +444,7 @@
    it "should not fail for missing mime type" do
      stub_response "Content for you"
      @request.options[:format] = :html
@@ -62,7 +62,7 @@ Last-Update: 2014-01-11
    end
  
    describe "a request that redirects" do
-@@ -431,47 +431,47 @@
+@@ -461,47 +461,47 @@
        end
  
        it "should be handled by GET transparently" do
@@ -119,7 +119,7 @@ Last-Update: 2014-01-11
        end
  
        it "should keep track of cookies between redirects" do
-@@ -507,14 +507,14 @@
+@@ -537,14 +537,14 @@
  
        it 'should make resulting request a get request if it not already' do
          @request.http_method = Net::HTTP::Delete
@@ -168,7 +168,7 @@ Last-Update: 2014-01-11
      it "should work when using ssl_ca_path with a certificate authority" do
 --- a/spec/httparty_spec.rb
 +++ b/spec/httparty_spec.rb
-@@ -369,7 +369,7 @@
+@@ -387,7 +387,7 @@
        end.with(URI.parse(uri), kind_of(Hash))
        FakeWeb.register_uri(:get, uri, :body => 'stuff')
        @klass.connection_adapter connection_adapter, connection_adapter_options
@@ -177,7 +177,7 @@ Last-Update: 2014-01-11
      end
    end
  
-@@ -645,7 +645,7 @@
+@@ -668,7 +668,7 @@
    describe "#get" do
      it "should be able to get html" do
        stub_http_response_with('google.html')
@@ -186,7 +186,7 @@ Last-Update: 2014-01-11
      end
  
      it "should be able to get chunked html" do
-@@ -654,7 +654,7 @@
+@@ -677,7 +677,7 @@
  
        HTTParty.get('http://www.google.com') do |fragment|
          chunks.should include(fragment)
@@ -195,7 +195,7 @@ Last-Update: 2014-01-11
      end
  
      it "should be able parse response type json automatically" do
-@@ -694,7 +694,7 @@
+@@ -725,7 +725,7 @@
      it "should not get undefined method add_node for nil class for the following xml" do
        stub_http_response_with('undefined_method_add_node_for_nil.xml')
        result = HTTParty.get('http://foobar.com')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-httparty.git