diff --git a/Gemfile b/Gemfile index a9d45e755..15afa9fa1 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem "fog-aws", "~> 3.14" # 'fog' gem to support Amazon Web Services gem "front_matter_parser", "~> 1.0" # Parse a front matter from syntactically correct strings or files gem "gemoji", "~> 4.0.0.rc3" # Character information and metadata for standard and custom emoji gem "gibbon", "~> 3.4" # API wrapper for MailChimp's API -gem "hairtrigger", "~> 0.2.25" # HairTrigger lets you create and manage database triggers in a concise, db-agnostic, Rails-y way. +gem "hairtrigger", "~> 1.0.0" # HairTrigger lets you create and manage database triggers in a concise, db-agnostic, Rails-y way. gem "honeybadger", "~> 4.12" # Used for tracking application errors gem "honeycomb-beeline", "~> 2.11.0" # Monitoring and Observability gem gem "html_truncator", "~> 0.4" # Truncate an HTML string properly diff --git a/Gemfile.lock b/Gemfile.lock index 954d00bce..ce35792d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -351,8 +351,8 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - hairtrigger (0.2.25) - activerecord (>= 5.0, < 8) + hairtrigger (1.0.0) + activerecord (>= 6.0, < 8) ruby2ruby (~> 2.4) ruby_parser (~> 3.10) hashdiff (1.0.1) @@ -768,10 +768,10 @@ GEM ruby-vips (2.1.4) ffi (~> 1.12) ruby2_keywords (0.0.5) - ruby2ruby (2.4.4) + ruby2ruby (2.5.0) ruby_parser (~> 3.1) sexp_processor (~> 4.6) - ruby_parser (3.19.1) + ruby_parser (3.19.2) sexp_processor (~> 4.16) rubyzip (2.3.2) s3_direct_upload (0.1.7) @@ -1003,7 +1003,7 @@ DEPENDENCIES gibbon (~> 3.4) guard (~> 2.18) guard-rspec (~> 4.7) - hairtrigger (~> 0.2.25) + hairtrigger (~> 1.0.0) honeybadger (~> 4.12) honeycomb-beeline (~> 2.11.0) html_truncator (~> 0.4) diff --git a/spec/models/hair_trigger_spec.rb b/spec/models/hair_trigger_spec.rb index ce26e2f95..8adf355fc 100644 --- a/spec/models/hair_trigger_spec.rb +++ b/spec/models/hair_trigger_spec.rb @@ -2,10 +2,9 @@ require "rails_helper" # HairTrigger suggests adding this test to make sure the schema and triggers are aligned # See https://github.com/jenseng/hair_trigger#testing -RSpec.describe HairTrigger, type: :model do +RSpec.describe HairTrigger do describe ".migrations_current?" do - # Disabled due to Rails 7 compatibility. See https://github.com/jenseng/hair_trigger/pull/104 - 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? diff --git a/vendor/cache/hairtrigger-0.2.25.gem b/vendor/cache/hairtrigger-0.2.25.gem deleted file mode 100644 index 1b801e794..000000000 Binary files a/vendor/cache/hairtrigger-0.2.25.gem and /dev/null differ diff --git a/vendor/cache/hairtrigger-1.0.0.gem b/vendor/cache/hairtrigger-1.0.0.gem new file mode 100644 index 000000000..a891a7638 Binary files /dev/null and b/vendor/cache/hairtrigger-1.0.0.gem differ diff --git a/vendor/cache/ruby2ruby-2.4.4.gem b/vendor/cache/ruby2ruby-2.4.4.gem deleted file mode 100644 index b15fae493..000000000 Binary files a/vendor/cache/ruby2ruby-2.4.4.gem and /dev/null differ diff --git a/vendor/cache/ruby2ruby-2.5.0.gem b/vendor/cache/ruby2ruby-2.5.0.gem new file mode 100644 index 000000000..59b25a8e4 Binary files /dev/null and b/vendor/cache/ruby2ruby-2.5.0.gem differ diff --git a/vendor/cache/ruby_parser-3.19.1.gem b/vendor/cache/ruby_parser-3.19.1.gem deleted file mode 100644 index 99e9daaba..000000000 Binary files a/vendor/cache/ruby_parser-3.19.1.gem and /dev/null differ diff --git a/vendor/cache/ruby_parser-3.19.2.gem b/vendor/cache/ruby_parser-3.19.2.gem new file mode 100644 index 000000000..0533def24 Binary files /dev/null and b/vendor/cache/ruby_parser-3.19.2.gem differ