aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2013-03-22 15:37:33 +0100
committerArun Agrawal <arunagw@gmail.com>2013-03-25 11:01:01 +0100
commitd67f761a9ed065bc4e59ab3424b50441a3e6678b (patch)
tree08e1d2943aee0b07668741023a25e2cd4b05d73a /actionpack
parent8caafd9076c565a30bbab16959ba018545e12a00 (diff)
downloadrails-d67f761a9ed065bc4e59ab3424b50441a3e6678b.tar.gz
rails-d67f761a9ed065bc4e59ab3424b50441a3e6678b.tar.bz2
rails-d67f761a9ed065bc4e59ab3424b50441a3e6678b.zip
Skipping test for OpenSSL::PKCS5 JRuby
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/dispatch/cookies_test.rb10
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