Permalink
Browse files

Adding Jruby-openssl in gemfile for 3-0-stable.

  • Loading branch information...
1 parent bcd9145 commit 7f4bf0141ebed319ad001f7f07f50d6e7282e1dd @arunagw arunagw committed Jun 11, 2011
@@ -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 -%>
@@ -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

0 comments on commit 7f4bf01

Please sign in to comment.