4 files changed, 49 insertions, 47 deletions
diff --git a/activesupport/test/constantize_test_cases.rb b/activesupport/test/constantize_test_cases.rb
index ec05213409..9b62295c96 100644
--- a/activesupport/test/constantize_test_cases.rb
+++ b/activesupport/test/constantize_test_cases.rb
@@ -24,52 +24,52 @@ end
 
 module ConstantizeTestCases
   def run_constantize_tests_on
-    assert_nothing_raised { assert_equal Ace::Base::Case, yield("Ace::Base::Case") }
-    assert_nothing_raised { assert_equal Ace::Base::Case, yield("::Ace::Base::Case") }
-    assert_nothing_raised { assert_equal Ace::Base::Case::Dice, yield("Ace::Base::Case::Dice") }
-    assert_nothing_raised { assert_equal Ace::Base::Fase::Dice, yield("Ace::Base::Fase::Dice") }
-    assert_nothing_raised { assert_equal Ace::Gas::Case, yield("Ace::Gas::Case") }
-    assert_nothing_raised { assert_equal Ace::Gas::Case::Dice, yield("Ace::Gas::Case::Dice") }
-    assert_nothing_raised { assert_equal Case::Dice, yield("Case::Dice") }
-    assert_nothing_raised { assert_equal Case::Dice, yield("Object::Case::Dice") }
-    assert_nothing_raised { assert_equal ConstantizeTestCases, yield("ConstantizeTestCases") }
-    assert_nothing_raised { assert_equal ConstantizeTestCases, yield("::ConstantizeTestCases") }
-    assert_nothing_raised { assert_equal Object, yield("") }
-    assert_nothing_raised { assert_equal Object, yield("::") }
-    assert_raise(NameError) { yield("UnknownClass") }
-    assert_raise(NameError) { yield("UnknownClass::Ace") }
-    assert_raise(NameError) { yield("UnknownClass::Ace::Base") }
-    assert_raise(NameError) { yield("An invalid string") }
-    assert_raise(NameError) { yield("InvalidClass\n") }
-    assert_raise(NameError) { yield("Ace::ConstantizeTestCases") }
-    assert_raise(NameError) { yield("Ace::Base::ConstantizeTestCases") }
-    assert_raise(NameError) { yield("Ace::Gas::Base") }
-    assert_raise(NameError) { yield("Ace::Gas::ConstantizeTestCases") }
+    assert_equal Ace::Base::Case, yield("Ace::Base::Case")
+    assert_equal Ace::Base::Case, yield("::Ace::Base::Case")
+    assert_equal Ace::Base::Case::Dice, yield("Ace::Base::Case::Dice")
+    assert_equal Ace::Base::Fase::Dice, yield("Ace::Base::Fase::Dice")
+    assert_equal Ace::Gas::Case, yield("Ace::Gas::Case")
+    assert_equal Ace::Gas::Case::Dice, yield("Ace::Gas::Case::Dice")
+    assert_equal Case::Dice, yield("Case::Dice")
+    assert_equal Case::Dice, yield("Object::Case::Dice")
+    assert_equal ConstantizeTestCases, yield("ConstantizeTestCases")
+    assert_equal ConstantizeTestCases, yield("::ConstantizeTestCases")
+    assert_equal Object, yield("")
+    assert_equal Object, yield("::")
+    assert_raises(NameError) { yield("UnknownClass") }
+    assert_raises(NameError) { yield("UnknownClass::Ace") }
+    assert_raises(NameError) { yield("UnknownClass::Ace::Base") }
+    assert_raises(NameError) { yield("An invalid string") }
+    assert_raises(NameError) { yield("InvalidClass\n") }
+    assert_raises(NameError) { yield("Ace::ConstantizeTestCases") }
+    assert_raises(NameError) { yield("Ace::Base::ConstantizeTestCases") }
+    assert_raises(NameError) { yield("Ace::Gas::Base") }
+    assert_raises(NameError) { yield("Ace::Gas::ConstantizeTestCases") }
   end
 
   def run_safe_constantize_tests_on
-    assert_nothing_raised { assert_equal Ace::Base::Case, yield("Ace::Base::Case") }
-    assert_nothing_raised { assert_equal Ace::Base::Case, yield("::Ace::Base::Case") }
-    assert_nothing_raised { assert_equal Ace::Base::Case::Dice, yield("Ace::Base::Case::Dice") }
-    assert_nothing_raised { assert_equal Ace::Base::Fase::Dice, yield("Ace::Base::Fase::Dice") }
-    assert_nothing_raised { assert_equal Ace::Gas::Case, yield("Ace::Gas::Case") }
-    assert_nothing_raised { assert_equal Ace::Gas::Case::Dice, yield("Ace::Gas::Case::Dice") }
-    assert_nothing_raised { assert_equal Case::Dice, yield("Case::Dice") }
-    assert_nothing_raised { assert_equal Case::Dice, yield("Object::Case::Dice") }
-    assert_nothing_raised { assert_equal ConstantizeTestCases, yield("ConstantizeTestCases") }
-    assert_nothing_raised { assert_equal ConstantizeTestCases, yield("::ConstantizeTestCases") }
-    assert_nothing_raised { assert_equal Object, yield("") }
-    assert_nothing_raised { assert_equal Object, yield("::") }
-    assert_nothing_raised { assert_equal nil, yield("UnknownClass") }
-    assert_nothing_raised { assert_equal nil, yield("UnknownClass::Ace") }
-    assert_nothing_raised { assert_equal nil, yield("UnknownClass::Ace::Base") }
-    assert_nothing_raised { assert_equal nil, yield("An invalid string") }
-    assert_nothing_raised { assert_equal nil, yield("InvalidClass\n") }
-    assert_nothing_raised { assert_equal nil, yield("blargle") }
-    assert_nothing_raised { assert_equal nil, yield("Ace::ConstantizeTestCases") }
-    assert_nothing_raised { assert_equal nil, yield("Ace::Base::ConstantizeTestCases") }
-    assert_nothing_raised { assert_equal nil, yield("Ace::Gas::Base") }
-    assert_nothing_raised { assert_equal nil, yield("Ace::Gas::ConstantizeTestCases") }
-    assert_nothing_raised { assert_equal nil, yield("#<Class:0x7b8b718b>::Nested_1") }
+    assert_equal Ace::Base::Case, yield("Ace::Base::Case")
+    assert_equal Ace::Base::Case, yield("::Ace::Base::Case")
+    assert_equal Ace::Base::Case::Dice, yield("Ace::Base::Case::Dice")
+    assert_equal Ace::Base::Fase::Dice, yield("Ace::Base::Fase::Dice")
+    assert_equal Ace::Gas::Case, yield("Ace::Gas::Case")
+    assert_equal Ace::Gas::Case::Dice, yield("Ace::Gas::Case::Dice")
+    assert_equal Case::Dice, yield("Case::Dice")
+    assert_equal Case::Dice, yield("Object::Case::Dice")
+    assert_equal ConstantizeTestCases, yield("ConstantizeTestCases")
+    assert_equal ConstantizeTestCases, yield("::ConstantizeTestCases")
+    assert_equal Object, yield("")
+    assert_equal Object, yield("::")
+    assert_nil yield("UnknownClass")
+    assert_nil yield("UnknownClass::Ace")
+    assert_nil yield("UnknownClass::Ace::Base")
+    assert_nil yield("An invalid string")
+    assert_nil yield("InvalidClass\n")
+    assert_nil yield("blargle")
+    assert_nil yield("Ace::ConstantizeTestCases")
+    assert_nil yield("Ace::Base::ConstantizeTestCases")
+    assert_nil yield("Ace::Gas::Base")
+    assert_nil yield("Ace::Gas::ConstantizeTestCases")
+    assert_nil yield("#<Class:0x7b8b718b>::Nested_1")
   end
 end
diff --git a/activesupport/test/spec_type_test.rb b/activesupport/test/spec_type_test.rb
index 95a982d8fd..9a6cb4ded2 100644
--- a/activesupport/test/spec_type_test.rb
+++ b/activesupport/test/spec_type_test.rb
@@ -4,7 +4,6 @@ require "active_record"
 class SomeRandomModel < ActiveRecord::Base; end
 
 class SpecTypeTest < ActiveSupport::TestCase
-
   def assert_support actual
     assert_equal ActiveSupport::TestCase, actual
   end
@@ -13,7 +12,7 @@ class SpecTypeTest < ActiveSupport::TestCase
     assert_equal MiniTest::Spec, actual
   end
 
-  def test_spec_type_resolves_for_actitive_record_constants
+  def test_spec_type_resolves_for_active_record_constants
     assert_support MiniTest::Spec.spec_type(SomeRandomModel)
   end
 
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index c02bfa8497..64426d02e9 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -16,6 +16,9 @@ module ActiveSupport
       def options
         nil
       end
+
+      def record(*args)
+      end
     end
 
     def test_standard_error_raised_within_setup_callback_is_puked
diff --git a/activesupport/test/testing/constant_lookup_test.rb b/activesupport/test/testing/constant_lookup_test.rb
index c56c032cde..19280ba74a 100644
--- a/activesupport/test/testing/constant_lookup_test.rb
+++ b/activesupport/test/testing/constant_lookup_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 
 class Foo; end
-class Bar < Foo;
+class Bar < Foo
   def index; end
   def self.index; end
 end