github-migration/webrat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'hvolkmer/master'

Browse Source 
Conflicts:

	lib/webrat/rails/rails_session.rb
This commit is contained in:
Bryan Helmkamp 2008-08-22 16:12:25 -04:00
commit 420174829e
4 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/webrat/core/session.rb
View File

@ -54,7 +54,11 @@ module Webrat
def request_page(url, http_method, data) def request_page(url, http_method, data)
debug_log "REQUESTING PAGE: #{http_method.to_s.upcase} #{url} with #{data.inspect}" debug_log "REQUESTING PAGE: #{http_method.to_s.upcase} #{url} with #{data.inspect}"
send "#{http_method}", url, data || {} if @current_url
send "#{http_method}", url, data || {}, {"HTTP_REFERER" => @current_url}
else
send "#{http_method}", url, data || {}
end
save_and_open_page if exception_caught? save_and_open_page if exception_caught?
flunk("Page load was not successful (Code: #{response_code.inspect})") unless success_code? flunk("Page load was not successful (Code: #{response_code.inspect})") unless success_code?

16
lib/webrat/rails/rails_session.rb
View File

@ -14,24 +14,24 @@ module Webrat
File.expand_path(File.join(RAILS_ROOT, "tmp")) File.expand_path(File.join(RAILS_ROOT, "tmp"))
end end
def get(url, data) def get(url, data, headers = nil)
update_protocol(url) update_protocol(url)
@integration_session.get_via_redirect(remove_protocol(url), data) @integration_session.get_via_redirect(remove_protocol(url), data, headers)
end end
def post(url, data) def post(url, data, headers = nil)
update_protocol(url) update_protocol(url)
@integration_session.post_via_redirect(remove_protocol(url), data) @integration_session.post_via_redirect(remove_protocol(url), data, headers)
end end
def put(url, data) def put(url, data, headers = nil)
update_protocol(url) update_protocol(url)
@integration_session.put_via_redirect(remove_protocol(url), data) @integration_session.put_via_redirect(remove_protocol(url), data, headers)
end end
def delete(url, data) def delete(url, data, headers = nil)
update_protocol(url) update_protocol(url)
@integration_session.delete_via_redirect(remove_protocol(url), data) @integration_session.delete_via_redirect(remove_protocol(url), data, headers)
end end
def response_body def response_body

5
spec/api/reloads_spec.rb
View File

@ -6,8 +6,9 @@ describe "reloads" do
@session.response_body = "Hello world" @session.response_body = "Hello world"
end end
it "should reload the page" do it "should reload the page with http referer" do
@session.should_receive(:get).with("/", {}).twice @session.should_receive(:get).with("/", {})
@session.should_receive(:get).with("/", {}, {"HTTP_REFERER"=>"/"})
@session.visits("/") @session.visits("/")
@session.reloads @session.reloads
end end

14
spec/api/visits_spec.rb
View File

@ -20,3 +20,17 @@ describe "visits" do
lambda { @session.fills_in "foo", :with => "blah" }.should raise_error lambda { @session.fills_in "foo", :with => "blah" }.should raise_error
end end
end end
describe "visits with referer" do
before do
@session = Webrat::TestSession.new
@session.instance_variable_set(:@current_url, "/old_url")
@session.response_body = "Hello world"
end
it "should use get with referer header" do
@session.should_receive(:get).with("/", {}, {"HTTP_REFERER" => "/old_url"})
@session.visits("/")
end
end