From 341f64c0d3ebd0ecbb59b0df387197037f5bd0b1 Mon Sep 17 00:00:00 2001
From: Mac Siri <mac@forem.com>
Date: Fri, 6 Oct 2023 11:24:25 -0400
Subject: [PATCH] Bump with_model (#20222)

---
 Gemfile                          | 2 +-
 Gemfile.lock                     | 2 +-
 spec/models/hair_trigger_spec.rb | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index e44d7d8a2..82b45cca2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -173,6 +173,6 @@ group :test do
   gem "timecop", "~> 0.9" # A gem providing "time travel" and "time freezing" capabilities, making it dead simple to test time-dependent code
   gem "vcr", "~> 6.1" # Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests
   gem "webmock", "~> 3.17", require: false # WebMock allows stubbing HTTP requests and setting expectations on HTTP requests
-  gem "with_model", "~> 2.1.6" # Dynamically build a model within an RSpec context
+  gem "with_model", "~> 2.1.7" # Dynamically build a model within an RSpec context
   gem "zonebie", "~> 0.6.1" # Runs your tests in a random timezone
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 7ca5f30f6..866b032d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1122,7 +1122,7 @@ DEPENDENCIES
   web-console (~> 4.2)
   webmock (~> 3.17)
   webpacker (~> 5.4.3)
-  with_model (~> 2.1.6)
+  with_model (~> 2.1.7)
   yard (~> 0.9)
   yard-activerecord (~> 0.0)
   yard-activesupport-concern (~> 0.0)
diff --git a/spec/models/hair_trigger_spec.rb b/spec/models/hair_trigger_spec.rb
index 877bfa262..8adf355fc 100644
--- a/spec/models/hair_trigger_spec.rb
+++ b/spec/models/hair_trigger_spec.rb
@@ -4,9 +4,7 @@ require "rails_helper"
 # See https://github.com/jenseng/hair_trigger#testing
 RSpec.describe HairTrigger do
   describe ".migrations_current?" do
-    # Temporarily disabling this as it is causing problems with the test suite at the moment.
-    # TODO — re-enable this test once we have a better understanding of the problem.
-    xit "is always true" do
+    it "is always true" do
       # work-around empty AR::Base descendants array caused by with_model cleanup
       # HairTrigger uses AR::Base to get database triggers (and compare against the schema)
       if ActiveRecord::Base.descendants.blank?