Skip to content

Commit f6f6b05

Browse files
phChunrafaelfranca
andauthored
Prevent vendorizing gems fixtures in dot directories (like .bundle) from loading when running tests (rails#50548)
* Fix Issue with vendorized gems loading fixtures from dot directories * Fixing matching logic to be specifically any dir starting with a dot on the root Co-authored-by: Rafael Mendonça França <[email protected]>
1 parent 61af6b7 commit f6f6b05

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

railties/lib/rails/engine.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ def load_seed
627627
next if is_a?(Rails::Application)
628628

629629
fixtures = config.root.join("test", "fixtures")
630-
if fixtures_in_root_and_not_in_vendor?(fixtures)
630+
if fixtures_in_root_and_not_in_vendor_or_dot_dir?(fixtures)
631631
ActiveSupport.on_load(:active_record_fixtures) { self.fixture_paths |= ["#{fixtures}/"] }
632632
end
633633
end
@@ -735,9 +735,10 @@ def _all_load_paths(add_autoload_paths_to_load_path)
735735
end
736736
end
737737

738-
def fixtures_in_root_and_not_in_vendor?(fixtures)
738+
def fixtures_in_root_and_not_in_vendor_or_dot_dir?(fixtures)
739739
fixtures.exist? && fixtures.to_s.start_with?(Rails.root.to_s) &&
740-
!fixtures.to_s.start_with?(Rails.root.join("vendor").to_s)
740+
!fixtures.to_s.start_with?(Rails.root.join("vendor").to_s) &&
741+
!fixtures.to_s.start_with?("#{Rails.root}/.".to_s)
741742
end
742743

743744
def build_request(env)

0 commit comments

Comments
 (0)