From d485ef2163b8d1db7a96d10fe30b4d6e1acd33b0 Mon Sep 17 00:00:00 2001 From: Colin Jones Date: Mon, 22 Oct 2018 07:19:32 -0500 Subject: [PATCH] Reinstate `require_dependency` The attempt at `require` caused a regression in new Rails apps (refs #47). --- lib/consistency_fail/models.rb | 2 +- spec/models_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/consistency_fail/models.rb b/lib/consistency_fail/models.rb index 4b049a2..cfbd375 100644 --- a/lib/consistency_fail/models.rb +++ b/lib/consistency_fail/models.rb @@ -19,7 +19,7 @@ def preload_all self.dirs.each do |d| ruby_files = Dir.glob(File.join(d, "**", "*.rb")).sort ruby_files.each do |model_filename| - Kernel.require model_filename + Kernel.require_dependency model_filename end end end diff --git a/spec/models_spec.rb b/spec/models_spec.rb index fef0a71..1339ab9 100644 --- a/spec/models_spec.rb +++ b/spec/models_spec.rb @@ -28,9 +28,9 @@ def models(load_path) with(File.join("some/other/models", "**", "*.rb")). and_return(["some/other/models/foo.rb"]) - expect(Kernel).to receive(:require).with("app/models/user.rb") - expect(Kernel).to receive(:require).with("app/models/address.rb") - expect(Kernel).to receive(:require).with("some/other/models/foo.rb") + expect(Kernel).to receive(:require_dependency).with("app/models/user.rb") + expect(Kernel).to receive(:require_dependency).with("app/models/address.rb") + expect(Kernel).to receive(:require_dependency).with("some/other/models/foo.rb") models.preload_all end