diff options
| author | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-24 23:59:29 +0100 |
|---|---|---|
| committer | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-24 23:59:29 +0100 |
| commit | 90e9e46576c0a8d57887484cd4f3f51b3b6cce3a (patch) | |
| tree | de254a8fd31ae36f8b9371c9f0e645c7ed1b727d /railties/test/application/console_test.rb | |
| parent | 0ece244feec236f57fb2f55ea564409f25475923 (diff) | |
| parent | 4e96442c4e404141830b2d7f0d850b6556190b39 (diff) | |
| download | rails-90e9e46576c0a8d57887484cd4f3f51b3b6cce3a.tar.gz rails-90e9e46576c0a8d57887484cd4f3f51b3b6cce3a.tar.bz2 rails-90e9e46576c0a8d57887484cd4f3f51b3b6cce3a.zip | |
Merge branch 'master' of github.com:mikel/rails
Diffstat (limited to 'railties/test/application/console_test.rb')
| -rw-r--r-- | railties/test/application/console_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb index e8a4a4e158..22ab60f4a0 100644 --- a/railties/test/application/console_test.rb +++ b/railties/test/application/console_test.rb @@ -9,8 +9,8 @@ class ConsoleTest < Test::Unit::TestCase # Load steps taken from rails/commands/console.rb require "#{rails_root}/config/environment" - require 'rails/console_app' - require 'rails/console_with_helpers' + require 'rails/console/app' + require 'rails/console/helpers' end def test_app_method_should_return_integration_session |