Extending ActionController::IntegrationTest instead of ActionControll…

…er::Integration::Session fixes error with Webrat's select method
brynary · Nov 26, 2008 · 4f530cf · 4f530cf · al · Nov 27, 2008
1 parent 01fcd0d
commit 4f530cf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/webrat/core/methods.rb b/lib/webrat/core/methods.rb
@@ -32,8 +32,6 @@ def webrat_session
       :chooses, :choose,
       :selects, :select,
       :attaches_file, :attach_file,
-      :cookies,
-      :response,
       :current_page,
       :current_url,
       :clicks_link, :click_link,
@@ -47,7 +45,8 @@ def webrat_session
       :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
@@ -215,6 +215,7 @@ def page_scope #:nodoc:
     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
@@ -76,10 +76,12 @@ class Session #: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