capybara-screenshot 1.0.25 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8539dcf08bbfb122dfb190cd76f82361373b4016888d02e65daedf42998e7cd2
-  data.tar.gz: bb64e6eb25278f8564a694784b21f9f38d3c550cf6cd2949fe5b5dd2adf5b916
+  metadata.gz: b73d3b8338a3c2f426d7835f4396565c0bfe28b939f610337c331099f93f52b5
+  data.tar.gz: c5ec9f343c703e5ac2700b84dcde63a094c3609787ea7b1cfbbd1f470a5b0ce4
 SHA512:
-  metadata.gz: c1b62365f1e18a17bc4e0d0443bce7194dd7fe9fdbe846df3ea68b45583d452e6fe0047611f8639eb43bc015307de9f993a1485164ddf502879801fd213f9031
-  data.tar.gz: 5a599e20a7684bf4045c2cb318099af8a9385705e83afe342fe756bd592dfc762816dcd54a3946a370b84805dc3d65c8ce2e5fb927c3673256e4c362131611aa
+  metadata.gz: 4cd11454a82290ef985a5341e0dad1eaea6296ca5b6ea1f17522a5f8f43b6c68dd71cfd17426c8204fd352488b6ea876d2e8493b2ec0ce2e575590e13302b456
+  data.tar.gz: d17d96491ebc960f4fa47eec58b9dd60610c4a7839e878d8d40c3003cb054e891fc38e958ba42dbcf7ded095385fbb725cdd9e33e368fec51cd89358653c3576

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+21 Dec 2021 - 1.0.25 -> 1.0.26
+
+* [Take screenshots of current window (when using multiple windows)](https://github.com/mattheworiordan/capybara-screenshot/pull/287)
+* [Fix embedding screenshots into cucumber HTML reports](https://github.com/mattheworiordan/capybara-screenshot/pull/288)
+
 4 Oct 2020 - 1.0.24 -> 1.0.25
 
 * [Fix Cucumber 5 deprecation warnings](https://github.com/mattheworiordan/capybara-screenshot/pull/274)

data/lib/capybara-screenshot/capybara.rb

@@ -27,4 +27,16 @@ module Capybara
       Capybara::Screenshot.screenshot_and_open_image
     end
   end
+
+  module SessionScreenshotOverrides
+    def within_window(window_or_handle)
+      super
+    rescue Exception
+      Thread.current[:capybara_screenshot_offending_window] = window_or_handle
+
+      raise
+    end
+  end
+
+  Session.prepend SessionScreenshotOverrides
 end

data/lib/capybara-screenshot/cucumber.rb

@@ -15,17 +15,18 @@ After do |scenario|
 
       # Trying to embed the screenshot into our output."
       if File.exist?(saver.screenshot_path)
-        require "base64"
-        #encode the image into it's base64 representation
         image = open(saver.screenshot_path, 'rb') {|io|io.read}
         saver.display_image
-        #this will embed the image in the HTML report, embed() is defined in cucumber
-        encoded_img = Base64.encode64(image)
 
         # cucumber5 deprecates embed in favor of attach
         if respond_to? :attach
-          attach(encoded_img, 'image/png')
+          #this will embed the image in the HTML report, attach() is defined in cucumber
+          attach(image, 'image/png')
         else
+          #encode the image into it's base64 representation
+          require "base64"
+          encoded_img = Base64.encode64(image)
+          #this will embed the image in the HTML report, embed() is defined in cucumber
           embed(encoded_img, 'image/png;base64', "Screenshot of the error")
         end
       end

data/lib/capybara-screenshot/rspec/html_link_reporter.rb

@@ -22,7 +22,7 @@ module Capybara
         end
 
         def link_to_screenshot(title, path)
-          url = URI.escape("file://#{path}")
+          url = URI::DEFAULT_PARSER.escape("file://#{path}")
           title = CGI.escape_html(title)
           attributes = attributes_for_screenshot_link(url).map { |name, val| %{#{name}="#{CGI.escape_html(val)}"} }.join(" ")
           "<a #{attributes}>#{title}</a>"

data/lib/capybara-screenshot/saver.rb

@@ -27,19 +27,21 @@ module Capybara
 
       def save
         current_path do |path|
-          if path.empty?
-            warn 'WARN: Screenshot could not be saved. `page.current_path` is empty.'
-          else
-            begin
-              save_html if @html_save
-            rescue StandardError => e
-              warn "WARN: HTML source could not be saved. An exception is raised: #{e.inspect}."
-            end
-
-            begin
-              save_screenshot
-            rescue StandardError => e
-              warn "WARN: Screenshot could not be saved. An exception is raised: #{e.inspect}."
+          within_offending_window do
+            if path.empty?
+              warn 'WARN: Screenshot could not be saved. `page.current_path` is empty.'
+            else
+              begin
+                save_html if @html_save
+              rescue StandardError => e
+                warn "WARN: HTML source could not be saved. An exception is raised: #{e.inspect}."
+              end
+
+              begin
+                save_screenshot
+              rescue StandardError => e
+                warn "WARN: Screenshot could not be saved. An exception is raised: #{e.inspect}."
+              end
             end
           end
         end
@@ -142,6 +144,16 @@ module Capybara
 
         nil
       end
+
+      def within_offending_window
+        return yield unless Thread.current[:capybara_screenshot_offending_window]
+
+        page.within_window(Thread.current[:capybara_screenshot_offending_window]) do
+          yield
+        end
+
+        Thread.current[:capybara_screenshot_offending_window] = nil
+      end
     end
   end
 end

data/lib/capybara-screenshot/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Screenshot
-    VERSION = '1.0.25'
+    VERSION = '1.0.26'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot
 version: !ruby/object:Gem::Version
-  version: 1.0.25
+  version: 1.0.26
 platform: ruby
 authors:
 - Matthew O'Riordan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -243,9 +243,9 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/mattheworiordan/capybara-screenshot/issues
   changelog_uri: https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/capybara-screenshot/1.0.25
-  source_code_uri: https://github.com/mattheworiordan/capybara-screenshot/tree/v1.0.25
-post_install_message: 
+  documentation_uri: https://www.rubydoc.info/gems/capybara-screenshot/1.0.26
+  source_code_uri: https://github.com/mattheworiordan/capybara-screenshot/tree/v1.0.26
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Automatically create snapshots when Cucumber steps fail with Capybara and
   Rails