From 11f9f556b83f90e33ae516cc7a74177a9befdb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 9 Oct 2009 22:22:17 -0300
Subject: [PATCH] Make Orchestra specs run on isolation.

---
 activesupport/lib/active_support/orchestra.rb | 1 +
 railties/test/application/orchestra_test.rb   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/orchestra.rb b/activesupport/lib/active_support/orchestra.rb
index 7d4c25669d..96e6ce8865 100644
--- a/activesupport/lib/active_support/orchestra.rb
+++ b/activesupport/lib/active_support/orchestra.rb
@@ -1,5 +1,6 @@
 require 'thread'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module ActiveSupport
   # Orchestra provides an instrumentation API for Ruby. To instrument an action
diff --git a/railties/test/application/orchestra_test.rb b/railties/test/application/orchestra_test.rb
index 38a06be741..fcf073bd6f 100644
--- a/railties/test/application/orchestra_test.rb
+++ b/railties/test/application/orchestra_test.rb
@@ -1,8 +1,8 @@
 require "isolation/abstract_unit"
-require "active_support/orchestra"
 
 module ApplicationTests
   class OrchestraTest < Test::Unit::TestCase
+    include ActiveSupport::Testing::Isolation
 
     class MyQueue
       attr_reader :events, :subscribers
@@ -25,6 +25,7 @@ def setup
       build_app
       boot_rails
 
+      require "active_support/orchestra"
       Rails::Initializer.run do |c|
         c.orchestra.queue = MyQueue.new
         c.orchestra.subscribe(/listening/) do
-- 
GitLab