3 files changed, 159 insertions, 0 deletions
diff --git a/activesupport/test/testing/constant_lookup_test.rb b/activesupport/test/testing/constant_lookup_test.rb
index 71a9561189..0f16419c8b 100644
--- a/activesupport/test/testing/constant_lookup_test.rb
+++ b/activesupport/test/testing/constant_lookup_test.rb
@@ -65,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
diff --git a/activesupport/test/testing/method_call_assertions_test.rb b/activesupport/test/testing/method_call_assertions_test.rb
new file mode 100644
index 0000000000..3e5ba7c079
--- /dev/null
+++ b/activesupport/test/testing/method_call_assertions_test.rb
@@ -0,0 +1,123 @@
+require 'abstract_unit'
+require 'active_support/testing/method_call_assertions'
+
+class MethodCallAssertionsTest < ActiveSupport::TestCase
+  include ActiveSupport::Testing::MethodCallAssertions
+
+  class Level
+    def increment; 1; end
+    def decrement; end
+    def <<(arg); end
+  end
+
+  setup do
+    @object = Level.new
+  end
+
+  def test_assert_called_with_defaults_to_expect_once
+    assert_called @object, :increment do
+      @object.increment
+    end
+  end
+
+  def test_assert_called_more_than_once
+    assert_called(@object, :increment, times: 2) do
+      @object.increment
+      @object.increment
+    end
+  end
+
+  def test_assert_called_method_with_arguments
+    assert_called(@object, :<<) do
+      @object << 2
+    end
+  end
+
+  def test_assert_called_returns
+    assert_called(@object, :increment, returns: 10) do
+      assert_equal 10, @object.increment
+    end
+  end
+
+  def test_assert_called_failure
+    error = assert_raises(Minitest::Assertion) do
+      assert_called(@object, :increment) do
+        # Call nothing...
+      end
+    end
+
+    assert_equal "Expected increment to be called 1 times, but was called 0 times.\nExpected: 1\n  Actual: 0", error.message
+  end
+
+  def test_assert_called_with_message
+    error = assert_raises(Minitest::Assertion) do
+      assert_called(@object, :increment, 'dang it') do
+        # Call nothing...
+      end
+    end
+
+    assert_match(/dang it.\nExpected increment/, error.message)
+  end
+
+  def test_assert_called_with
+    assert_called_with(@object, :increment) do
+      @object.increment
+    end
+  end
+
+  def test_assert_called_with_arguments
+    assert_called_with(@object, :<<, [ 2 ]) do
+      @object << 2
+    end
+  end
+
+  def test_assert_called_with_failure
+    assert_raises(MockExpectationError) do
+      assert_called_with(@object, :<<, [ 4567 ]) do
+        @object << 2
+      end
+    end
+  end
+
+  def test_assert_called_with_returns
+    assert_called_with(@object, :increment, returns: 1) do
+      @object.increment
+    end
+  end
+
+  def test_assert_called_with_multiple_expected_arguments
+    assert_called_with(@object, :<<, [ [ 1 ], [ 2 ] ]) do
+      @object << 1
+      @object << 2
+    end
+  end
+
+  def test_assert_not_called
+    assert_not_called(@object, :decrement) do
+      @object.increment
+    end
+  end
+
+  def test_assert_not_called_failure
+    error = assert_raises(Minitest::Assertion) do
+      assert_not_called(@object, :increment) do
+        @object.increment
+      end
+    end
+
+    assert_equal "Expected increment to be called 0 times, but was called 1 times.\nExpected: 0\n  Actual: 1", error.message
+  end
+
+  def test_stub_any_instance
+    stub_any_instance(Level) do |instance|
+      assert_equal instance, Level.new
+    end
+  end
+
+  def test_stub_any_instance_with_instance
+    stub_any_instance(Level, instance: @object) do |instance|
+      assert_equal @object, instance
+      assert_equal instance, Level.new
+    end
+  end
+end