lib/capy.rb in capy-1.4.3 vs lib/capy.rb in capy-1.4.4

@@ -148,13 +148,19 @@
 
     def capybara(script)
       instance_eval script
     end
 
-    def save_screenshot(png_path = nil)
-      png_path = gen_uniq_file_name('png') unless png_path
-      browser.save_screenshot(png_path)
+    def take_screenshot(png_path = nil)
+      png_path = gen_uniq_file_name('Screen Shot', 'png') unless png_path
+      case Capybara.current_driver
+      when :webkit
+        driver.render(png_path)
+      else
+        browser.save_screenshot(png_path)
+      end
+      png_path
     end
 
     def driver
       page.driver
     end
@@ -171,11 +177,11 @@
       Capy.start_shell(self)
     end
 
     private
 
-    def gen_uniq_file_name(extension)
-      file_name = Time.now.to_s
+    def gen_uniq_file_name(prefix, extension)
+      file_name = "#{prefix} #{Time.now}"
       i = 2
       while File.exists?("#{file_name}.#{extension}")
         file_name = if file_name =~ /\(\d+\)$/
             file_name.sub(/\(\d+\)$/, i.to_s)
           else