From e8e8da5c85c105b7a4fec904f82c5e3c7fce507a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Jan 2010 16:01:53 +0100
Subject: Logging thread should not die on logging errors.

---
 railties/test/subscriber_test.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/subscriber_test.rb b/railties/test/subscriber_test.rb
index fa3f7bfabb..724e8a75d6 100644
--- a/railties/test/subscriber_test.rb
+++ b/railties/test/subscriber_test.rb
@@ -18,6 +18,10 @@ class MySubscriber < Rails::Subscriber
   def bar(event)
     info "#{color("cool", :red)}, #{color("isn't it?", :blue, true)}"
   end
+
+  def puke(event)
+    raise "puke"
+  end
 end
 
 module SubscriberTest
@@ -105,6 +109,16 @@ module SubscriberTest
     assert_equal 1, @logger.flush_count
   end
 
+  def test_logging_thread_does_not_die_on_failures
+    Rails::Subscriber.add :my_subscriber, @subscriber
+    instrument "my_subscriber.puke"
+    instrument "action_dispatch.after_dispatch"
+    wait
+    assert_equal 1, @logger.flush_count
+    assert_equal 1, @logger.logged(:error).size
+    assert_equal 'Could not log "my_subscriber.puke" event. RuntimeError: puke', @logger.logged(:error).last
+  end
+
   def test_tails_logs_when_action_dispatch_callback_is_received
     log_tailer = mock()
     log_tailer.expects(:tail!)
-- 
cgit v1.2.3


From 4ca97650880a751901c4370a50c806a84fa529f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Jan 2010 18:43:09 +0100
Subject: Allow railties to specify generators paths.

---
 railties/test/generators_test.rb                  |  7 +++++++
 railties/test/plugins/framework_extension_test.rb | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index 60c81a813f..664d1e5670 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -148,6 +148,13 @@ class GeneratorsTest < Rails::Generators::TestCase
     Rails::Generators.subclasses.delete(klass)
   end
 
+  def test_load_generators_from_railties
+    Rails::Generators::ModelGenerator.expects(:start).with(["Account"], {})
+    Rails::Generators.send(:remove_instance_variable, :@generators_from_railties)
+    Rails.application.expects(:load_generators)
+    Rails::Generators.invoke("model", ["Account"])
+  end
+
   def test_rails_root_templates
     template = File.join(Rails.root, "lib", "templates", "active_record", "model", "model.rb")
 
diff --git a/railties/test/plugins/framework_extension_test.rb b/railties/test/plugins/framework_extension_test.rb
index c920db77aa..d57fd4e635 100644
--- a/railties/test/plugins/framework_extension_test.rb
+++ b/railties/test/plugins/framework_extension_test.rb
@@ -30,6 +30,22 @@ module PluginsTest
       AppTemplate::Application.load_tasks
       assert $ran_block
     end
+
+    test "generators block is executed when MyApp.load_generators is called" do
+      $ran_block = false
+
+      class MyTie < Rails::Railtie
+        generators do
+          $ran_block = true
+        end
+      end
+
+      require "#{app_path}/config/environment"
+
+      assert !$ran_block
+      AppTemplate::Application.load_generators
+      assert $ran_block
+    end
   end
 
   class ActiveRecordExtensionTest < Test::Unit::TestCase
-- 
cgit v1.2.3