lib/boot_merb.rb lib/boot_rails.rb lib/merb_support/indifferent_access.rb lib/merb_support/param_parser.rb lib/merb_support/support.rb lib/merb_support/url_encoded_pair_parser.rb test/helper_merb.rb test/helper_rails.rb @@ -65,7 +65,10 @@ A test written with Webrat can handle these changes to these without any modific Install ------- -To install the latest release: +* Rails >= 1.2.6 or Merb edge +* Hpricot >= 0.6 +* Rails integration tests in Test::Unit _or_ +* RSpec stories (using an RSpec version >= revision 2997) sudo gem install webrat @@ -75,6 +78,13 @@ In your stories/helper.rb: You could also unpack the gem into vendor/plugins. +To avoid losing sessions, you need this in environments/test.rb: + +Merb::Config.use do |c| + c[:session_store] = 'memory' +end + +== HISTORY: Requirements ------------ README.txt @@ -1,5 +1,8 @@ module Webrat - VERSION = '0.2.1' + VERSION = '0.2.2' + def self.root + defined?(RAILS_ROOT) ? RAILS_ROOT : Merb.root + end end require "rubygems" @@ -7,3 +10,9 @@ require "active_support" require File.dirname(__FILE__) + "/webrat/core" require File.dirname(__FILE__) + "/webrat/rails" if defined?(RAILS_ENV) + +if defined?(Merb) + require File.join(File.dirname(__FILE__), "boot_merb.rb") +else + require File.join(File.dirname(__FILE__), "boot_rails.rb") +end lib/webrat.rb @@ -3,18 +3,17 @@ module Webrat def self.class_for_element(element) if element.name == "input" - if %w[submit image].include?(element["type"]) + if %w[submit image button].include?(element["type"]) field_class = "button" else - field_class = element["type"] || "text" + field_class = element["type"] || "text" #default type; 'type' attribute is not mandatory end else field_class = element.name end - Webrat.const_get("#{field_class.capitalize}Field") - rescue NameError - raise "Invalid field element: #{element.inspect}" + #rescue NameError + # raise "Invalid field element: #{element.inspect}" end def initialize(form, element) @@ -108,10 +107,10 @@ module Webrat def param_parser if defined?(CGIMethods) CGIMethods - else - require "action_controller" - require "action_controller/integration" + elsif defined?(ActionController::AbstractRequest) ActionController::AbstractRequest + else + Webrat::ParamParser #used for Merb end end @@ -141,6 +140,14 @@ module Webrat def matches_value?(value) @element["value"] =~ /^\W*#{Regexp.escape(value.to_s)}/i || matches_text?(value) || matches_alt?(value) end + + def matches_id?(id) + @element["id"] =~ /^\W*#{Regexp.escape(id.to_s)}/i + end + + def matches_caption?(value) + @element.innerHTML =~ /^\W*#{Regexp.escape(value.to_s)}/i + end def to_param return nil if @value.nil? lib/webrat/core/field.rb @@ -34,9 +34,18 @@ module Webrat possible_buttons = fields_by_type([ButtonField]) possible_buttons.each do |possible_button| + return possible_button if possible_button.matches_id?(value) + end + + possible_buttons.each do |possible_button| return possible_button if possible_button.matches_value?(value) end + #If nothing matched on value, try by name. + possible_buttons.each do |possible_button| + return possible_button if possible_button.matches_caption?(value) + end + nil end @@ -45,7 +54,7 @@ module Webrat @fields = [] - (@element / "button, input, textarea, select").each do |field_element| + (@element / "input, textarea, select, button").each do |field_element| @fields << Field.class_for_element(field_element).new(self, field_element) end @@ -123,7 +132,7 @@ module Webrat def merge_hash_values(a, b) # :nodoc: a.keys.each do |k| if b.has_key?(k) - case [a[k], b[k]].map(&:class) + case [a[k].class, b[k].class] when [Hash, Hash] a[k] = merge_hash_values(a[k], b[k]) b.delete(k) lib/webrat/core/form.rb @@ -3,12 +3,14 @@ module Webrat def debug_log(message) # :nodoc: return unless logger - logger.debug(message) + logger.debug message end def logger # :nodoc: if defined? RAILS_DEFAULT_LOGGER RAILS_DEFAULT_LOGGER + elsif defined? Merb + Merb.logger else nil end lib/webrat/core/logging.rb @@ -82,10 +82,22 @@ module Webrat # along with the form. An optional <tt>content_type</tt> may be given. # # Example: +<<<<<<< HEAD:lib/webrat/core/scope.rb # attaches_file "Resume", "/path/to/the/resume.txt" # attaches_file "Photo", "/path/to/the/image.png", "image/png" def attaches_file(id_or_name_or_label, path, content_type = nil) find_field(id_or_name_or_label, FileField).set(path, content_type) +======= + # save_and_open + def save_and_open + return unless File.exist?(Webrat.root + "/tmp") + + filename = "webrat-#{Time.now.to_i}.html" + File.open(Webrat.root + "/tmp/#{filename}", "w") do |f| + f.write response.body + end + `open tmp/#{filename}` +>>>>>>> 300880db2f0d50a3e2d7b171eb9745cb50e1c534:lib/webrat/page.rb end alias_method :attach_file, :attaches_file lib/webrat/core/scope.rb @@ -144,6 +144,18 @@ describe "fills_in" do @session.fills_in "user[email]", :with => "foo@example.com" @session.clicks_button end + + def test_should_work_without_input_type + @response.stubs(:body).returns(<<-EOS) + <form method="post" action="/login"> + <input id="user_email" name="user[email]" /> + <input type="submit" /> + </form> + EOS + @session.expects(:post_via_redirect).with("/login", "user" => {"email" => "foo@example.com"}) + @session.fills_in "user[email]", :with => "foo@example.com" + @session.clicks_button + end it "should work with symbols" do @session.response_body = <<-EOS spec/api/fills_in_spec.rb @@ -4,13 +4,12 @@ require "spec" # gem install redgreen for colored test output begin require "redgreen" unless ENV['TM_CURRENT_LINE']; rescue LoadError; end -require "active_support" - -silence_warnings do - require "action_controller" - require "action_controller/integration" +if ["rails","merb"].include?(ENV["TEST_MODE"]) + require File.join(File.dirname(__FILE__), "helper_#{ENV["TEST_MODE"]}.rb") +else + raise "Please set the environment variable TEST_MODE to either 'rails' or 'merb'." end - + require File.expand_path(File.dirname(__FILE__) + "/../lib/webrat") require File.expand_path(File.dirname(__FILE__) + "/../lib/webrat/rails") require File.dirname(__FILE__) + "/fakes/test_session" spec/spec_helper.rb 33fdf33c899c731cbae885547264c3966f9a4b82 300880db2f0d50a3e2d7b171eb9745cb50e1c534 Rob Kaufman rob@notch8.com http://github.com/brynary/webrat/commit/dbb3883d2708879c2e0364914a47beb77a5e5a3c dbb3883d2708879c2e0364914a47beb77a5e5a3c 2008-10-11T12:53:13-07:00 2008-10-11T12:53:13-07:00 merged jrun and gwynms merb changes into main webrat code b691d42c55b6bc761641d2073a02b4dff1667d41 Rob Kaufman rob@notch8.com