aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-06-03 08:32:04 -0700
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-06-03 08:32:04 -0700
commit2767f833841ea18aaa50d2bff3465310d3e0afac (patch)
tree9dd2d3787abbf501f603dae29e4fcb3c83dba076 /railties
parenta6fe33d8a3c09f3a70ee2a79f96ed5b2c9580d4f (diff)
parent7655fc0b6c7b0593fb73fe1d6b6beddba152f6fe (diff)
downloadrails-2767f833841ea18aaa50d2bff3465310d3e0afac.tar.gz
rails-2767f833841ea18aaa50d2bff3465310d3e0afac.tar.bz2
rails-2767f833841ea18aaa50d2bff3465310d3e0afac.zip
Merge pull request #10809 from wangjohn/fix_failing_railtie_test
Fixing a failing railtie test by wrapping the command inside of sh -c
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/rake_test.rb3
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