Move implementation of save and open page into session

lib/capybara/session.rb

@@ -292,16 +292,31 @@ module Capybara
 
     ##
     #
-    # Save a snapshot of the page and open it in a browser for inspection
+    # Save a snapshot of the page.
     #
-    def save_page(file_name=nil)
-      require 'capybara/util/save_and_open_page'
-      Capybara.save_page(body, file_name)
+    # @param  [String] path     The path to where it should be saved [optional]
+    #
+    def save_page(path=nil)
+      path ||= "capybara-#{Time.new.strftime("%Y%m%d%H%M%S")}#{rand(10**10)}.html"
+      path = File.expand_path(path, Capybara.save_and_open_page_path) if Capybara.save_and_open_page_path
+
+      FileUtils.mkdir_p(File.dirname(path))
+
+      File.open(path,'w') { |f| f.write(body) }
+      path
     end
 
+    ##
+    #
+    # Save a snapshot of the page and open it in a browser for inspection
+    #
+    # @param  [String] path     The path to where it should be saved [optional]
+    #
     def save_and_open_page(file_name=nil)
-      require 'capybara/util/save_and_open_page'
-      Capybara.save_and_open_page(body, file_name)
+      require "launchy"
+      Launchy.open(save_page(file_name))
+    rescue LoadError
+      warn "Please install the launchy gem to open page with save_and_open_page"
     end
 
     ##

lib/capybara/util/save_and_open_page.rb

@@ -1,21 +0,0 @@
-module Capybara
-  class << self
-    def save_page(html, path=nil)
-      path ||= "capybara-#{Time.new.strftime("%Y%m%d%H%M%S")}#{rand(10**10)}.html"
-      path = File.expand_path(path, Capybara.save_and_open_page_path) if Capybara.save_and_open_page_path
-
-      FileUtils.mkdir_p(File.dirname(path))
-
-      File.open(path,'w') { |f| f.write(html) }
-      path
-    end
-
-    def save_and_open_page(html, file_name=nil)
-      require "launchy"
-      path = save_page(html, file_name)
-      Launchy.open(path)
-    rescue LoadError
-      warn "Please install the launchy gem to open page with save_and_open_page"
-    end
-  end
-end