Merge pull request teamcapybara#415 from copiousfreetime/launchy-2.0

Update to launchy-2.0
nashby · Jul 18, 2011 · b0dbaf8 · b0dbaf8
2 parents 6a17be4 + e084f05
commit b0dbaf8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/capybara.gemspec b/capybara.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency("sinatra", [">= 0.9.4"])
   s.add_development_dependency("rspec", [">= 2.0.0"])
-  s.add_development_dependency("launchy", [">= 0.3.5"])
+  s.add_development_dependency("launchy", ["~> 2.0.2"])
   s.add_development_dependency("yard", [">= 0.5.8"])
   s.add_development_dependency("fuubar", [">= 0.0.1"])
   s.add_development_dependency("cucumber", [">= 0.10"])

diff --git a/lib/capybara/util/save_and_open_page.rb b/lib/capybara/util/save_and_open_page.rb
@@ -23,7 +23,7 @@ def save_and_open_page(html, file_name=nil)
 
     def open_in_browser(path) # :nodoc
       require "launchy"
-      Launchy::Browser.run(path)
+      Launchy.open(path)
     rescue LoadError
       warn "Sorry, you need to install launchy (`gem install launchy`) and " <<
         "make sure it's available to open pages with `save_and_open_page`."

diff --git a/spec/save_and_open_page_spec.rb b/spec/save_and_open_page_spec.rb
@@ -35,7 +35,7 @@
         <html>
       HTML
 
-      Launchy::Browser.stub(:run)
+      Launchy.stub(:open)
     end
 
     def default_file_expectations