diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-06 00:14:55 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-06 00:14:55 -0700 |
commit | 6d4a4fabbbb04c20cee51c4e374045cc75e2ec16 (patch) | |
tree | ea8067c8494363f2bf40a8992ea94600f623f304 /activeresource/lib/active_resource/http_mock.rb | |
parent | c585e263ab40101eb0fd71a1d24d0d704f4ce026 (diff) | |
download | rails-6d4a4fabbbb04c20cee51c4e374045cc75e2ec16.tar.gz rails-6d4a4fabbbb04c20cee51c4e374045cc75e2ec16.tar.bz2 rails-6d4a4fabbbb04c20cee51c4e374045cc75e2ec16.zip |
Cherry pick Active Support dependencies. Autoload.
Diffstat (limited to 'activeresource/lib/active_resource/http_mock.rb')
-rw-r--r-- | activeresource/lib/active_resource/http_mock.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/http_mock.rb b/activeresource/lib/active_resource/http_mock.rb index 7d7e378436..aae2d6508c 100644 --- a/activeresource/lib/active_resource/http_mock.rb +++ b/activeresource/lib/active_resource/http_mock.rb @@ -1,4 +1,5 @@ require 'active_resource/connection' +require 'active_support/core_ext/kernel/reporting' module ActiveResource class InvalidRequestError < StandardError; end #:nodoc: @@ -129,7 +130,11 @@ module ActiveResource def #{method}(path, #{'body, ' if has_body}headers) request = ActiveResource::Request.new(:#{method}, path, #{has_body ? 'body, ' : 'nil, '}headers) self.class.requests << request - self.class.responses.assoc(request).try(:second) || raise(InvalidRequestError.new("No response recorded for \#{request}")) + if response = self.class.responses.assoc(request) + response[1] + else + raise InvalidRequestError.new("No response recorded for \#{request}") + end end EOE end |