Merge commit 'joshknowles/master'
Conflicts: lib/webrat/rails.rb spec/webrat/rails/rails_session_spec.rb
This commit is contained in:
Bryan Helmkamp
commit
29274f9b4b
@ -50,8 +50,10 @@ module Webrat
|
||||
|
||||
def do_request(http_method, url, data, headers) #:nodoc:
|
||||
update_protocol(url)
|
||||
url = normalize_url(url)
|
||||
integration_session.request_via_redirect(http_method, url, data, headers)
|
||||
|
||||
integration_session.send(http_method, normalize_url(url), data, headers)
|
||||
integration_session.follow_redirect_with_headers(headers) while integration_session.internal_redirect?
|
||||
integration_session.status
|
||||
end
|
||||
|
||||
# remove protocol, host and anchor
|
||||
@ -81,13 +83,21 @@ end
|
||||
|
||||
module ActionController #:nodoc:
|
||||
module Integration #:nodoc:
|
||||
Session.class_eval do
|
||||
unless instance_methods.include?("put_via_redirect")
|
||||
require "webrat/rails/redirect_actions"
|
||||
include Webrat::RedirectActions
|
||||
class Session #:nodoc:
|
||||
def internal_redirect?
|
||||
redirect? && response.redirect_url_match?(host)
|
||||
end
|
||||
|
||||
def follow_redirect_with_headers(h = {})
|
||||
raise "Not a redirect! #{@status} #{@status_message}" unless redirect?
|
||||
h['HTTP_REFERER'] = current_url if current_url
|
||||
|
||||
get(interpret_uri(headers["location"].first), {}, h)
|
||||
status
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
IntegrationTest.class_eval do
|
||||
include Webrat::Methods
|
||||
include Webrat::Matchers
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
# For Rails before http://dev.rubyonrails.org/ticket/10497 was committed
|
||||
module Webrat
|
||||
module RedirectActions #:nodoc:
|
||||
|
||||
def put_via_redirect(path, parameters = {}, headers = {})
|
||||
put path, parameters, headers
|
||||
follow_redirect! while redirect?
|
||||
status
|
||||
end
|
||||
|
||||
def delete_via_redirect(path, parameters = {}, headers = {})
|
||||
delete path, parameters, headers
|
||||
follow_redirect! while redirect?
|
||||
status
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
@ -11,9 +11,8 @@ module Webrat
|
||||
path, data, headers = *args
|
||||
params = data.merge({:env => headers || {}})
|
||||
self.__send__("#{verb}_it", path, params)
|
||||
follow! while @response.redirect?
|
||||
get_it(@response.location, params) while @response.redirect?
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
@ -3,87 +3,121 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
|
||||
require "webrat/rails"
|
||||
|
||||
describe Webrat::RailsSession do
|
||||
before do
|
||||
before :each do
|
||||
Webrat.configuration.mode = :rails
|
||||
@integration_session = mock("integration_session")
|
||||
@integration_session.stub!(:internal_redirect?)
|
||||
@integration_session.stub!(:status)
|
||||
end
|
||||
|
||||
it "should delegate response_body to the session response body" do
|
||||
response = mock("response", :body => "<html>")
|
||||
integration_session = mock("integration session", :response => response)
|
||||
Webrat::RailsSession.new(integration_session).response_body.should == "<html>"
|
||||
@integration_session.stub!(:response => mock("response", :body => "<html>"))
|
||||
Webrat::RailsSession.new(@integration_session).response_body.should == "<html>"
|
||||
end
|
||||
|
||||
it "should delegate response_code to the session response code" do
|
||||
response = mock("response", :code => "42")
|
||||
integration_session = mock("integration session", :response => response)
|
||||
Webrat::RailsSession.new(integration_session).response_code.should == 42
|
||||
@integration_session.stub!(:response => mock("response", :code => "42"))
|
||||
Webrat::RailsSession.new(@integration_session).response_code.should == 42
|
||||
end
|
||||
|
||||
it "should delegate get to request_via_redirect on the integration session" do
|
||||
integration_session = mock("integration session")
|
||||
rails_session = Webrat::RailsSession.new(integration_session)
|
||||
integration_session.should_receive(:request_via_redirect).with(:get, "url", "data", "headers")
|
||||
it "should delegate get to the integration session" do
|
||||
@integration_session.should_receive(:get).with("url", "data", "headers")
|
||||
rails_session = Webrat::RailsSession.new(@integration_session)
|
||||
rails_session.get("url", "data", "headers")
|
||||
end
|
||||
|
||||
it "should delegate post to request_via_redirect on the integration session" do
|
||||
integration_session = mock("integration session")
|
||||
rails_session = Webrat::RailsSession.new(integration_session)
|
||||
integration_session.should_receive(:request_via_redirect).with(:post, "url", "data", "headers")
|
||||
it "should delegate post to the integration session" do
|
||||
@integration_session.should_receive(:post).with("url", "data", "headers")
|
||||
rails_session = Webrat::RailsSession.new(@integration_session)
|
||||
rails_session.post("url", "data", "headers")
|
||||
end
|
||||
|
||||
it "should delegate put to request_via_redirect on the integration session" do
|
||||
integration_session = mock("integration session")
|
||||
rails_session = Webrat::RailsSession.new(integration_session)
|
||||
integration_session.should_receive(:request_via_redirect).with(:put, "url", "data", "headers")
|
||||
it "should delegate put to the integration session" do
|
||||
@integration_session.should_receive(:put).with("url", "data", "headers")
|
||||
rails_session = Webrat::RailsSession.new(@integration_session)
|
||||
rails_session.put("url", "data", "headers")
|
||||
end
|
||||
|
||||
it "should delegate delete to request_via_redirect on the integration session" do
|
||||
integration_session = mock("integration session")
|
||||
rails_session = Webrat::RailsSession.new(integration_session)
|
||||
integration_session.should_receive(:request_via_redirect).with(:delete, "url", "data", "headers")
|
||||
it "should delegate delete to the integration session" do
|
||||
@integration_session.should_receive(:delete).with("url", "data", "headers")
|
||||
rails_session = Webrat::RailsSession.new(@integration_session)
|
||||
rails_session.delete("url", "data", "headers")
|
||||
end
|
||||
|
||||
context "the URL is a full path" do
|
||||
it "should just pass on the path" do
|
||||
integration_session = mock("integration session", :https! => nil)
|
||||
rails_session = Webrat::RailsSession.new(integration_session)
|
||||
integration_session.should_receive(:request_via_redirect).with(:get, "/url", "data", "headers")
|
||||
@integration_session.stub!(:https!)
|
||||
@integration_session.should_receive(:get).with("/url", "data", "headers")
|
||||
rails_session = Webrat::RailsSession.new(@integration_session)
|
||||
rails_session.get("http://www.example.com/url", "data", "headers")
|
||||
end
|
||||
end
|
||||
|
||||
context "the URL is https://" do
|
||||
it "should call #https! with true before the request and just pass on the path" do
|
||||
integration_session = mock("integration session")
|
||||
rails_session = Webrat::RailsSession.new(integration_session)
|
||||
integration_session.should_receive(:https!).with(true)
|
||||
integration_session.should_receive(:request_via_redirect).with(:get, "/url", "data", "headers")
|
||||
@integration_session.should_receive(:https!).with(true)
|
||||
@integration_session.should_receive(:get).with("/url", "data", "headers")
|
||||
rails_session = Webrat::RailsSession.new(@integration_session)
|
||||
rails_session.get("https://www.example.com/url", "data", "headers")
|
||||
end
|
||||
end
|
||||
|
||||
context "the URL is http://" do
|
||||
it "should call #https! with true before the request" do
|
||||
integration_session = mock("integration session", :request_via_redirect => nil)
|
||||
rails_session = Webrat::RailsSession.new(integration_session)
|
||||
integration_session.should_receive(:https!).with(false)
|
||||
@integration_session.stub!(:get)
|
||||
@integration_session.should_receive(:https!).with(false)
|
||||
rails_session = Webrat::RailsSession.new(@integration_session)
|
||||
rails_session.get("http://www.example.com/url", "data", "headers")
|
||||
end
|
||||
end
|
||||
|
||||
context "the URL include an anchor" do
|
||||
it "should strip out the anchor" do
|
||||
integration_session = mock("integration session", :https! => false)
|
||||
rails_session = Webrat::RailsSession.new(integration_session)
|
||||
integration_session.should_receive(:request_via_redirect).with(:get, "/url", "data", "headers")
|
||||
@integration_session.should_receive(:https!).with(false)
|
||||
@integration_session.should_receive(:get).with("/url", "data", "headers")
|
||||
rails_session = Webrat::RailsSession.new(@integration_session)
|
||||
rails_session.get("http://www.example.com/url#foo", "data", "headers")
|
||||
end
|
||||
end
|
||||
|
||||
context "following redirects" do
|
||||
it "should use forward headers when following redirects" do
|
||||
@integration_session.stub!(:post)
|
||||
@integration_session.stub!(:host)
|
||||
@integration_session.stub!(:status)
|
||||
|
||||
@integration_session.should_receive(:internal_redirect?).twice.and_return(true, false)
|
||||
@integration_session.should_receive(:follow_redirect_with_headers).with("headers")
|
||||
|
||||
rails_session = Webrat::RailsSession.new(@integration_session)
|
||||
rails_session.post("url", "data", "headers")
|
||||
end
|
||||
|
||||
it "should follow internal redirects" do
|
||||
@integration_session.stub!(:get)
|
||||
@integration_session.stub!(:host)
|
||||
@integration_session.stub!(:status)
|
||||
|
||||
@integration_session.should_receive(:internal_redirect?).twice.and_return(true, false)
|
||||
@integration_session.should_receive(:follow_redirect_with_headers)
|
||||
|
||||
rails_session = Webrat::RailsSession.new(@integration_session)
|
||||
rails_session.get("url", "data", "headers")
|
||||
end
|
||||
|
||||
it "should not follow external redirects" do
|
||||
@integration_session.stub!(:get)
|
||||
@integration_session.stub!(:host)
|
||||
@integration_session.stub!(:status)
|
||||
|
||||
@integration_session.should_receive(:internal_redirect?).and_return(false)
|
||||
@integration_session.should_not_receive(:follow_redirect_with_headers)
|
||||
|
||||
rails_session = Webrat::RailsSession.new(@integration_session)
|
||||
rails_session.get("url", "data", "headers")
|
||||
end
|
||||
end
|
||||
|
||||
it "should provide a saved_page_dir" do
|
||||
Webrat::RailsSession.new(mock("integration session")).should respond_to(:saved_page_dir)
|
||||
end
|
||||
@ -92,3 +126,66 @@ describe Webrat::RailsSession do
|
||||
Webrat::RailsSession.new(mock("integration session")).should respond_to(:doc_root)
|
||||
end
|
||||
end
|
||||
|
||||
describe ActionController::Integration::Session do
|
||||
before :each do
|
||||
Webrat.configuration.mode = :rails
|
||||
@integration_session = ActionController::Integration::Session.new
|
||||
@integration_session.stub!(:response => mock("response"))
|
||||
end
|
||||
|
||||
describe "internal_redirect?" do
|
||||
it "should return false if the response is not a redirect" do
|
||||
@integration_session.should_receive(:redirect?).and_return(false)
|
||||
@integration_session.internal_redirect?.should == false
|
||||
end
|
||||
|
||||
it "should return false if the response was a redirect but the response location does not match the request host" do
|
||||
@integration_session.should_receive(:redirect?).and_return(true)
|
||||
@integration_session.response.should_receive(:redirect_url_match?).and_return(false)
|
||||
@integration_session.internal_redirect?.should == false
|
||||
end
|
||||
|
||||
it "should return true if the response is a redirect and the response location matches the request host" do
|
||||
@integration_session.should_receive(:redirect?).and_return(true)
|
||||
@integration_session.response.should_receive(:redirect_url_match?).and_return(true)
|
||||
@integration_session.internal_redirect?.should == true
|
||||
end
|
||||
end
|
||||
|
||||
describe "follow_redirect_with_headers" do
|
||||
before do
|
||||
Webrat.configuration.mode = :rails
|
||||
@integration_session.stub!(:headers).and_return({ 'location' => ["/"]})
|
||||
@integration_session.stub!(:redirect?).and_return true
|
||||
@integration_session.stub!(:get)
|
||||
end
|
||||
|
||||
it "should raise an exception if response wasn't a redirect" do
|
||||
@integration_session.stub!(:redirect?).and_return false
|
||||
lambda { @integration_session.follow_redirect_with_headers }.should raise_error
|
||||
end
|
||||
|
||||
it "should set the HTTP referer header" do
|
||||
@integration_session.stub!(:current_url).and_return "http://source.url/"
|
||||
|
||||
headers = {}
|
||||
|
||||
@integration_session.follow_redirect_with_headers(headers)
|
||||
headers["HTTP_REFERER"].should == "http://source.url/"
|
||||
end
|
||||
|
||||
it "should GET the first location header" do
|
||||
@integration_session.stub!("headers").and_return({ 'location' => ['/target'] })
|
||||
|
||||
@integration_session.should_receive(:get).with("/target", {}, hash_including("headers" => "foo"))
|
||||
|
||||
@integration_session.follow_redirect_with_headers({"headers" => "foo"})
|
||||
end
|
||||
|
||||
it "should return the status" do
|
||||
@integration_session.stub!(:status).and_return "202"
|
||||
@integration_session.follow_redirect_with_headers.should == "202"
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1,20 +0,0 @@
|
||||
# it "should default to current url" do
|
||||
# # current_page.stub!(:url => "/page")
|
||||
# response_body = <<-HTML
|
||||
# <form method="get">
|
||||
# <input type="submit" />
|
||||
# </form>
|
||||
# HTML
|
||||
# @page.stub!(:url => "/current")
|
||||
# webrat_session.should_receive(:get).with("/current", {})
|
||||
# click_button
|
||||
# end
|
||||
#
|
||||
# it "should follow fully qualified secure local links" do
|
||||
# response_body = <<-HTML
|
||||
# <a href="https://www.example.com/page/sub">Jump to sub page</a>
|
||||
# HTML
|
||||
# webrat_session.should_receive(:https!).with(true)
|
||||
# webrat_session.should_receive(:get).with("/page/sub", {})
|
||||
# click_link "Jump to sub page"
|
||||
# end
|
||||
15
spec/webrat/sinatra/helper.rb
Normal file
15
spec/webrat/sinatra/helper.rb
Normal file
@ -0,0 +1,15 @@
|
||||
require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
|
||||
require "webrat/sinatra"
|
||||
|
||||
class Sinatra::Application
|
||||
# Override this to prevent Sinatra from barfing on the options passed from RSpec
|
||||
def self.load_default_options_from_command_line!
|
||||
end
|
||||
end
|
||||
|
||||
Sinatra::Application.default_options.merge!(
|
||||
:env => :test,
|
||||
:run => false,
|
||||
:raise_errors => true,
|
||||
:logging => false
|
||||
)
|
||||
43
spec/webrat/sinatra/sinatra_spec.rb
Normal file
43
spec/webrat/sinatra/sinatra_spec.rb
Normal file
@ -0,0 +1,43 @@
|
||||
require File.expand_path(File.dirname(__FILE__) + '/helper')
|
||||
|
||||
describe Webrat::SinatraSession do
|
||||
before :each do
|
||||
Webrat.configuration.mode = :sinatra
|
||||
@sinatra_session = Webrat::SinatraSession.new
|
||||
|
||||
@response = mock(:response)
|
||||
@response.stub!(:redirect?)
|
||||
|
||||
@sinatra_session.instance_variable_set("@response", @response)
|
||||
end
|
||||
|
||||
it "should delegate get to get_it" do
|
||||
@sinatra_session.should_receive(:get_it).with("url", { :env => "headers" })
|
||||
@sinatra_session.get("url", {}, "headers")
|
||||
end
|
||||
|
||||
it "should delegate post to post_it" do
|
||||
@sinatra_session.should_receive(:post_it).with("url", { :env => "headers" })
|
||||
@sinatra_session.post("url", {}, "headers")
|
||||
end
|
||||
|
||||
it "should delegate put to put_it" do
|
||||
@sinatra_session.should_receive(:put_it).with("url", { :env => "headers" })
|
||||
@sinatra_session.put("url", {}, "headers")
|
||||
end
|
||||
|
||||
it "should delegate delete to delete_it" do
|
||||
@sinatra_session.should_receive(:delete_it).with("url", { :env => "headers" })
|
||||
@sinatra_session.delete("url", {}, "headers")
|
||||
end
|
||||
|
||||
it "should forward headers when following redirects" do
|
||||
@response.should_receive(:redirect?).twice.and_return(true, false)
|
||||
@response.should_receive(:location).and_return("redirect url")
|
||||
|
||||
@sinatra_session.should_receive(:get_it).with("original url", { :env => "headers" })
|
||||
@sinatra_session.should_receive(:get_it).with("redirect url", { :env => "headers" })
|
||||
|
||||
@sinatra_session.get("original url", {}, "headers")
|
||||
end
|
||||
end
|
||||
Loading…
Reference in New Issue
Block a user