Fix #501; The check to whether the table exists for association suppo…

…rt should not be inside of a Proc
paper-trail-gem · Mar 20, 2015 · ca09a8c · ca09a8c · TMaYaD · Mar 20, 2015
1 parent 9528e9e
commit ca09a8c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/paper_trail/version_concern.rb b/lib/paper_trail/version_concern.rb
@@ -7,9 +7,11 @@ module VersionConcern
     included do
       belongs_to :item, :polymorphic => true
 
-      # Need to inspect inside of a Proc so that tests pass even when DB is not initialized
-      # such as when we run on Travis (there won't be a db in `test/dummy/db/`)
-      if lambda { PaperTrail::VersionAssociation.table_exists? }
+      # Since the test suite has test coverage for this, we want to declare the
+      # association when the test suite is running. This makes it pass
+      # when DB is not initialized prior to test runs such as when we run on
+      # Travis CI (there won't be a db in `test/dummy/db/`)
+      if PaperTrail::VersionAssociation.table_exists? || ::Rails.env.test?
         has_many :version_associations, :dependent => :destroy
       end