From 98240c49b05093d6d14b9384a9bd695b58eefb59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 23 Jan 2010 01:29:29 +0100
Subject: Get rid of initializers global and create i18n railtie.

---
 railties/test/application/initializer_test.rb   |  4 ++--
 railties/test/application/notifications_test.rb | 27 -------------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

(limited to 'railties/test/application')

diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb
index 754c0f1839..205840360c 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"
@@ -132,7 +132,7 @@ module ApplicationTests
       require "#{app_path}/config/environment"
 
       assert_equal [
-        "#{app_path}/config/locales/en.yml", "my/other/locale.yml"
+        "my/other/locale.yml", "#{app_path}/config/locales/en.yml"
       ], Rails.application.config.i18n.load_path
     end
 
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
-- 
cgit v1.2.3