2 files changed, 36 insertions, 1 deletions
diff --git a/activesupport/test/testing/constant_lookup_test.rb b/activesupport/test/testing/constant_lookup_test.rb
index aca2951450..0f16419c8b 100644
--- a/activesupport/test/testing/constant_lookup_test.rb
+++ b/activesupport/test/testing/constant_lookup_test.rb
@@ -6,7 +6,6 @@ class Bar < Foo
   def index; end
   def self.index; end
 end
-class Baz < Bar; end
 module FooBar; end
 
 class ConstantLookupTest < ActiveSupport::TestCase
@@ -66,4 +65,12 @@ class ConstantLookupTest < ActiveSupport::TestCase
       }
     }
   end
+
+  def test_does_not_swallow_exception_on_no_name_error_within_constant
+    assert_raises(NameError) do
+      with_autoloading_fixtures do
+        self.class.determine_constant_from_test_name('RaisesNameError')
+      end
+    end
+  end
 end
diff --git a/activesupport/test/testing/file_fixtures_test.rb b/activesupport/test/testing/file_fixtures_test.rb
new file mode 100644
index 0000000000..91b8a9071c
--- /dev/null
+++ b/activesupport/test/testing/file_fixtures_test.rb
@@ -0,0 +1,28 @@
+require 'abstract_unit'
+
+class FileFixturesTest < ActiveSupport::TestCase
+  self.file_fixture_path = File.expand_path("../../file_fixtures", __FILE__)
+
+  test "#file_fixture returns Pathname to file fixture" do
+    path = file_fixture("sample.txt")
+    assert_kind_of Pathname, path
+    assert_match %r{activesupport/test/file_fixtures/sample.txt$}, path.to_s
+  end
+
+  test "raises an exception when the fixture file does not exist" do
+    e = assert_raises(ArgumentError) do
+      file_fixture("nope")
+    end
+    assert_match(/^the directory '[^']+test\/file_fixtures' does not contain a file named 'nope'$/, e.message)
+  end
+end
+
+class FileFixturesPathnameDirectoryTest < ActiveSupport::TestCase
+  self.file_fixture_path = Pathname.new(File.expand_path("../../file_fixtures", __FILE__))
+
+  test "#file_fixture_path returns Pathname to file fixture" do
+    path = file_fixture("sample.txt")
+    assert_kind_of Pathname, path
+    assert_match %r{activesupport/test/file_fixtures/sample.txt$}, path.to_s
+  end
+end