journaled 2.5.0 → 4.1.0

data/spec/models/journaled/writer_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Journaled::Writer do
           journaled_schema_name: nil,
           journaled_attributes: {},
           journaled_partition_key: '',
-          journaled_app_name: nil,
+          journaled_stream_name: nil,
           journaled_enqueue_opts: {},
         )
       end
@@ -34,7 +34,7 @@ RSpec.describe Journaled::Writer do
           journaled_schema_name: :fake_schema_name,
           journaled_attributes: { foo: :bar },
           journaled_partition_key: 'fake_partition_key',
-          journaled_app_name: nil,
+          journaled_stream_name: nil,
           journaled_enqueue_opts: {},
         )
       end
@@ -75,21 +75,18 @@ RSpec.describe Journaled::Writer do
         journaled_schema_name: :fake_schema_name,
         journaled_attributes: journaled_event_attributes,
         journaled_partition_key: 'fake_partition_key',
-        journaled_app_name: 'my_app',
+        journaled_stream_name: 'my_app_events',
         journaled_enqueue_opts: journaled_enqueue_opts,
+        tagged?: false,
       )
     end
 
-    around do |example|
-      with_jobs_delayed { example.run }
-    end
-
     context 'when the journaled event does NOT comply with the base_event schema' do
       let(:journaled_event_attributes) { { foo: 1 } }
 
       it 'raises an error and does not enqueue anything' do
         expect { subject.journal! }.to raise_error JSON::Schema::ValidationError
-        expect(Delayed::Job.where('handler like ?', '%Journaled::Delivery%').count).to eq 0
+        expect(enqueued_jobs.count).to eq 0
       end
     end
 
@@ -99,7 +96,7 @@ RSpec.describe Journaled::Writer do
 
         it 'raises an error and does not enqueue anything' do
           expect { subject.journal! }.to raise_error JSON::Schema::ValidationError
-          expect(Delayed::Job.where('handler like ?', '%Journaled::Delivery%').count).to eq 0
+          expect(enqueued_jobs.count).to eq 0
         end
       end
 
@@ -107,9 +104,8 @@ RSpec.describe Journaled::Writer do
         let(:journaled_event_attributes) { { id: 'FAKE_UUID', event_type: 'fake_event', created_at: Time.zone.now, foo: :bar } }
 
         it 'creates a delivery with the app name passed through' do
-          allow(Journaled::Delivery).to receive(:new).and_call_original
-          subject.journal!
-          expect(Journaled::Delivery).to have_received(:new).with(hash_including(app_name: 'my_app'))
+          expect { subject.journal! }.to change { enqueued_jobs.count }.from(0).to(1)
+          expect(enqueued_jobs.first[:args].first).to include('stream_name' => 'my_app_events')
         end
 
         context 'when there is no job priority specified in the enqueue opts' do
@@ -122,7 +118,11 @@ RSpec.describe Journaled::Writer do
 
           it 'defaults to the global default' do
             expect { subject.journal! }.to change {
-              Delayed::Job.where('handler like ?', '%Journaled::Delivery%').where(priority: 999).count
+              if Rails::VERSION::MAJOR < 6
+                enqueued_jobs.select { |j| j[:job] == Journaled::DeliveryJob }.count
+              else
+                enqueued_jobs.select { |j| j['job_class'] == 'Journaled::DeliveryJob' && j['priority'] == 999 }.count
+              end
             }.from(0).to(1)
           end
         end
@@ -130,13 +130,45 @@ RSpec.describe Journaled::Writer do
         context 'when there is a job priority specified in the enqueue opts' do
           let(:journaled_enqueue_opts) { { priority: 13 } }
 
-          it 'enqueues a Journaled::Delivery object with the given priority' do
+          it 'enqueues a Journaled::DeliveryJob with the given priority' do
             expect { subject.journal! }.to change {
-              Delayed::Job.where('handler like ?', '%Journaled::Delivery%').where(priority: 13).count
+              if Rails::VERSION::MAJOR < 6
+                enqueued_jobs.select { |j| j[:job] == Journaled::DeliveryJob }.count
+              else
+                enqueued_jobs.select { |j| j['job_class'] == 'Journaled::DeliveryJob' && j['priority'] == 13 }.count
+              end
             }.from(0).to(1)
           end
         end
       end
     end
+
+    context 'when the event is tagged' do
+      before do
+        allow(journaled_event).to receive(:tagged?).and_return(true)
+      end
+
+      context 'and the "tags" attribute is not present' do
+        let(:journaled_event_attributes) do
+          { id: 'FAKE_UUID', event_type: 'fake_event', created_at: Time.zone.now, foo: 'bar' }
+        end
+
+        it 'raises an error and does not enqueue anything' do
+          expect { subject.journal! }.to raise_error JSON::Schema::ValidationError
+          expect(enqueued_jobs.count).to eq 0
+        end
+      end
+
+      context 'and the "tags" attribute is present' do
+        let(:journaled_event_attributes) do
+          { id: 'FAKE_UUID', event_type: 'fake_event', created_at: Time.zone.now, foo: 'bar', tags: { baz: 'bat' } }
+        end
+
+        it 'creates a delivery with the app name passed through' do
+          expect { subject.journal! }.to change { enqueued_jobs.count }.from(0).to(1)
+          expect(enqueued_jobs.first[:args].first).to include('stream_name' => 'my_app_events')
+        end
+      end
+    end
   end
 end

data/spec/rails_helper.rb

@@ -6,7 +6,6 @@ require 'rspec/rails'
 require 'timecop'
 require 'webmock/rspec'
 require 'journaled/rspec'
-require 'pry-rails'
 
 Dir[Rails.root.join('..', 'support', '**', '*.rb')].each { |f| require f }
 
@@ -15,6 +14,6 @@ RSpec.configure do |config|
 
   config.infer_spec_type_from_file_location!
 
-  config.include DelayedJobSpecHelper
+  config.include ActiveJob::TestHelper
   config.include EnvironmentSpecHelper
 end

data/spec/spec_helper.rb

@@ -1,9 +1,7 @@
-require 'delayed_job_active_record'
 rails_env = ENV['RAILS_ENV'] ||= 'test'
-db_adapter = ENV['DB_ADAPTER'] ||= 'postgresql'
 require File.expand_path('dummy/config/environment.rb', __dir__)
 
-Rails.configuration.database_configuration[db_adapter][rails_env].tap do |c|
+Rails.configuration.database_configuration[rails_env].tap do |c|
   ActiveRecord::Tasks::DatabaseTasks.create(c)
   ActiveRecord::Base.establish_connection(c)
   load File.expand_path('dummy/db/schema.rb', __dir__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: journaled
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Jake Lipson
@@ -11,24 +11,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-kinesis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: delayed_job
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -42,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -56,27 +42,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: aws-sdk-kinesis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -90,61 +70,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: railties
   requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '5.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: pry-rails
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -216,19 +168,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -272,24 +224,25 @@ files:
 - README.md
 - Rakefile
 - app/controllers/concerns/journaled/actor.rb
+- app/jobs/journaled/application_job.rb
+- app/jobs/journaled/delivery_job.rb
 - app/models/concerns/journaled/changes.rb
 - app/models/journaled/actor_uri_provider.rb
 - app/models/journaled/change.rb
 - app/models/journaled/change_definition.rb
 - app/models/journaled/change_writer.rb
-- app/models/journaled/delivery.rb
 - app/models/journaled/event.rb
 - app/models/journaled/json_schema_model/validator.rb
 - app/models/journaled/not_truly_exceptional_error.rb
 - app/models/journaled/writer.rb
 - config/initializers/change_protection.rb
-- config/routes.rb
 - config/spring.rb
 - journaled_schemas/base_event.json
 - journaled_schemas/journaled/change.json
+- journaled_schemas/tagged_event.json
 - lib/journaled.rb
+- lib/journaled/current.rb
 - lib/journaled/engine.rb
-- lib/journaled/enqueue.rb
 - lib/journaled/relation_change_protection.rb
 - lib/journaled/rspec.rb
 - lib/journaled/version.rb
@@ -304,9 +257,7 @@ files:
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
@@ -317,25 +268,23 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
-- spec/dummy/db/migrate/20180606205114_create_delayed_jobs.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/jobs/journaled/delivery_job_spec.rb
 - spec/lib/journaled_spec.rb
 - spec/models/concerns/journaled/actor_spec.rb
 - spec/models/concerns/journaled/changes_spec.rb
 - spec/models/database_change_protection_spec.rb
 - spec/models/journaled/actor_uri_provider_spec.rb
 - spec/models/journaled/change_writer_spec.rb
-- spec/models/journaled/delivery_spec.rb
 - spec/models/journaled/event_spec.rb
 - spec/models/journaled/json_schema_model/validator_spec.rb
 - spec/models/journaled/writer_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
-- spec/support/delayed_job_spec_helper.rb
 - spec/support/environment_spec_helper.rb
 homepage: http://github.com/Betterment/journaled
 licenses:
@@ -356,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Journaling for Betterment apps.
@@ -368,7 +317,6 @@ test_files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/locales/en.yml
-- spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/environment.rb
@@ -380,7 +328,6 @@ test_files:
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
@@ -390,18 +337,16 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
 - spec/dummy/db/schema.rb
-- spec/dummy/db/migrate/20180606205114_create_delayed_jobs.rb
 - spec/dummy/README.rdoc
 - spec/models/journaled/json_schema_model/validator_spec.rb
 - spec/models/journaled/actor_uri_provider_spec.rb
-- spec/models/journaled/delivery_spec.rb
 - spec/models/journaled/event_spec.rb
 - spec/models/journaled/change_writer_spec.rb
 - spec/models/journaled/writer_spec.rb
 - spec/models/database_change_protection_spec.rb
 - spec/models/concerns/journaled/changes_spec.rb
 - spec/models/concerns/journaled/actor_spec.rb
-- spec/support/delayed_job_spec_helper.rb
 - spec/support/environment_spec_helper.rb
 - spec/lib/journaled_spec.rb
+- spec/jobs/journaled/delivery_job_spec.rb
 - spec/rails_helper.rb

data/app/models/journaled/delivery.rb

@@ -1,88 +0,0 @@
-class Journaled::Delivery # rubocop:disable Betterment/ActiveJobPerformable
-  DEFAULT_REGION = 'us-east-1'.freeze
-
-  def initialize(serialized_event:, partition_key:, app_name:)
-    @serialized_event = serialized_event
-    @partition_key = partition_key
-    @app_name = app_name
-  end
-
-  def perform
-    kinesis_client.put_record record if Journaled.enabled?
-  rescue Aws::Kinesis::Errors::InternalFailure, Aws::Kinesis::Errors::ServiceUnavailable, Aws::Kinesis::Errors::Http503Error => e
-    Rails.logger.error "Kinesis Error - Server Error occurred - #{e.class}"
-    raise KinesisTemporaryFailure
-  rescue Seahorse::Client::NetworkingError => e
-    Rails.logger.error "Kinesis Error - Networking Error occurred - #{e.class}"
-    raise KinesisTemporaryFailure
-  end
-
-  def stream_name
-    env_var_name = [app_name&.upcase, 'JOURNALED_STREAM_NAME'].compact.join('_')
-    ENV.fetch(env_var_name)
-  end
-
-  def kinesis_client_config
-    {
-      region: ENV.fetch('AWS_DEFAULT_REGION', DEFAULT_REGION),
-      retry_limit: 0,
-      http_idle_timeout: Journaled.http_idle_timeout,
-      http_open_timeout: Journaled.http_open_timeout,
-      http_read_timeout: Journaled.http_read_timeout,
-    }.merge(credentials)
-  end
-
-  private
-
-  attr_reader :serialized_event, :partition_key, :app_name
-
-  def record
-    {
-      stream_name: stream_name,
-      data: serialized_event,
-      partition_key: partition_key,
-    }
-  end
-
-  def kinesis_client
-    Aws::Kinesis::Client.new(kinesis_client_config)
-  end
-
-  def credentials
-    if ENV.key?('JOURNALED_IAM_ROLE_ARN')
-      {
-        credentials: iam_assume_role_credentials,
-      }
-    else
-      legacy_credentials_hash_if_present
-    end
-  end
-
-  def legacy_credentials_hash_if_present
-    if ENV.key?('RUBY_AWS_ACCESS_KEY_ID')
-      {
-        access_key_id: ENV.fetch('RUBY_AWS_ACCESS_KEY_ID'),
-        secret_access_key: ENV.fetch('RUBY_AWS_SECRET_ACCESS_KEY'),
-      }
-    else
-      {}
-    end
-  end
-
-  def sts_client
-    Aws::STS::Client.new({
-      region: ENV.fetch('AWS_DEFAULT_REGION', DEFAULT_REGION),
-    }.merge(legacy_credentials_hash_if_present))
-  end
-
-  def iam_assume_role_credentials
-    @iam_assume_role_credentials ||= Aws::AssumeRoleCredentials.new(
-      client: sts_client,
-      role_arn: ENV.fetch('JOURNALED_IAM_ROLE_ARN'),
-      role_session_name: "JournaledAssumeRoleAccess",
-    )
-  end
-
-  class KinesisTemporaryFailure < NotTrulyExceptionalError
-  end
-end

data/config/routes.rb

@@ -1,2 +0,0 @@
-Rails.application.routes.draw do
-end

data/lib/journaled/enqueue.rb

@@ -1,13 +0,0 @@
-module Journaled
-  class << self
-    def enqueue!(*args)
-      delayed_job_enqueue(*args)
-    end
-
-    private
-
-    def delayed_job_enqueue(*args, **opts)
-      Delayed::Job.enqueue(*args, **opts.reverse_merge(priority: Journaled.job_priority))
-    end
-  end
-end

data/spec/dummy/config/environments/production.rb

@@ -1,78 +0,0 @@
-Rails.application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # Code is not reloaded between requests.
-  config.cache_classes = true
-
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both threaded web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
-  config.eager_load = true
-
-  # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
-  # config.action_dispatch.rack_cache = true
-
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
-
-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
-  # config.assets.css_compressor = :sass
-
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
-
-  # Generate digests for assets URLs.
-  config.assets.digest = true
-
-  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-
-  # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
-
-  # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
-  # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation cannot be found).
-  config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners.
-  config.active_support.deprecation = :notify
-
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
-
-  # Do not dump schema after migrations.
-  config.active_record.dump_schema_after_migration = false
-end

data/spec/dummy/config/initializers/assets.rb

@@ -1,8 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )

data/spec/dummy/db/migrate/20180606205114_create_delayed_jobs.rb

@@ -1,18 +0,0 @@
-class CreateDelayedJobs < ActiveRecord::Migration[5.1]
-  def change
-    create_table :delayed_jobs do |t|
-      t.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue
-      t.integer :attempts, default: 0, null: false # Provides for retries, but still fail eventually.
-      t.text :handler,                 null: false # YAML-encoded string of the object that will do work
-      t.text :last_error                           # reason for last failure (See Note below)
-      t.datetime :run_at                           # When to run. Could be Time.zone.now for immediately, or sometime in the future.
-      t.datetime :locked_at                        # Set when a client is working on this object
-      t.datetime :failed_at                        # Set when all retries have failed (actually, by default, the record is deleted instead)
-      t.string :locked_by                          # Who is working on this object (if locked)
-      t.string :queue                              # The name of the queue this job is in
-      t.timestamps null: true
-    end
-
-    add_index :delayed_jobs, [:priority, :run_at], name: "delayed_jobs_priority"
-  end
-end

data/spec/support/delayed_job_spec_helper.rb

@@ -1,11 +0,0 @@
-module DelayedJobSpecHelper
-  def with_jobs_delayed(opts = {})
-    work_off = opts.fetch(:work_off, true)
-    original = Delayed::Worker.delay_jobs
-    Delayed::Worker.delay_jobs = true
-    yield
-  ensure
-    Delayed::Worker.delay_jobs = original
-    Delayed::Worker.new.work_off if work_off
-  end
-end