rhc 1.11.4 → 1.12.4

data/spec/spec_helper.rb

@@ -122,6 +122,54 @@ end
 
 include WebMock::API
 
+require 'httpclient'
+require 'webmock/http_lib_adapters/httpclient_adapter'
+#
+# Patched from WebMock 1.11, needs to be upstreamed
+# 
+class WebMockHTTPClient
+  def do_get(req, proxy, conn, stream = false, &block)
+    request_signature = build_request_signature(req, :reuse_existing)
+
+    WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
+
+    if webmock_responses[request_signature]
+      webmock_response = webmock_responses.delete(request_signature)
+      response = build_httpclient_response(webmock_response, stream, &block)
+      @request_filter.each do |filter|
+        # CHANGED
+        r = filter.filter_response(req, response)
+        res = do_get(req, proxy, conn, stream, &block) if r == :retry
+        # END CHANGES
+      end
+      res = conn.push(response)
+      WebMock::CallbackRegistry.invoke_callbacks(
+        {:lib => :httpclient}, request_signature, webmock_response)
+      res
+    elsif WebMock.net_connect_allowed?(request_signature.uri)
+      # in case there is a nil entry in the hash...
+      webmock_responses.delete(request_signature)
+
+      res = if stream
+        do_get_stream_without_webmock(req, proxy, conn, &block)
+      else
+        do_get_block_without_webmock(req, proxy, conn, &block)
+      end
+      res = conn.pop
+      conn.push(res)
+      if WebMock::CallbackRegistry.any_callbacks?
+        webmock_response = build_webmock_response(res)
+        WebMock::CallbackRegistry.invoke_callbacks(
+          {:lib => :httpclient, :real_request => true}, request_signature,
+          webmock_response)
+      end
+      res
+    else
+      raise WebMock::NetConnectNotAllowedError.new(request_signature)
+    end
+  end
+end
+
 def stderr
   $stderr.rewind
   # some systems might redirect warnings to stderr
@@ -156,7 +204,7 @@ module CommandHelpers
     mock_terminal
     new_command_runner *args do
       instance #ensure instance is created before subject :new is mocked
-      subject.should_receive(:new).any_number_of_times.and_return(instance)
+      subject.stub(:new).and_return(instance)
       RHC::Commands.to_commander
     end
   end
@@ -344,10 +392,10 @@ module ClassSpecHelpers
   def expect_multi_ssh(command, hosts, check_error=false)
     require 'net/ssh/multi'
 
-    session = mock('Multi::SSH::Session')
+    session = double('Multi::SSH::Session')
     described_class.any_instance.stub(:requires_ssh_multi!)
     channels = hosts.inject({}) do |h, (k,v)| 
-      c = stub(:properties => {}, :connection => stub(:properties => {}))
+      c = double(:properties => {}, :connection => double(:properties => {}))
       h[k] = c
       h
     end
@@ -512,6 +560,7 @@ RSpec.configure do |config|
   config.include(ClassSpecHelpers)
   config.include(CommandHelpers)
   config.extend(CommandExampleHelpers)
+  config.backtrace_clean_patterns = [] if ENV['FULL_BACKTRACE']
 end
 
 module TestEnv

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 47
   prerelease: 
   segments: 
   - 1
-  - 11
+  - 12
   - 4
-  version: 1.11.4
+  version: 1.12.4
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-17 00:00:00 Z
+date: 2013-08-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -281,6 +281,7 @@ files:
 - lib/rhc/rest/client.rb
 - lib/rhc/rest/application.rb
 - lib/rhc/rest/base.rb
+- lib/rhc/rest/httpclient.rb
 - lib/rhc.rb
 - lib/rhc/autocomplete_templates/bash.erb
 - lib/rhc/usage_templates/command_syntax_help.erb