aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-08-02 21:48:34 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-08-02 21:48:34 -0500
commit71f512646a447e4b15c613d35842728e6b8dddb1 (patch)
tree0330cb2fd7292ac425ccafe36049e5dbab23b837
parenta5b53ecf956804f4a8d01ad6d96146db6f65bd96 (diff)
downloadrails-71f512646a447e4b15c613d35842728e6b8dddb1.tar.gz
rails-71f512646a447e4b15c613d35842728e6b8dddb1.tar.bz2
rails-71f512646a447e4b15c613d35842728e6b8dddb1.zip
Revert "Isolate railties Generators Tests"
This fixes railties tests in JRuby but break it in MRI This reverts commit fea99276c7024f183bf72a16ad9f36af4bae1d42.
-rw-r--r--railties/test/generators_test.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index 9241297320..5130b285a9 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -3,7 +3,6 @@ require 'rails/generators/rails/model/model_generator'
require 'rails/generators/test_unit/model/model_generator'
class GeneratorsTest < Rails::Generators::TestCase
- include ActiveSupport::Testing::Isolation
include GeneratorsTestHelper
def setup