aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorMartin O'Connor <martinoc@gmail.com>2012-05-30 21:56:09 -0400
committerMartin O'Connor <martinoc@gmail.com>2012-05-30 21:56:09 -0400
commit9bbdceb34d33aa31567447e43b5fb5ea638e14fa (patch)
tree606bd96e651b33f1cb580f04f9499f565115fed5 /railties
parent4c8805d60e85e89852da9f1df1dd6f82bc2df957 (diff)
downloadrails-9bbdceb34d33aa31567447e43b5fb5ea638e14fa.tar.gz
rails-9bbdceb34d33aa31567447e43b5fb5ea638e14fa.tar.bz2
rails-9bbdceb34d33aa31567447e43b5fb5ea638e14fa.zip
Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms. Updating tests.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
-rw-r--r--railties/test/generators/app_generator_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 4b7decee5c..52a2df350f 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -234,7 +234,7 @@ module Rails
if defined?(JRUBY_VERSION)
"gem 'therubyrhino'\n"
else
- "# gem 'therubyracer', :platform => :ruby\n"
+ "# gem 'therubyracer', :platforms => :ruby\n"
end
end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 5bf1dbda8d..90a49e8085 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -253,7 +253,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
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