diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-25 09:27:22 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-25 09:27:22 -0700 |
| commit | 7219c5f31966a1ec1af075bbd4bdeba4e471533c (patch) | |
| tree | 0789fbea20551bb36783d71412c064dcc3e9b779 | |
| parent | b8b3df0e63bf60bd38e2ed99bcb91b2d56e34a4c (diff) | |
| parent | d67f761a9ed065bc4e59ab3424b50441a3e6678b (diff) | |
| download | rails-7219c5f31966a1ec1af075bbd4bdeba4e471533c.tar.gz rails-7219c5f31966a1ec1af075bbd4bdeba4e471533c.tar.bz2 rails-7219c5f31966a1ec1af075bbd4bdeba4e471533c.zip | |
Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5
Skipping test for OpenSSL::PKCS5 JRuby
| -rw-r--r-- | actionpack/test/dispatch/cookies_test.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb index 892b89b12e..c532e0b8cc 100644 --- a/actionpack/test/dispatch/cookies_test.rb +++ b/actionpack/test/dispatch/cookies_test.rb @@ -1,4 +1,12 @@ require 'abstract_unit' + +begin + require 'openssl' + OpenSSL::PKCS5 +rescue LoadError, NameError + $stderr.puts "Skipping KeyGenerator test: broken OpenSSL install" +else + # FIXME remove DummyKeyGenerator and this require in 4.1 require 'active_support/key_generator' require 'active_support/message_verifier' @@ -724,3 +732,5 @@ class CookiesTest < ActionController::TestCase end end end + +end |