Make sure spec_helper is loaded first

rmosolgo · Feb 16, 2021 · 660122a · 660122a
1 parent 4abc185
commit 660122a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/spec/integration/mongoid/spec_helper.rb b/spec/integration/mongoid/spec_helper.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -66,13 +66,17 @@ def testing_mongoid?
   require f
 end
 
+if testing_rails?
+  require "integration/rails/spec_helper"
+end
+
 # Load dependencies
 ['Mongoid', 'Rails'].each do |integration|
   begin
     Object.const_get(integration)
-    Dir["#{File.dirname(__FILE__)}/integration/#{integration.downcase}/**/*.rb"].each do |f|
-      if f.end_with?("spec_helper.rb") || ENV["TEST"].nil?
-        require f
+    if ENV["TEST"].nil?
+      Dir["spec/integration/#{integration.downcase}/**/*.rb"].each do |f|
+        require f.sub("spec/", "")
       end
     end
   rescue NameError