Move models and jobs to the app setup

Follow engine conventions more closely

14 files changed, 3 insertions, 1 deletions

diff --git a/lib/active_storage/purge_job.rb b/app/jobs/active_storage/purge_job.rb
index b59d3687f8..b59d3687f8 100644
--- a/lib/active_storage/purge_job.rb
+++ b/app/jobs/active_storage/purge_job.rb
diff --git a/lib/active_storage/attachment.rb b/app/models/active_storage/attachment.rb
index 20c619aa5a..20c619aa5a 100644
--- a/lib/active_storage/attachment.rb
+++ b/app/models/active_storage/attachment.rb
diff --git a/lib/active_storage/blob.rb b/app/models/active_storage/blob.rb
index 6bd3941cd8..6bd3941cd8 100644
--- a/lib/active_storage/blob.rb
+++ b/app/models/active_storage/blob.rb
diff --git a/lib/active_storage/filename.rb b/app/models/active_storage/filename.rb
index 71614b5113..71614b5113 100644
--- a/lib/active_storage/filename.rb
+++ b/app/models/active_storage/filename.rb
diff --git a/lib/active_storage/service.rb b/app/models/active_storage/service.rb
index cba9cd9c83..745b1a615f 100644
--- a/lib/active_storage/service.rb
+++ b/app/models/active_storage/service.rb
@@ -1,4 +1,4 @@
-require_relative "log_subscriber"
+require "active_storage/log_subscriber"
 
 # Abstract class serving as an interface for concrete services.
 #
diff --git a/lib/active_storage/service/configurator.rb b/app/models/active_storage/service/configurator.rb
index 00ae24d251..00ae24d251 100644
--- a/lib/active_storage/service/configurator.rb
+++ b/app/models/active_storage/service/configurator.rb
diff --git a/lib/active_storage/service/disk_service.rb b/app/models/active_storage/service/disk_service.rb
index a2a27528c1..a2a27528c1 100644
--- a/lib/active_storage/service/disk_service.rb
+++ b/app/models/active_storage/service/disk_service.rb
diff --git a/lib/active_storage/service/gcs_service.rb b/app/models/active_storage/service/gcs_service.rb
index 7053a130c0..7053a130c0 100644
--- a/lib/active_storage/service/gcs_service.rb
+++ b/app/models/active_storage/service/gcs_service.rb
diff --git a/lib/active_storage/service/mirror_service.rb b/app/models/active_storage/service/mirror_service.rb
index 54465cad05..54465cad05 100644
--- a/lib/active_storage/service/mirror_service.rb
+++ b/app/models/active_storage/service/mirror_service.rb
diff --git a/lib/active_storage/service/s3_service.rb b/app/models/active_storage/service/s3_service.rb
index efffdec157..efffdec157 100644
--- a/lib/active_storage/service/s3_service.rb
+++ b/app/models/active_storage/service/s3_service.rb
diff --git a/lib/active_storage/variant.rb b/app/models/active_storage/variant.rb
index 435033f980..435033f980 100644
--- a/lib/active_storage/variant.rb
+++ b/app/models/active_storage/variant.rb
diff --git a/lib/active_storage/variation.rb b/app/models/active_storage/variation.rb
index f7c81bb99a..f7c81bb99a 100644
--- a/lib/active_storage/variation.rb
+++ b/app/models/active_storage/variation.rb
diff --git a/lib/active_storage/verified_key_with_expiration.rb b/app/models/active_storage/verified_key_with_expiration.rb
index 4a46483db5..4a46483db5 100644
--- a/lib/active_storage/verified_key_with_expiration.rb
+++ b/app/models/active_storage/verified_key_with_expiration.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 20b22049b3..5508061f6a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,4 +1,6 @@
 $LOAD_PATH << File.expand_path("../../app/controllers", __FILE__)
+$LOAD_PATH << File.expand_path("../../app/models", __FILE__)
+$LOAD_PATH << File.expand_path("../../app/jobs", __FILE__)
 
 require "bundler/setup"
 require "active_support"