diff options
| author | José Valim <jose.valim@gmail.com> | 2009-10-09 22:22:17 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-10-15 18:19:25 -0300 |
| commit | 11f9f556b83f90e33ae516cc7a74177a9befdb0b (patch) | |
| tree | 5df7f58b97f41bd5aca747b032d2699dc1fcb06c | |
| parent | a15e02d44ac2afb27a7e8e652c98a796d271b645 (diff) | |
| download | rails-11f9f556b83f90e33ae516cc7a74177a9befdb0b.tar.gz rails-11f9f556b83f90e33ae516cc7a74177a9befdb0b.tar.bz2 rails-11f9f556b83f90e33ae516cc7a74177a9befdb0b.zip | |
Make Orchestra specs run on isolation.
| -rw-r--r-- | activesupport/lib/active_support/orchestra.rb | 1 | ||||
| -rw-r--r-- | railties/test/application/orchestra_test.rb | 3 |
2 files changed, 3 insertions, 1 deletions
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 @@ module ApplicationTests build_app boot_rails + require "active_support/orchestra" Rails::Initializer.run do |c| c.orchestra.queue = MyQueue.new c.orchestra.subscribe(/listening/) do |