diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
| commit | b04230e3bbf912d60601e9e7b797c4cd43581d51 (patch) | |
| tree | 97a2f784a2ec2bfae4f960af56a9280dad6f7774 /railties/test/generators/generators_test_helper.rb | |
| parent | 867829b187969607aa12f2b0457f25da9c204db0 (diff) | |
| parent | 6e3bee6cf1f0d2684152292db0a8b757249824fd (diff) | |
| download | rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.gz rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.bz2 rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/metal/flash.rb
Diffstat (limited to 'railties/test/generators/generators_test_helper.rb')
| -rw-r--r-- | railties/test/generators/generators_test_helper.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb index fcd0989fd7..54953b76c8 100644 --- a/railties/test/generators/generators_test_helper.rb +++ b/railties/test/generators/generators_test_helper.rb @@ -1,5 +1,3 @@ -# TODO: Fix this RAILS_ENV stuff -RAILS_ENV = 'test' unless defined?(RAILS_ENV) require 'abstract_unit' module Rails @@ -25,4 +23,8 @@ class GeneratorsTestCase < Rails::Generators::TestCase rescue # Do nothing. end + + def test_truth + # Don't cry test/unit + end end
\ No newline at end of file |