3 files changed, 15 insertions, 31 deletions
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index e8a4a4e158..22ab60f4a0 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -9,8 +9,8 @@ class ConsoleTest < Test::Unit::TestCase
 
     # Load steps taken from rails/commands/console.rb
     require "#{rails_root}/config/environment"
-    require 'rails/console_app'
-    require 'rails/console_with_helpers'
+    require 'rails/console/app'
+    require 'rails/console/helpers'
   end
 
   def test_app_method_should_return_integration_session
diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb
index 754c0f1839..053757979b 100644
--- a/railties/test/application/initializer_test.rb
+++ b/railties/test/application/initializer_test.rb
@@ -29,7 +29,7 @@ module ApplicationTests
 
       add_to_config <<-RUBY
         config.root = "#{app_path}"
-        config.eager_load_paths = "#{app_path}/lib"
+        config.eager_load_paths << "#{app_path}/lib"
       RUBY
 
       require "#{app_path}/config/environment"
@@ -38,13 +38,24 @@ module ApplicationTests
     end
 
     test "load environment with global" do
-      app_file "config/environments/development.rb", "$initialize_test_set_from_env = 'success'"
+      app_file "config/environments/development.rb", <<-RUBY
+        $initialize_test_set_from_env = 'success'
+        AppTemplate::Application.configure do
+          config.cache_classes = true
+          config.time_zone = "Brasilia"
+        end
+      RUBY
+
       assert_nil $initialize_test_set_from_env
       add_to_config <<-RUBY
         config.root = "#{app_path}"
+          config.time_zone = "UTC"
       RUBY
+
       require "#{app_path}/config/environment"
       assert_equal "success", $initialize_test_set_from_env
+      assert AppTemplate::Application.config.cache_classes
+      assert_equal "Brasilia", AppTemplate::Application.config.time_zone
     end
 
     test "action_controller load paths set only if action controller in use" do
diff --git a/railties/test/application/notifications_test.rb b/railties/test/application/notifications_test.rb
index db8605edbe..061bb34c19 100644
--- a/railties/test/application/notifications_test.rb
+++ b/railties/test/application/notifications_test.rb
@@ -1,17 +1,6 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class MyQueue
-    def publish(name, *args)
-      raise name
-    end
-
-    # Not a full queue implementation
-    def method_missing(name, *args, &blk)
-      self
-    end
-  end
-
   class MockLogger
     def method_missing(*args)
       @logged ||= []
@@ -39,22 +28,6 @@ module ApplicationTests
       ActiveSupport::Notifications.notifier.wait
     end
 
-    test "new queue is set" do
-      # We don't want to load all frameworks, so remove them and clean up environments.
-      use_frameworks []
-      FileUtils.rm_rf("#{app_path}/config/environments")
-
-      add_to_config <<-RUBY
-        config.notifications.notifier = ActiveSupport::Notifications::Notifier.new(ApplicationTests::MyQueue.new)
-      RUBY
-
-      require "#{app_path}/config/environment"
-
-      assert_raise RuntimeError do
-        ActiveSupport::Notifications.publish('foo')
-      end
-    end
-
     test "rails subscribers are added" do
       add_to_config <<-RUBY
         config.colorize_logging = false