Fix the broken railties isolation tests

1 files changed, 15 insertions, 17 deletions

diff --git a/railties/test/initializer/path_test.rb b/railties/test/initializer/path_test.rb
index f3d70ad4ca..a4264bc31c 100644
--- a/railties/test/initializer/path_test.rb
+++ b/railties/test/initializer/path_test.rb
@@ -1,29 +1,36 @@
-require "initializer/test_helper"
+require "isolation/abstract_unit"
 
 class PathsTest < Test::Unit::TestCase
   include ActiveSupport::Testing::Isolation
 
-  def self.setup
+  def setup
+    build_app
+    boot_rails
     Rails::Initializer.run do |config|
       config.frameworks = [:action_controller, :action_view, :action_mailer, :active_record]
       config.after_initialize do
         ActionController::Base.session_store = nil
       end
     end
-  end
-
-  def setup
     @paths = Rails::Initializer.default.config.paths
   end
 
   def root(*path)
-    File.expand_path(File.join(File.dirname(__FILE__), "root", *path))
+    app_path(*path).to_s
   end
 
   def assert_path(paths, *dir)
     assert_equal [root(*dir)], paths.paths
   end
 
+  def assert_in_load_path(*path)
+    assert $:.any? { |p| File.expand_path(p) == root(*path) }, "Load path does not include '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----"
+  end
+
+  def assert_not_in_load_path(*path)
+    assert !$:.any? { |p| File.expand_path(p) == root(*path) }, "Load path includes '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----"
+  end
+
   test "booting up Rails yields a valid paths object" do
     assert_path @paths.app, "app"
     assert_path @paths.app.metals, "app", "metal"
@@ -39,8 +46,7 @@ class PathsTest < Test::Unit::TestCase
     assert_path @paths.config.locales, "config", "locales"
     assert_path @paths.config.environments, "config", "environments"
 
-    assert_equal Pathname.new(File.dirname(__FILE__)).join("root", "app", "controllers").expand_path,
-      Pathname.new(@paths.app.controllers.to_a.first).expand_path
+    assert_equal root("app", "controllers"), @paths.app.controllers.to_a.first
     assert_equal Pathname.new(File.dirname(__FILE__)).join("..", "..", "builtin", "rails_info").expand_path,
       Pathname.new(@paths.app.controllers.to_a[1]).expand_path
   end
@@ -56,24 +62,16 @@ class PathsTest < Test::Unit::TestCase
     assert_equal "#{RAILS_ENV}.rb", @paths.config.environments.glob
   end
 
-  def assert_in_load_path(*path)
-    assert $:.any? { |p| File.expand_path(p) == root(*path) }, "Load path does not include '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----"
-  end
-
-  def assert_not_in_load_path(*path)
-    assert !$:.any? { |p| File.expand_path(p) == root(*path) }, "Load path includes '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----"
-  end
-
   test "load path includes each of the paths in config.paths as long as the directories exist" do
     assert_in_load_path "app"
     assert_in_load_path "app", "controllers"
-    assert_in_load_path "app", "metal"
     assert_in_load_path "app", "models"
     assert_in_load_path "app", "helpers"
     assert_in_load_path "lib"
     assert_in_load_path "vendor"
 
     assert_not_in_load_path "app", "views"
+    assert_not_in_load_path "app", "metal"
     assert_not_in_load_path "app", "services"
     assert_not_in_load_path "config"
     assert_not_in_load_path "config", "locales"