3 files changed, 24 insertions, 0 deletions
diff --git a/railties/test/application/configuration/custom_test.rb b/railties/test/application/configuration/custom_test.rb
index 28b3b2f2d6..3e0db6fad8 100644
--- a/railties/test/application/configuration/custom_test.rb
+++ b/railties/test/application/configuration/custom_test.rb
@@ -33,6 +33,13 @@ module ApplicationTests
         assert_nil x.i_do_not_exist.zomg
       end
 
+      test 'custom configuration responds to all messages' do
+        x = Rails.configuration.x
+        assert_equal true, x.respond_to?(:i_do_not_exist)
+        assert_kind_of Method, x.method(:i_do_not_exist)
+        assert_kind_of ActiveSupport::OrderedOptions, x.i_do_not_exist
+      end
+
       private
         def new_app
           File.expand_path("#{app_path}/../new_app")
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index 50def9beb0..a94e302099 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -126,6 +126,18 @@ module ApplicationTests
         end
       end
 
+      test 'register additional directories' do
+        app_file "spec/spec_helper.rb", "# TODO: note in spec"
+        app_file "spec/models/user_spec.rb", "# TODO: note in model spec"
+        add_to_config %q{ config.annotations.register_directories("spec") }
+
+        run_rake_notes do |output, lines|
+          assert_match(/note in spec/, output)
+          assert_match(/note in model spec/, output)
+          assert_equal 2, lines.size
+        end
+      end
+
       private
 
       def run_rake_notes(command = 'bin/rails notes')
diff --git a/railties/test/initializable_test.rb b/railties/test/initializable_test.rb
index ed9573453b..d4eafebfa4 100644
--- a/railties/test/initializable_test.rb
+++ b/railties/test/initializable_test.rb
@@ -174,6 +174,11 @@ module InitializableTests
         end
       end
     end
+
+    test "Initializer provides context's class name" do
+      foo = Foo.new
+      assert_equal foo.class, foo.initializers.first.context_class
+    end
   end
 
   class BeforeAfter < ActiveSupport::TestCase