From 4f530cfa295259a3e0a3354fae6e77f242a19309 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Wed, 26 Nov 2008 14:26:10 -0500 Subject: [PATCH] Extending ActionController::IntegrationTest instead of ActionController::Integration::Session fixes error with Webrat's select method --- lib/webrat/core/methods.rb | 5 ++--- lib/webrat/core/session.rb | 1 + lib/webrat/rails.rb | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/webrat/core/methods.rb b/lib/webrat/core/methods.rb index 0583665..e75e96c 100644 --- a/lib/webrat/core/methods.rb +++ b/lib/webrat/core/methods.rb @@ -32,8 +32,6 @@ module Webrat :chooses, :choose, :selects, :select, :attaches_file, :attach_file, - :cookies, - :response, :current_page, :current_url, :clicks_link, :click_link, @@ -47,7 +45,8 @@ module Webrat :selects_date, :selects_time, :selects_datetime, :select_date, :select_time, :select_datetime, :wait_for_page_to_load, - :field_by_xpath + :field_by_xpath, + :field_with_id end diff --git a/lib/webrat/core/session.rb b/lib/webrat/core/session.rb index 33e00fb..2b52a96 100644 --- a/lib/webrat/core/session.rb +++ b/lib/webrat/core/session.rb @@ -215,6 +215,7 @@ module Webrat def_delegators :current_scope, :should_not_see def_delegators :current_scope, :field_labeled def_delegators :current_scope, :field_by_xpath + def_delegators :current_scope, :field_with_id private # accessor for testing diff --git a/lib/webrat/rails.rb b/lib/webrat/rails.rb index ec2c37e..48a008a 100644 --- a/lib/webrat/rails.rb +++ b/lib/webrat/rails.rb @@ -76,10 +76,12 @@ module ActionController #:nodoc: require "webrat/rails/redirect_actions" include Webrat::RedirectActions end - - include Webrat::Methods end end + + class IntegrationTest + include Webrat::Methods + end end Webrat.configuration.mode = :rails \ No newline at end of file