test_after_commit 1.1.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 30a9eabfded03c293fa14ff97edb56f425d31dbd
-  data.tar.gz: 3a7e41278fd92ea6d651ab5f403e9a0f815e78e6
+SHA256:
+  metadata.gz: 9ba199df5f7861c050858a4c97ef739fd8e2d5c8425955be89ac189cbbc3dded
+  data.tar.gz: fd5998ae5a1032733da2951a501ef9a049f4060c3818370bc89b47cc0ded7d56
 SHA512:
-  metadata.gz: ba3847813fa7faaa404808edd1f37a83ba61b071f7ad190d29f5ae78db3acef1a366e33af11efa449f8342c4667c5b018a62a2dfb34f8c4b038ed09990da3200
-  data.tar.gz: 4441dcee58cac193958a6c421d499e1462a6f05fd285176ee25743b8a428fcaa64aa82782d4cb5cfc46f70b3ea55e7820880e0be2504e4126897ad54417a6900
+  metadata.gz: a7bcd2bfc6e37566ef925da38962d5951eb8fbc8e535e0392e132e7b947fa213c4267a80995e59c81c8978f82a63a5794cb1592bba28992488252aca33dba461
+  data.tar.gz: de0f8b1ebe5285939fceeb1240bf03dcee056c2a28871f9d7f4cb538014b726ebfad195696fe207ebc1789412a2ae5483845094b0cd033a14346b0bda563a456

data/Readme.md

@@ -71,6 +71,7 @@ Inspired by https://gist.github.com/1305285
  - [Brian Palmer](https://github.com/codekitchen)
  - [Oleg Dashevskii](https://github.com/be9)
  - [Jonathan Spies](https://github.com/jspies)
+ - [Nick Sieger](https://github.com/nicksieger)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/test_after_commit/database_statements.rb

@@ -1,6 +1,10 @@
 module TestAfterCommit::DatabaseStatements
   def transaction(*)
     @test_open_transactions ||= 0
+    skip_emulation = ActiveRecord::Base.connection.open_transactions.zero?
+    run_callbacks = false
+    result = nil
+    rolled_back = false
 
     super do
       begin
@@ -13,20 +17,19 @@ module TestAfterCommit::DatabaseStatements
         rolled_back = true
         raise
       ensure
-        begin
-          @test_open_transactions -= 1
-          if @test_open_transactions == 0 && !rolled_back
-            if TestAfterCommit.enabled
-              test_commit_records
-            elsif ActiveRecord::VERSION::MAJOR == 3
-              @_current_transaction_records.clear
-            end
+        @test_open_transactions -= 1
+        if @test_open_transactions == 0 && !rolled_back && !skip_emulation
+          if TestAfterCommit.enabled
+            run_callbacks = true
+          elsif ActiveRecord::VERSION::MAJOR == 3
+            @_current_transaction_records.clear
           end
-        ensure
-          result
         end
       end
     end
+  ensure
+    test_commit_records if run_callbacks
+    result
   end
 
   def test_commit_records
@@ -40,6 +43,9 @@ module TestAfterCommit::DatabaseStatements
       # This is because we're re-using the transaction on the stack, before
       # it's been popped off and re-created by the AR code.
       original = @transaction || @transaction_manager.current_transaction
+
+      return unless original.respond_to?(:records)
+
       transaction = original.dup
       transaction.instance_variable_set(:@records, transaction.records.dup) # deep clone of records array
       original.records.clear                                                # so that this clear doesn't clear out both copies

data/lib/test_after_commit/version.rb

@@ -1,3 +1,3 @@
 module TestAfterCommit
-  VERSION = '1.1.0'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_after_commit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: makes after_commit callbacks testable in Rails 3+ with transactional_fixtures