kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #390 from arunagw/jruby_openssl

Browse source 
Adding jruby-openssl in Gemfile by default. #jruby
This commit is contained in:
José Valim 2011-05-05 00:30:42 -07:00
commit 3e9bb5459c
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
railties/lib/rails/generators/rails/app/templates/Gemfile
View file

@ -4,6 +4,7 @@ source 'http://rubygems.org'
<%= database_gemfile_entry -%> <%= database_gemfile_entry -%>
<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) && JRUBY_VERSION < "1.6" -%>
# Asset template engines # Asset template engines
<%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%> <%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%>
gem 'sass' gem 'sass'

1
railties/test/generators/app_generator_test.rb
View file

@ -135,6 +135,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
run_generator([destination_root, "-d", "jdbcmysql"]) run_generator([destination_root, "-d", "jdbcmysql"])
assert_file "config/database.yml", /jdbcmysql/ assert_file "config/database.yml", /jdbcmysql/
assert_file "Gemfile", /^gem\s+["']activerecord-jdbcmysql-adapter["']$/ assert_file "Gemfile", /^gem\s+["']activerecord-jdbcmysql-adapter["']$/
assert_file "Gemfile", /^gem\s+["']jruby-openssl["']$/ if defined?(JRUBY_VERSION) && JRUBY_VERSION < "1.6"
end end
def test_config_jdbcsqlite3_database def test_config_jdbcsqlite3_database