rspec-retry 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf1468afddcf01b5636087d6a3d439a36a6a8df9c8101215b397bc2bc5684d5
-  data.tar.gz: 13a446f999361c54a86a5db02ef65893cacad2e80c553bc9bb173a09961c3fd5
+  metadata.gz: b497e79a6594a6695a21850042e6a83c85c4db499a3df21c0fd057dffbcf9e10
+  data.tar.gz: 21e43954dcb45663a451ba3525ae28c37221eccf3cc7e213960541e2f74ad6b5
 SHA512:
-  metadata.gz: fac97737f2346315e373ac932f26442652b32a30dac92eae08edb65053aaad2a0155b0a2043b070c56639487fa0cdea7d15e0ec26e0f80b355a4c439fb6c8b6f
-  data.tar.gz: 4a75f75b96fac155424b490ae39d252d0d819cc8f45c5e5e6108b6b1ed002bf0fdff159929ee68aa7af113420d69b02bce5c40a6ed5cf6f0cc7b4354f31c3dde
+  metadata.gz: 24735a1a4cb83b5b4e11d6e485ef617233ed52cd56ad63413d7cc9c465fe9033e131d2da5e392f038187f33582df18f2fce5bf21b6fdd2ff99ef05c15151b6ec
+  data.tar.gz: 1767d99d1578bf9b3bdf41f1db0a10aaa88c088dd14a75fffd63ab44e8413e884173fa37364909eecae88a9f293e0a9dfdd87e10fec498b69e98b434da4e9d6e

data/README.md

@@ -8,8 +8,8 @@ specified number of times until the example succeeds.
 
 | Rspec Version | Rspec-Retry Version |
 |---------------|---------------------|
-| > 3.8         | 0.6.0 but untested  |
-| > 3.3, <= 3.8 | 0.6.0               |
+| > 3.8         | 0.6.1 but untested  |
+| > 3.3, <= 3.8 | 0.6.1               |
 | 3.2           | 0.4.6               |
 | 2.14.8        | 0.4.4               |
 

data/changelog.md

@@ -1,6 +1,11 @@
+# 0.6.1 - 2018-06-11
+## enhancements
+add more flexible method of retrying (thanks @varyform / #48)
+store retry attempts in example metadata (thanks @aeberlin / #43)
+
 # 0.6.0 - 2018-05-15
 ## enhancements
-add exponential backoff option (thanks @patveith, @thedrow / #91, #94, #95)
+add exponential backoff option (thanks @patveith, @thedrow / #91, #94, #95)  
 better documentation (thanks @swrobel / #90)
 
 # 0.5.7 - 2018-03-13
@@ -21,7 +26,7 @@ added support for rspec 3.6.0 (thanks @dthorsen / #76)
 
 # 0.5.3 - 2017-01-11
 ## enhancements
-printing summary of rspec to output not STDOUT (thanks @trevorcreech / #68)
+printing summary of rspec to output not STDOUT (thanks @trevorcreech / #68)  
 removing some development dependencies
 
 # 0.5.2 - 2016-10-03
@@ -38,8 +43,9 @@ drop support for rspec 3.2, added support for 3.4, 3.5
 # 0.4.6 - 2016-8-8
 ## bugfixes
 failure message was off by 1 (thanks @anthonywoo, @vgrigoruk / #57)
+
 ## enhancements
-add the `exceptions_to_hard_fail` options (thanks @james-dominy, @ShockwaveNN / #59)
+add the `exceptions_to_hard_fail` options (thanks @james-dominy, @ShockwaveNN / #59)  
 add retry reporter & api for accessing retry from reporter (thanks @tdeo / #54)
 
 # 0.4.5 - 2015-11-4

data/gemfiles/rspec_3.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    rspec-retry (0.6.0)
+    rspec-retry (0.6.1)
       rspec-core (> 3.3)
 
 GEM

data/gemfiles/rspec_3.4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    rspec-retry (0.6.0)
+    rspec-retry (0.6.1)
       rspec-core (> 3.3)
 
 GEM

data/gemfiles/rspec_3.5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    rspec-retry (0.6.0)
+    rspec-retry (0.6.1)
       rspec-core (> 3.3)
 
 GEM

data/gemfiles/rspec_3.6.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    rspec-retry (0.6.0)
+    rspec-retry (0.6.1)
       rspec-core (> 3.3)
 
 GEM

data/gemfiles/rspec_3.7.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    rspec-retry (0.6.0)
+    rspec-retry (0.6.1)
       rspec-core (> 3.3)
 
 GEM

data/lib/rspec/retry.rb

@@ -13,6 +13,9 @@ module RSpec
         config.add_setting :clear_lets_on_failure, :default => true
         config.add_setting :display_try_failure_messages, :default => false
 
+        # retry based on example metadata
+        config.add_setting :retry_count_condition, :default => ->(_) { nil }
+
         # If a list of exceptions is provided and 'retry' > 1, we only retry if
         # the exception that was raised by the example is NOT in that list. Otherwise
         # we ignore the 'retry' value and fail immediately.
@@ -44,11 +47,8 @@ module RSpec
       current_example.attempts ||= 0
     end
 
-    # context.example is deprecated, but RSpec.current_example is not
-    # available until RSpec 3.0.
     def current_example
-      RSpec.respond_to?(:current_example) ?
-        RSpec.current_example : @ex.example
+      @current_example ||= RSpec.current_example
     end
 
     def retry_count
@@ -56,6 +56,7 @@ module RSpec
           (
           ENV['RSPEC_RETRY_RETRY_COUNT'] ||
               ex.metadata[:retry] ||
+              RSpec.configuration.retry_count_condition.call(ex) ||
               RSpec.configuration.default_retry_count
           ).to_i,
           1
@@ -116,6 +117,8 @@ module RSpec
           end
         end
 
+        example.metadata[:retry_attempts] = self.attempts
+
         example.clear_exception
         ex.run
 

data/lib/rspec/retry/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   class Retry
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/spec/lib/rspec/retry_spec.rb

@@ -56,6 +56,15 @@ describe RSpec::Retry do
       end
     end
 
+    context 'with lambda condition' do
+      before(:all) { set_expectations([false, true]) }
+
+      it "should get retry count from condition call", retry_me_once: true do
+        expect(true).to be(shift_expectation)
+        expect(count).to eq(2)
+      end
+    end
+
     context 'with :retry => 0' do
       after(:all) { @@this_ran_once = nil }
       it 'should still run once', retry: 0 do
@@ -124,6 +133,38 @@ describe RSpec::Retry do
     end
 
     describe "with a list of exceptions to retry on", :retry => 2, :exceptions_to_retry => [RetryError] do
+      context do
+        let(:rspec_version) { RSpec::Core::Version::STRING }
+
+        let(:example_code) do
+          %{
+            $count ||= 0
+            $count += 1
+
+            raise NameError unless $count > 2
+          }
+        end
+
+        let!(:example_group) do
+          $count, $example_code = 0, example_code
+
+          RSpec.describe("example group", exceptions_to_retry: [NameError], retry: 3).tap do |this|
+            this.run # initialize for rspec 3.3+ with no examples
+          end
+        end
+
+        let(:retry_attempts) do
+          example_group.examples.first.metadata[:retry_attempts]
+        end
+
+        it 'should retry and match attempts metadata' do
+          example_group.example { instance_eval($example_code) }
+          example_group.run
+
+          expect(retry_attempts).to eq(2)
+        end
+      end
+
       context "the example throws an exception contained in the retry list" do
         it "retries the maximum number of times" do
           raise RetryError unless count > 1

data/spec/spec_helper.rb

@@ -22,4 +22,6 @@ RSpec.configure do |config|
   config.around :each, :overridden do |ex|
     ex.run_with_retry retry: 3
   end
+
+  config.retry_count_condition = ->(example) { example.metadata[:retry_me_once] ? 2 : nil }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-retry
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Yusuke Mito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core