Refactoring request_page usage

brynary · Jul 27, 2008 · cc56a85 · cc56a85
1 parent c64556f
commit cc56a85
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/lib/webrat/core/form.rb b/lib/webrat/core/form.rb
@@ -53,7 +53,7 @@ def fields
     end
 
     def submit
-      Page.new(@page.session, form_action, form_method, params)
+      @page.session.request_page(form_action, form_method, params)
     end
 
   protected

diff --git a/lib/webrat/core/link.rb b/lib/webrat/core/link.rb
@@ -13,9 +13,9 @@ def click(method = nil, options = {})
       options[:javascript] = true if options[:javascript].nil?
 
       if options[:javascript]
-        Page.new(@page.session, absolute_href, method, data)
+        @page.session.request_page(absolute_href, method, data)
       else
-        Page.new(@page.session, absolute_href, :get, {})
+        @page.session.request_page(absolute_href, :get, {})
       end
     end
 

diff --git a/lib/webrat/core/page.rb b/lib/webrat/core/page.rb
@@ -68,10 +68,6 @@ def clicks_link_within(selector, link_text)
 
     def load_page
       session.request_page(@url, @method, @data)
-
-      save_and_open_page if session.exception_caught?
-
-      flunk("Page load was not successful (Code: #{session.response_code.inspect})") unless session.success_code?
       reset_scope
     end
 

diff --git a/lib/webrat/core/session.rb b/lib/webrat/core/session.rb
@@ -29,6 +29,9 @@ def saved_page_dir
     def request_page(url, method, data)
       debug_log "REQUESTING PAGE: #{method.to_s.upcase} #{url} with #{data.inspect}"
       send "#{method}", url, data || {}
+
+      save_and_open_page if exception_caught?
+      flunk("Page load was not successful (Code: #{session.response_code.inspect})") unless success_code?
     end
 
     def success_code?