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

Merge branch 'master' into sr_sinatra

Browse Source
This commit is contained in:
Bryan Helmkamp 2009-03-08 14:59:54 -04:00
commit 5dc24c613e
4 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
History.txt
View File

@ -2,6 +2,10 @@
* Minor enhancements
* When faced with a label with no for attribute, that contains a hidden field
and another field, as can be the case in Rails 2.3's checkbox view,
webrat now locates the non-hidden field. (Luke Melia)
* When using Rails 2.3, use Rack::Utils to parse params (Matthew Ford)
* Initial Merb and Sinatra compatibility for Selenium mode (Corey Donohoe)
* Add application_framework config for Selenium mode to determine how to
start and stop the app server (Corey Donohoe)

17
lib/webrat/core/elements/field.rb
View File

@ -16,6 +16,10 @@ module Webrat
[".//button", ".//input", ".//textarea", ".//select"]
end
def self.xpath_search_excluding_hidden
[".//button", ".//input[ @type != 'hidden']", ".//textarea", ".//select"]
end
def self.field_classes
@field_classes || []
end
@ -80,7 +84,7 @@ module Webrat
case Webrat.configuration.mode
when :rails
rails_request_parser.parse_query_parameters("#{name}=#{escaped_value}")
parse_rails_request_params("#{name}=#{escaped_value}")
when :merb
::Merb::Parse.query("#{name}=#{escaped_value}")
else
@ -98,12 +102,15 @@ module Webrat
protected
def rails_request_parser
def parse_rails_request_params(params)
if defined?(ActionController::AbstractRequest)
ActionController::AbstractRequest
else
ActionController::AbstractRequest.parse_query_parameters(params)
elsif defined?(ActionController::UrlEncodedPairParser)
# For Rails > 2.2
ActionController::UrlEncodedPairParser
ActionController::UrlEncodedPairParser.parse_query_parameters(params)
else
# For Rails > 2.3
Rack::Utils.parse_nested_query(params)
end
end

2
lib/webrat/core/elements/label.rb
View File

@ -21,7 +21,7 @@ module Webrat
def field_element
if for_id.blank?
Webrat::XML.xpath_at(@element, *Field.xpath_search)
Webrat::XML.xpath_at(@element, *Field.xpath_search_excluding_hidden)
else
Webrat::XML.css_search(@session.current_dom, "#" + for_id).first
end

19
spec/public/check_spec.rb
View File

@ -169,4 +169,23 @@ describe "uncheck" do
check 'Option 2'
click_button
end
it "should uncheck rails style checkboxes nested inside a label" do
with_html <<-HTML
<html>
<form method="get" action="/login">
<label>
TOS
<input name="user[tos]" type="hidden" value="0" />
<input id="user_tos" name="user[tos]" type="checkbox" value="1" checked="checked" />
</label>
<input type="submit" />
</form>
</html>
HTML
webrat_session.should_receive(:get).with("/login", "user" => {"tos" => "0"})
uncheck "TOS"
click_button
end
end