1 files changed, 30 insertions, 17 deletions
diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
index 12630e4d01..7b2551062a 100644
--- a/railties/test/paths_test.rb
+++ b/railties/test/paths_test.rb
@@ -1,6 +1,6 @@
-require 'abstract_unit'
-require 'rails/paths'
-require 'minitest/mock'
+require "abstract_unit"
+require "rails/paths"
+require "minitest/mock"
 
 class PathsTest < ActiveSupport::TestCase
   def setup
@@ -62,6 +62,13 @@ class PathsTest < ActiveSupport::TestCase
     assert_equal ["/foo/bar/baz"], @root["app/models"].to_a
   end
 
+  test "absolute current path" do
+    @root.add "config"
+    @root.add "config/locales"
+
+    assert_equal "/foo/bar/config/locales", @root["config/locales"].absolute_current
+  end
+
   test "adding multiple physical paths as an array" do
     @root.add "app", with: ["/app", "/app2"]
     assert_equal ["/app", "/app2"], @root["app"].to_a
@@ -96,7 +103,7 @@ class PathsTest < ActiveSupport::TestCase
       @root.add "app", with: "/app"
       @root["app"].autoload_once!
       assert @root["app"].autoload_once?
-      assert @root.autoload_once.include?(@root["app"].expanded.first)
+      assert_includes @root.autoload_once, @root["app"].expanded.first
     end
   end
 
@@ -107,14 +114,14 @@ class PathsTest < ActiveSupport::TestCase
 
     @root["app"].skip_autoload_once!
     assert !@root["app"].autoload_once?
-    assert !@root.autoload_once.include?(@root["app"].expanded.first)
+    assert_not_includes @root.autoload_once, @root["app"].expanded.first
   end
 
   test "it is possible to add a path without assignment and specify it should be loaded only once" do
     File.stub(:exist?, true) do
       @root.add "app", with: "/app", autoload_once: true
       assert @root["app"].autoload_once?
-      assert @root.autoload_once.include?("/app")
+      assert_includes @root.autoload_once, "/app"
     end
   end
 
@@ -122,8 +129,8 @@ class PathsTest < ActiveSupport::TestCase
     File.stub(:exist?, true) do
       @root.add "app", with: ["/app", "/app2"], autoload_once: true
       assert @root["app"].autoload_once?
-      assert @root.autoload_once.include?("/app")
-      assert @root.autoload_once.include?("/app2")
+      assert_includes @root.autoload_once, "/app"
+      assert_includes @root.autoload_once, "/app2"
     end
   end
 
@@ -132,7 +139,7 @@ class PathsTest < ActiveSupport::TestCase
       @root["app"] = "/app"
       @root["app"].autoload_once!
       @root["app"].autoload_once!
-      assert_equal 1, @root.autoload_once.select {|p| p == @root["app"].expanded.first }.size
+      assert_equal 1, @root.autoload_once.select { |p| p == @root["app"].expanded.first }.size
     end
   end
 
@@ -150,7 +157,7 @@ class PathsTest < ActiveSupport::TestCase
       @root["app"] = "/app"
       @root["app"].eager_load!
       assert @root["app"].eager_load?
-      assert @root.eager_load.include?(@root["app"].to_a.first)
+      assert_includes @root.eager_load, @root["app"].to_a.first
     end
   end
 
@@ -161,14 +168,14 @@ class PathsTest < ActiveSupport::TestCase
 
     @root["app"].skip_eager_load!
     assert !@root["app"].eager_load?
-    assert !@root.eager_load.include?(@root["app"].to_a.first)
+    assert_not_includes @root.eager_load, @root["app"].to_a.first
   end
 
   test "it is possible to add a path without assignment and mark it as eager" do
     File.stub(:exist?, true) do
       @root.add "app", with: "/app", eager_load: true
       assert @root["app"].eager_load?
-      assert @root.eager_load.include?("/app")
+      assert_includes @root.eager_load, "/app"
     end
   end
 
@@ -176,8 +183,8 @@ class PathsTest < ActiveSupport::TestCase
     File.stub(:exist?, true) do
       @root.add "app", with: ["/app", "/app2"], eager_load: true
       assert @root["app"].eager_load?
-      assert @root.eager_load.include?("/app")
-      assert @root.eager_load.include?("/app2")
+      assert_includes @root.eager_load, "/app"
+      assert_includes @root.eager_load, "/app2"
     end
   end
 
@@ -186,8 +193,8 @@ class PathsTest < ActiveSupport::TestCase
       @root.add "app", with: "/app", eager_load: true, autoload_once: true
       assert @root["app"].eager_load?
       assert @root["app"].autoload_once?
-      assert @root.eager_load.include?("/app")
-      assert @root.autoload_once.include?("/app")
+      assert_includes @root.eager_load, "/app"
+      assert_includes @root.autoload_once, "/app"
     end
   end
 
@@ -196,7 +203,7 @@ class PathsTest < ActiveSupport::TestCase
       @root["app"] = "/app"
       @root["app"].eager_load!
       @root["app"].eager_load!
-      assert_equal 1, @root.eager_load.select {|p| p == @root["app"].expanded.first }.size
+      assert_equal 1, @root.eager_load.select { |p| p == @root["app"].expanded.first }.size
     end
   end
 
@@ -215,6 +222,12 @@ class PathsTest < ActiveSupport::TestCase
     assert_equal "*.rb", @root["app"].glob
   end
 
+  test "it should be possible to get extensions by glob" do
+    @root["app"] = "/app"
+    @root["app"].glob = "*.{rb,yml}"
+    assert_equal ["rb", "yml"], @root["app"].extensions
+  end
+
   test "it should be possible to override a path's default glob without assignment" do
     @root.add "app", with: "/app", glob: "*.rb"
     assert_equal "*.rb", @root["app"].glob