capybara-screenshot 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9afdd9d33462cf19d2cd005844e6790171b23073
-  data.tar.gz: ac0e7b147e924204f72657cbdfd92b96e2b912cf
+  metadata.gz: 0ab9945e12e4f0aecbd988f805e0823c97506dda
+  data.tar.gz: 3114b7782691089bf0226c05473be33b14f148c6
 SHA512:
-  metadata.gz: 8966719fe9c36701a98e20c72f92d00be96df39374e871ceb18de0aaf91284c40a9c1bedf714186e0c6967da75df8e477f247bfd0201229c1fd32ce4f57489c4
-  data.tar.gz: 936a36d7efd3fb8e50a203e3130e0575eb0ce5b99c24ae85e56eede5f19faf5b32cb01a42aa997151ebf00971fe85bed1b78734fed5d27116748e1ca9ab7dc10
+  metadata.gz: 7fa7efb0ec06499bd65217077de23ecd8f63a89c7562f08187d2525ae3b9e5b873d8c769b181232aa433bf2749dd109a1421b045bed8cfd5fda6b44204ead894
+  data.tar.gz: 2fdd28b3be83176029cdb4461c2891412571469bbde6634a0ab1f6b3cff8bee767e2053a7b595b7769a2cff3df36a618f12f4100ca5adfc35ac7ce3b3311cb3d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+17 July 2017 - 1.0.16 -> 1.0.17
+
+* [Better handling of `page.current_path` exceptions for Spinach](https://github.com/mattheworiordan/capybara-screenshot/pull/208)
+
 12 July 2017 - 1.0.15 -> 1.0.16
 
 * [Support s3 key name prefixes](https://github.com/mattheworiordan/capybara-screenshot/pull/202)

data/lib/capybara-screenshot/saver.rb

@@ -26,11 +26,23 @@ module Capybara
       end
 
       def save
-        # if current_path empty then nothing to screen shot as browser has not loaded any URL
-        return if page.current_path.to_s.empty?
-
-        save_html if @html_save
-        save_screenshot
+        current_path do |path|
+          if !path.empty?
+            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
+          else
+            warn 'WARN: Screenshot could not be saved. `page.current_path` is empty.'
+          end
+        end
       end
 
       def save_html
@@ -97,6 +109,16 @@ module Capybara
 
       private
 
+      def current_path
+        # the current_path may raise error in selenium
+        begin
+          path = page.current_path.to_s
+        rescue StandardError => e
+          warn "WARN: Screenshot could not be saved. `page.current_path` raised exception: #{e.inspect}."
+        end
+        yield path if path
+      end
+
       def output(message)
         puts "    #{CapybaraScreenshot::Helpers.yellow(message)}"
       end

data/lib/capybara-screenshot/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Screenshot
-    VERSION = '1.0.16'
+    VERSION = '1.0.17'
   end
 end

data/spec/unit/saver_spec.rb

@@ -112,25 +112,87 @@ describe Capybara::Screenshot::Saver do
     expect(saver).to_not be_html_saved
   end
 
-  it 'does not save if current_path is empty' do
-    allow(page_mock).to receive(:current_path).and_return(nil)
-    expect(capybara_mock).to_not receive(:save_page)
-    expect(driver_mock).to_not receive(:render)
+  context 'the current_path is empty' do
+    before(:each) do
+      allow(page_mock).to receive(:current_path).and_return(nil)
+    end
 
-    saver.save
-    expect(saver).to_not be_screenshot_saved
-    expect(saver).to_not be_html_saved
+    it 'does not save' do
+      expect(capybara_mock).to_not receive(:save_page)
+      expect(driver_mock).to_not receive(:render)
+
+      saver.save
+      expect(saver).to_not be_screenshot_saved
+      expect(saver).to_not be_html_saved
+    end
+
+    it 'prints a warning' do
+      expect(saver).to receive(:warn).with(
+        'WARN: Screenshot could not be saved. `page.current_path` is empty.',
+      )
+      saver.save
+    end
+  end
+
+  context 'when save_html raises' do
+    before(:each) do
+      allow(saver).to receive(:save_html).and_raise(NoMethodError.new('some error'))
+    end
+
+    it 'prints warning message' do
+      expect(saver).to receive(:warn).with(
+        'WARN: HTML source could not be saved. An exception is raised: #<NoMethodError: some error>.',
+      )
+      saver.save
+    end
+
+    it 'tries to save screenshot' do
+      expect(saver).to receive(:save_screenshot)
+      saver.save
+    end
   end
 
-  context 'when saving a screenshot fails' do
+  context 'when save_screenshot raises' do
+    before(:each) do
+      allow(saver).to receive(:save_screenshot).and_raise(NoMethodError.new('some error'))
+    end
+
+    it 'prints warning message' do
+      expect(saver).to receive(:warn).with(
+        'WARN: Screenshot could not be saved. An exception is raised: #<NoMethodError: some error>.',
+      )
+      saver.save
+    end
+
+    it 'tries to save screenshot' do
+      expect(saver).to receive(:save_html)
+      saver.save
+    end
+  end
+
+  context 'when current_path raises' do
+    before(:each) do
+      allow(page_mock).to receive(:current_path).and_raise(NoMethodError.new('some error'))
+    end
+
+    it 'prints warning message' do
+      expect(saver).to receive(:warn).with(
+        'WARN: Screenshot could not be saved. `page.current_path` raised exception: #<NoMethodError: some error>.',
+      )
+      saver.save
+    end
+
+    it 'does not print extra warning message' do
+      expect(saver).not_to receive(:warn).with(/is empty/)
+      saver.save
+    end
+
     it 'still restores the original value of Capybara.save_and_open_page_path' do
       Capybara::Screenshot.capybara_tmp_path = 'tmp/bananas'
 
-      expect(capybara_mock).to receive(:save_page).and_raise
+      allow(page_mock).to receive(:current_path).and_raise
 
-      expect {
-        saver.save
-      }.to raise_error(RuntimeError)
+      saver.save
 
       if Capybara.respond_to?(:save_path)
         expect(Capybara.save_path).to eq('tmp/bananas')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Matthew O'Riordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara