aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorPeter Suschlik <ps@neopoly.de>2014-08-27 11:34:17 +0200
committerPeter Suschlik <ps@neopoly.de>2014-08-27 11:34:17 +0200
commit03e660e768fdd05474471b5718d278c123a8d75c (patch)
tree1c8756df7e4eac27eea30ed68293a625cada144e /actionpack
parentc87c36fe501f2f3a37e8b671c6d96f148bdaebb8 (diff)
downloadrails-03e660e768fdd05474471b5718d278c123a8d75c.tar.gz
rails-03e660e768fdd05474471b5718d278c123a8d75c.tar.bz2
rails-03e660e768fdd05474471b5718d278c123a8d75c.zip
Use less iterations for KeyGenerator in tests
This commit improves performance of cookie tests: Ruby | After | Before ----- | --------:| --------: MRI | 5.03s | 9.28s JRuby | 25.45s | 1648.23s Please note the improvement for JRuby.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/dispatch/cookies_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index f62e194ca9..7dc6c37522 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -206,7 +206,7 @@ class CookiesTest < ActionController::TestCase
def setup
super
- @request.env["action_dispatch.key_generator"] = ActiveSupport::KeyGenerator.new("b3c631c314c0bbca50c1b2843150fe33")
+ @request.env["action_dispatch.key_generator"] = ActiveSupport::KeyGenerator.new("b3c631c314c0bbca50c1b2843150fe33", iterations: 2)
@request.env["action_dispatch.signed_cookie_salt"] = "b3c631c314c0bbca50c1b2843150fe33"
@request.env["action_dispatch.encrypted_cookie_salt"] = "b3c631c314c0bbca50c1b2843150fe33"
@request.env["action_dispatch.encrypted_signed_cookie_salt"] = "b3c631c314c0bbca50c1b2843150fe33"