Renamed Orchestra to Notifications once again [#3321 state:resolved]

3 files changed, 15 insertions, 15 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 8e0e28c362..fe2dc3769e 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -488,12 +488,12 @@ module Rails
       end
     end
 
-    # For each framework, search for instrument file with Orchestra hooks.
+    # For each framework, search for instrument file with Notifications hooks.
     #
-    initializer :load_orchestra_instrumentation do
+    initializer :load_notifications_hooks do
       config.frameworks.each do |framework|
         begin
-          require "#{framework}/instrument"
+          require "#{framework}/notifications"
         rescue LoadError => e
         end
       end
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 3d9ae46786..3cb39245ff 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -290,12 +290,12 @@ module Rails
       end
     end
 
-    # Allows Orchestra queue to be modified.
+    # Allows Notifications queue to be modified.
     #
-    #   config.orchestra.queue = MyNewQueue.new
+    #   config.notifications.queue = MyNewQueue.new
     #
-    def orchestra
-      ActiveSupport::Orchestra
+    def notifications
+      ActiveSupport::Notifications
     end
 
     class Generators #:nodoc:
diff --git a/railties/test/application/orchestra_test.rb b/railties/test/application/notifications_test.rb
index fcf073bd6f..c861d10c35 100644
--- a/railties/test/application/orchestra_test.rb
+++ b/railties/test/application/notifications_test.rb
@@ -1,7 +1,7 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class OrchestraTest < Test::Unit::TestCase
+  class NotificationsTest < Test::Unit::TestCase
     include ActiveSupport::Testing::Isolation
 
     class MyQueue
@@ -25,26 +25,26 @@ module ApplicationTests
       build_app
       boot_rails
 
-      require "active_support/orchestra"
+      require "active_support/notifications"
       Rails::Initializer.run do |c|
-        c.orchestra.queue = MyQueue.new
-        c.orchestra.subscribe(/listening/) do
+        c.notifications.queue = MyQueue.new
+        c.notifications.subscribe(/listening/) do
           puts "Cool"
         end
       end
     end
 
     test "new queue is set" do
-      ActiveSupport::Orchestra.instrument(:foo)
-      assert_equal :foo, ActiveSupport::Orchestra.queue.events.first
+      ActiveSupport::Notifications.instrument(:foo)
+      assert_equal :foo, ActiveSupport::Notifications.queue.events.first
     end
 
     test "frameworks subscribers are loaded" do
-      assert_equal 1, ActiveSupport::Orchestra.queue.subscribers.count { |s| s == "sql" }
+      assert_equal 1, ActiveSupport::Notifications.queue.subscribers.count { |s| s == "sql" }
     end
 
     test "configuration subscribers are loaded" do
-      assert_equal 1, ActiveSupport::Orchestra.queue.subscribers.count { |s| s == /listening/ }
+      assert_equal 1, ActiveSupport::Notifications.queue.subscribers.count { |s| s == /listening/ }
     end
   end
 end