delayed 2.0.3 → 2.2.0

data/spec/helper.rb

@@ -38,13 +38,12 @@ end
 
 ENV['RAILS_ENV'] = 'test'
 
-db_adapter = ENV["ADAPTER"]
-gemfile = ENV["BUNDLE_GEMFILE"]
-db_adapter ||= gemfile && gemfile[%r{gemfiles/(.*?)/}] && $1 # rubocop:disable Style/PerlBackrefs
-db_adapter ||= "sqlite3"
+def current_adapter
+  ENV.fetch('ADAPTER', 'sqlite3')
+end
 
 config = YAML.load(ERB.new(File.read("spec/database.yml")).result)
-ActiveRecord::Base.establish_connection config[db_adapter]
+ActiveRecord::Base.establish_connection config[current_adapter]
 ActiveRecord::Base.logger = Delayed.logger
 ActiveJob::Base.logger = Delayed.logger
 ActiveRecord::Migration.verbose = false
@@ -58,7 +57,7 @@ end
 # MySQL 5.7 no longer supports null default values for the primary key
 # Override the default primary key type in Rails <= 4.0
 # https://stackoverflow.com/a/34555109
-if db_adapter == "mysql2"
+if current_adapter == "mysql2"
   types = if defined?(ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter)
             # ActiveRecord 3.2+
             ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::NATIVE_DATABASE_TYPES
@@ -208,6 +207,14 @@ else
   ActiveSupport::Dependencies.autoload_paths << File.dirname(__FILE__)
 end
 
+def default_timezone=(zone)
+  if ActiveRecord::VERSION::MAJOR >= 7
+    ActiveRecord.default_timezone = zone
+  else
+    ActiveRecord::Base.default_timezone = zone
+  end
+end
+
 RSpec::Matchers.define :emit_notification do |expected_event_name|
   attr_reader :actual, :expected
 
@@ -217,10 +224,12 @@ RSpec::Matchers.define :emit_notification do |expected_event_name|
 
   chain :with_payload, :expected_payload
   chain :with_value, :expected_value
+  chain(:approximately) { @approximately = true }
   diffable
 
   match do |block|
-    @expected = { event_name: expected_event_name, payload: expected_payload, value: expected_value }
+    @expected_value = a_value_within([2, @expected_value.abs * 0.05].max).of(@expected_value) if @approximately
+    @expected = { event_name: expected_event_name, payload: expected_payload, value: @expected_value }
     @actuals = []
     callback = ->(name, _started, _finished, _unique_id, payload) do
       @actuals << { event_name: name, payload: payload.except(:value), value: payload[:value] }
@@ -249,10 +258,6 @@ RSpec::Matchers.define :emit_notification do |expected_event_name|
   end
 end
 
-def current_adapter
-  ENV.fetch('ADAPTER', 'sqlite3')
-end
-
 def current_database
   if current_adapter == 'sqlite3'
     a_string_ending_with('tmp/database.sqlite')
@@ -266,6 +271,10 @@ QueryUnderTest = Struct.new(:sql, :connection) do
     new(query.respond_to?(:to_sql) ? query.to_sql : query.to_s, connection)
   end
 
+  def full_description
+    [formatted, explain].join("\n\n")
+  end
+
   def formatted
     fmt = sql.squish
 
@@ -279,6 +288,8 @@ QueryUnderTest = Struct.new(:sql, :connection) do
       .gsub(/ (AND|OR) /) { "\n    #{Regexp.last_match(1).strip} " }
       # normalize and truncate 'AS' names/aliases (changes across Rails versions)
       .gsub(/AS ("|`)?(\w+)("|`)?/) { "AS #{Regexp.last_match(2)[0...63]}" }
+      # newline and indent when aliased columns are listed
+      .gsub(/AS (\w+),/) { "AS #{Regexp.last_match(1)},\n      " }
       # remove quotes around column names in aggregate functions
       .gsub(/(MIN|MAX|COUNT|SUM)\(("|`)(\w+)("|`)\)/) { "#{Regexp.last_match(1)}(#{Regexp.last_match(3)})" }
   end
@@ -303,7 +314,7 @@ QueryUnderTest = Struct.new(:sql, :connection) do
   end
 
   def mysql2_explain
-    seed_rows! # MySQL needs a bit of data to reach for indexes
+    seed_rows! if Delayed::Job.none? # MySQL needs a bit of data to reach for indexes
     connection.execute("ANALYZE TABLE #{Delayed::Job.table_name}")
     connection.execute("SET SESSION max_seeks_for_key = 1")
     connection.execute("EXPLAIN FORMAT=TREE #{sql}").to_a.map(&:first).join("\n")
@@ -317,7 +328,7 @@ QueryUnderTest = Struct.new(:sql, :connection) do
 
   def seed_rows!
     now = Delayed::Job.db_time_now
-    10.times do
+    100.times do
       [true, false].repeated_combination(5).each_with_index do |(erroring, failed, locked, future), i|
         Delayed::Job.create!(
           run_at: now + (future ? i.minutes : -i.minutes),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Nathan Griffith
@@ -19,7 +19,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-02 00:00:00.000000000 Z
+date: 2026-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord