diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-22 10:31:47 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-22 10:31:47 -0800 |
| commit | e68bc3f14ea93eabdd4274e66071b65debb5a0a8 (patch) | |
| tree | 223c11f38dac1217d8e7e3cd427fdf6018975a9d /railties/test/rails_info_test.rb | |
| parent | 3cb46b40a0df1a1f4912625cc2be40b3d630f1f3 (diff) | |
| parent | e1935e3c0c35f8f1196239e2b1213c4436049fa5 (diff) | |
| download | rails-e68bc3f14ea93eabdd4274e66071b65debb5a0a8.tar.gz rails-e68bc3f14ea93eabdd4274e66071b65debb5a0a8.tar.bz2 rails-e68bc3f14ea93eabdd4274e66071b65debb5a0a8.zip | |
Merge commit 'origin/master' into mail
Diffstat (limited to 'railties/test/rails_info_test.rb')
| -rw-r--r-- | railties/test/rails_info_test.rb | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb index dcf9966c0d..fc28d7e912 100644 --- a/railties/test/rails_info_test.rb +++ b/railties/test/rails_info_test.rb @@ -1,15 +1,4 @@ -$:.unshift File.dirname(__FILE__) + "/../lib" -$:.unshift File.dirname(__FILE__) + "/../builtin/rails_info" -$:.unshift File.dirname(__FILE__) + "/../../activesupport/lib" -$:.unshift File.dirname(__FILE__) + "/../../actionpack/lib" - -require 'rubygems' -gem 'rack', '~> 1.0.0' - -require 'test/unit' -require 'active_support' -require 'active_support/test_case' -require 'action_controller' +require 'abstract_unit' unless defined?(Rails) && defined?(Rails::Info) module Rails |