Avoid Rails issue that after commit callbacks on update does not trig…

…gered - #99

lib/activity_notification/roles/acts_as_notifiable.rb

@@ -280,8 +280,15 @@ def add_tracked_callbacks(target_type, tracked_option = {})
       def add_tracked_callback(tracked_callbacks, tracked_action, tracked_proc)
         return unless tracked_callbacks.include? tracked_action
 
-        if respond_to? :after_commit
+        # FIXME: Avoid Rails issue that after commit callbacks on update does not triggered when optimistic locking is enabled
+        # See the followings:
+        #   https://github.com/rails/rails/issues/30779
+        #   https://github.com/rails/rails/pull/32167
+        # :only-rails-without-callback-issue:
+        if !(Gem::Version.new("5.1.6") <= Rails.gem_version && Rails.gem_version < Gem::Version.new("5.2.2")) && respond_to?(:after_commit)
           after_commit tracked_proc, on: tracked_action
+        # :only-rails-without-callback-issue:
+        # :only-rails-with-callback-issue:
         else
           case tracked_action
           when :create
@@ -290,6 +297,7 @@ def add_tracked_callback(tracked_callbacks, tracked_action, tracked_proc)
             after_update tracked_proc
           end
         end
+        # :only-rails-with-callback-issue:
       end
 
       # Adds destroy dependency.

spec/spec_helper.rb

@@ -20,6 +20,11 @@
   else
     nocov_token 'only-rails5+'
   end
+  if Gem::Version.new("5.1.6") <= Rails.gem_version && Rails.gem_version < Gem::Version.new("5.2.2")
+    nocov_token 'only-rails-without-callback-issue'
+  else
+    nocov_token 'only-rails-with-callback-issue'
+  end
   if ENV['AN_ORM'] == 'mongoid'
     add_filter '/lib/activity_notification/orm/active_record'
   else