diff options
| author | wycats <wycats@gmail.com> | 2010-04-10 17:22:52 -0400 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-10 17:22:52 -0400 |
| commit | 87f7093ee3306f417e1136d947eba200d40ff8e7 (patch) | |
| tree | ba70dbdaf67e12fc067bb5d8343d7681932452ef /activeresource/lib/active_resource/http_mock.rb | |
| parent | ee8e9d548472fb8cb8792a569e579c6513be77d6 (diff) | |
| parent | 381f877bbbbf81d679f5be3b7ac7e961d41502bd (diff) | |
| download | rails-87f7093ee3306f417e1136d947eba200d40ff8e7.tar.gz rails-87f7093ee3306f417e1136d947eba200d40ff8e7.tar.bz2 rails-87f7093ee3306f417e1136d947eba200d40ff8e7.zip | |
Merge branch 'master' into docrails_master
Diffstat (limited to 'activeresource/lib/active_resource/http_mock.rb')
| -rw-r--r-- | activeresource/lib/active_resource/http_mock.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activeresource/lib/active_resource/http_mock.rb b/activeresource/lib/active_resource/http_mock.rb index e5891300a6..1ed3804017 100644 --- a/activeresource/lib/active_resource/http_mock.rb +++ b/activeresource/lib/active_resource/http_mock.rb @@ -57,7 +57,7 @@ module ActiveResource # def post(path, request_headers = {}, body = nil, status = 200, response_headers = {}) # @responses[Request.new(:post, path, nil, request_headers)] = Response.new(body || "", status, response_headers) # end - module_eval <<-EOE, __FILE__, __LINE__ + module_eval <<-EOE, __FILE__, __LINE__ + 1 def #{method}(path, request_headers = {}, body = nil, status = 200, response_headers = {}) @responses << [Request.new(:#{method}, path, nil, request_headers), Response.new(body || "", status, response_headers)] end @@ -125,7 +125,7 @@ module ActiveResource # self.class.requests << request # self.class.responses.assoc(request).try(:second) || raise(InvalidRequestError.new("No response recorded for #{request}")) # end - module_eval <<-EOE, __FILE__, __LINE__ + module_eval <<-EOE, __FILE__, __LINE__ + 1 def #{method}(path, #{'body, ' if has_body}headers) request = ActiveResource::Request.new(:#{method}, path, #{has_body ? 'body, ' : 'nil, '}headers) self.class.requests << request |