@@ -19,6 +19,7 @@ * Maximize the browser window after initializing Selenium (Luke Melia) * Better inspect output for Webrat elements + * Sets the Webrat mode with Configuration#mode= in the config block [#85] (Mike Gaffney) * Detect if the document is XML or HTML using the Content-Type when in Rails mode * Expose #selenium method for direct access to Selenium client * Check nokogiri gem version before requiring nokogiri History.txt @@ -61,7 +61,11 @@ To install the latest code as a plugin: (_Note:_ This may be less stable than us In your test_helper.rb, spec_helper.rb, or env.rb (for Cucumber) add: - require "webrat/rails" + require "webrat" + + Webrat.configure do |config| + config.mode = :rails + end == Install with Merb README.rdoc @@ -17,6 +17,7 @@ module Webrat # config.parse_with_nokogiri = false # end class Configuration + # Should XHTML be parsed with Nokogiri? Defaults to true, except on JRuby. When false, Hpricot and REXML are used attr_writer :parse_with_nokogiri @@ -39,6 +40,13 @@ module Webrat @open_error_files ? true : false end + # Allows setting of webrat's mode, valid modes are: + # :rails, :selenium, :rack, :sinatra, :mechanize, :merb + def mode=(mode) + @mode = mode + require("webrat/#{mode}") + end + end end \ No newline at end of file lib/webrat/core/configuration.rb @@ -72,5 +72,3 @@ module Webrat #:nodoc: end end end - -Webrat.configuration.mode = :mechanize \ No newline at end of file lib/webrat/mechanize.rb @@ -72,6 +72,3 @@ class Merb::Test::RspecStory #:nodoc: @browser ||= Webrat::MerbSession.new end end - -Webrat.configuration.mode = :merb - lib/webrat/merb.rb @@ -22,5 +22,3 @@ module Webrat end end end - -Webrat.configuration.mode = :rack \ No newline at end of file lib/webrat/rack.rb @@ -86,11 +86,8 @@ module ActionController #:nodoc: end end end - IntegrationTest.class_eval do include Webrat::Methods include Webrat::Matchers end end - -Webrat.configuration.mode = :rails \ No newline at end of file lib/webrat/rails.rb @@ -4,8 +4,6 @@ require "selenium/client" require "webrat/selenium/selenium_session" require "webrat/selenium/matchers" -Webrat.configuration.mode = :selenium - module Webrat def self.with_selenium_server #:nodoc: lib/webrat/selenium.rb @@ -17,5 +17,3 @@ module Webrat end end - -Webrat.configuration.mode = :sinatra \ No newline at end of file lib/webrat/sinatra.rb @@ -38,4 +38,10 @@ module Webrat def self.reset_for_test @@configuration = @@previous_config if @@previous_config end + + class Configuration + def mode_for_test= (mode) + @mode = mode + end + end end \ No newline at end of file spec/spec_helper.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") describe Webrat::Configuration do predicate_matchers[:parse_with_nokogiri] = :parse_with_nokogiri? predicate_matchers[:open_error_files] = :open_error_files? - + before do Webrat.cache_config_for_test end @@ -41,4 +41,17 @@ describe Webrat::Configuration do config = Webrat.configuration config.should_not open_error_files end + + [:rails, + :selenium, + :rack, + :sinatra, + :merb, + :mechanize].each do |mode| + it "should require correct lib when in #{mode} mode" do + config = Webrat::Configuration.new + config.should_receive(:require).with("webrat/#{mode}") + config.mode = mode + end + end end \ No newline at end of file spec/webrat/core/configuration_spec.rb @@ -3,13 +3,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe "Webrat::MechanizeSession" do before :all do Webrat.cache_config_for_test - require "webrat/mechanize" + Webrat.configuration.mode = :mechanize end after :all do Webrat.reset_for_test end - + before(:each) do @mech = Webrat::MechanizeSession.new end spec/webrat/mechanize/mechanize_session_spec.rb @@ -7,3 +7,4 @@ silence_warnings do end require "webrat/rails" +Webrat.configuration.mode_for_test = :rails spec/webrat/rails/helper.rb 6d7fc04f71c170c889e6d758d5de9d98401f72dd gaffo mike@uberu.com http://github.com/brynary/webrat/commit/22c7834512190c5991cd0ff9e27c750037be0405 22c7834512190c5991cd0ff9e27c750037be0405 2008-12-25T20:07:10-08:00 2008-12-25T20:04:41-08:00 Sets the Webrat mode with Configuration#mode= in the config block 473e024ebfb283d48fb42e3663fba2fcd4db6b2c Bryan Helmkamp bryan@brynary.com