diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2013-06-03 20:09:33 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2013-06-03 20:09:33 +0200 |
| commit | 59caeb6c606cb78b92a24def2bea515c85b2421e (patch) | |
| tree | 8399fd996a643f8606233534690fea0b1f8e55f2 /railties | |
| parent | f9c2f76bea41c4a7ad1419844c6102211787c458 (diff) | |
| parent | 75135a97907b4bdeb51eefaaaf8bd35215206fa7 (diff) | |
| download | rails-59caeb6c606cb78b92a24def2bea515c85b2421e.tar.gz rails-59caeb6c606cb78b92a24def2bea515c85b2421e.tar.bz2 rails-59caeb6c606cb78b92a24def2bea515c85b2421e.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/rake_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb index 00a4ab06aa..cfa5cc1322 100644 --- a/railties/test/application/rake_test.rb +++ b/railties/test/application/rake_test.rb @@ -159,7 +159,8 @@ module ApplicationTests end RUBY - output = Dir.chdir(app_path){ `CONTROLLER=cart rake routes` } + ENV['CONTROLLER'] = 'cart' + output = Dir.chdir(app_path){ `rake routes` } assert_equal "Prefix Verb URI Pattern Controller#Action\ncart GET /cart(.:format) cart#show\n", output end |