aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-08-27 11:51:36 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2014-08-27 11:51:36 -0300
commitf1a5e1520f05c5db74ba1c5031b1e08b3e23a4e2 (patch)
treec84c034ab935c8ee53ee0ba4cd02c2b5d23aa2df /actionpack/test/dispatch
parent2939e9470d1ed31db3926045c2bd50f5e2715c28 (diff)
parent03e660e768fdd05474471b5718d278c123a8d75c (diff)
downloadrails-f1a5e1520f05c5db74ba1c5031b1e08b3e23a4e2.tar.gz
rails-f1a5e1520f05c5db74ba1c5031b1e08b3e23a4e2.tar.bz2
rails-f1a5e1520f05c5db74ba1c5031b1e08b3e23a4e2.zip
Merge pull request #16717 from splattael/keygenerator
Use less iterations for KeyGenerator in tests
Diffstat (limited to 'actionpack/test/dispatch')
-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"