Permalink
Browse files

Merge pull request #6562 from martinoconnor/generator-fix-stable

3-2-stable Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
  • Loading branch information...
2 parents 4c8805d + 9bbdceb commit f8f6ad6ebc1602afa6af3c9cb297ea7896fb8b3a @rafaelfranca rafaelfranca committed May 31, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 railties/lib/rails/generators/app_base.rb
  2. +1 −1 railties/test/generators/app_generator_test.rb
@@ -234,7 +234,7 @@ def javascript_runtime_gemfile_entry
if defined?(JRUBY_VERSION)
"gem 'therubyrhino'\n"
else
- "# gem 'therubyracer', :platform => :ruby\n"
+ "# gem 'therubyracer', :platforms => :ruby\n"
end
end
@@ -253,7 +253,7 @@ def test_inclusion_of_javascript_runtime
if defined?(JRUBY_VERSION)
assert_file "Gemfile", /gem\s+["']therubyrhino["']$/
else
- assert_file "Gemfile", /# gem\s+["']therubyracer["']+, :platform => :ruby$/
+ assert_file "Gemfile", /# gem\s+["']therubyracer["']+, :platforms => :ruby$/
end
end

0 comments on commit f8f6ad6

Please sign in to comment.