Use data urls to reset page instead of empty file

closes #1035 closes #1214 closes #1203 closes #1198 Since it does not work with remote drivers, and somehow screws up on Windows.
teamcapybara · Dec 20, 2013 · 2ce9672 · 2ce9672
1 parent a199af7
commit 2ce9672
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/lib/capybara.rb b/lib/capybara.rb
@@ -14,8 +14,6 @@ class UnselectNotAllowed < CapybaraError; end
   class NotSupportedByDriverError < CapybaraError; end
   class InfiniteRedirectError < CapybaraError; end
 
-  EMPTY_HTML_FILE_PATH = File.expand_path('./capybara/empty.html', File.dirname(__FILE__))
-
   class << self
     attr_accessor :asset_host, :app_host, :run_server, :default_host, :always_include_port
     attr_accessor :server_port, :exact, :match, :exact_options, :visible_text_only

diff --git a/lib/capybara/empty.html b/lib/capybara/empty.html
diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb
@@ -5,6 +5,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     :browser => :firefox
   }
   SPECIAL_OPTIONS = [:browser]
+  EMPTY_HTML = "data:text/html,<html></html>"
 
   attr_reader :app, :options
 
@@ -97,9 +98,7 @@ def reset!
         # to about:blank, so we rescue this error and do nothing
         # instead.
       end
-      uri = URI(Capybara::EMPTY_HTML_FILE_PATH)
-      uri.scheme = "file"
-      @browser.navigate.to(uri.to_s)
+      @browser.navigate.to(EMPTY_HTML)
     end
   end
 

diff --git a/lib/capybara/spec/session/reset_session_spec.rb b/lib/capybara/spec/session/reset_session_spec.rb
@@ -20,12 +20,12 @@
       ->(v) { v == nil },
       ->(v) { v == '' },
       ->(v) { v == 'about:blank' },
-      ->(v) { v.end_with? Capybara::EMPTY_HTML_FILE_PATH } # allow file:// protocol
+      ->(v) { v.start_with? "data:text/html" }
     ].any? { |p| p.(@session.current_url) }.should be_true
     [
       ->(v) { v == '' },
       ->(v) { v == nil },
-      ->(v) { v == Capybara::EMPTY_HTML_FILE_PATH }
+      ->(v) { v.start_with? "data:text/html" }
     ].any? { |p| p.(@session.current_path) }.should be_true
     @session.current_host.should be_nil
   end