Skip to content

Commit 5f5aee9

Browse files
authored
Merge pull request rails#52184 from sajan45/ac_lib_path
Fix Action Cable loader path prefix
2 parents 1690a3e + f0aaa3c commit 5f5aee9

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

actioncable/lib/action_cable.rb

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@
2727
require "active_support/rails"
2828
require "zeitwerk"
2929

30+
lib = File.dirname(__FILE__)
3031
Zeitwerk::Loader.for_gem.tap do |loader|
3132
loader.ignore(
32-
"#{__dir__}/rails", # Contains generators, templates, docs, etc.
33-
"#{__dir__}/action_cable/gem_version.rb",
34-
"#{__dir__}/action_cable/version.rb",
35-
"#{__dir__}/action_cable/deprecator.rb",
33+
"#{lib}/rails", # Contains generators, templates, docs, etc.
34+
"#{lib}/action_cable/gem_version.rb",
35+
"#{lib}/action_cable/version.rb",
36+
"#{lib}/action_cable/deprecator.rb",
3637
)
3738

3839
loader.do_not_eager_load(
39-
"#{__dir__}/action_cable/subscription_adapter", # Adapters are required and loaded on demand.
40-
"#{__dir__}/action_cable/test_helper.rb",
41-
Dir["#{__dir__}/action_cable/**/test_case.rb"]
40+
"#{lib}/action_cable/subscription_adapter", # Adapters are required and loaded on demand.
41+
"#{lib}/action_cable/test_helper.rb",
42+
Dir["#{lib}/action_cable/**/test_case.rb"]
4243
)
4344

4445
loader.inflector.inflect("postgresql" => "PostgreSQL")

0 commit comments

Comments
 (0)