Reinstate require_dependency

The attempt at `require` caused a regression in new Rails apps (refs #47).
trptcolin · Oct 22, 2018 · d485ef2 · d485ef2
1 parent 0615350
commit d485ef2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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