Skip to content

Commit 4e1fee1

Browse files
authored
Merge pull request rails#42496 from rails/revert-42492-run-activejob-tests
Revert "Run ActiveRecord -> ActiveJob integration tests in CI"
2 parents 8580855 + a13b135 commit 4e1fee1

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

activerecord/test/cases/activejob/destroy_association_async_test.rb renamed to activerecord/test/activejob/destroy_association_async_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
require "cases/activejob/helper"
3+
require "activejob/helper"
44

55
require "models/book_destroy_async"
66
require "models/essay_destroy_async"

activerecord/test/cases/activejob/helper.rb renamed to activerecord/test/activejob/helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
ActiveJob::Base.queue_adapter = :test
1111
ActiveJob::Base.logger = ActiveSupport::Logger.new(nil)
1212

13-
require_relative "../../../../tools/test_common"
13+
require_relative "../../../tools/test_common"
1414

1515
ActiveRecord::Base.destroy_association_async_job = ActiveRecord::DestroyAssociationAsyncJob

0 commit comments

Comments
 (0)