From 7f4bf0141ebed319ad001f7f07f50d6e7282e1dd Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Sat, 11 Jun 2011 16:22:12 +0530 Subject: [PATCH] Adding Jruby-openssl in gemfile for 3-0-stable. --- railties/lib/rails/generators/rails/app/templates/Gemfile | 1 + railties/test/generators/app_generator_test.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 80888399a4114..b84dfa2b555b2 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -7,6 +7,7 @@ gem 'rails', :git => 'git://github.com/rails/rails.git' <%- else -%> gem 'rails', '<%= Rails::VERSION::STRING %>' +<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%> # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' <%- end -%> diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 8ef5dafdacd94..90527769f3b58 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -169,6 +169,9 @@ def test_config_jdbcmysql_database run_generator([destination_root, "-d", "jdbcmysql"]) assert_file "config/database.yml", /jdbcmysql/ assert_file "Gemfile", /^gem\s+["']activerecord-jdbcmysql-adapter["']$/ + # TODO: When the JRuby guys merge jruby-openssl in + # jruby this will be removed + assert_file "Gemfile", /^gem\s+["']jruby-openssl["']$/ if defined?(JRUBY_VERSION) end def test_config_jdbcsqlite3_database