aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-03 07:00:21 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-03 07:00:21 -0700
commitb3efea8a6de1d7c4226c2781091079a6a3bef63f (patch)
tree78f8ace38029798dfbfbe30b0344f88d2b85ebad /actionpack/test
parent148b9ccbb537f99f35374a49aad929aebf8d6ff2 (diff)
parent2edf657a64ee74096e73fe2300e73c080a2e87e1 (diff)
downloadrails-b3efea8a6de1d7c4226c2781091079a6a3bef63f.tar.gz
rails-b3efea8a6de1d7c4226c2781091079a6a3bef63f.tar.bz2
rails-b3efea8a6de1d7c4226c2781091079a6a3bef63f.zip
Merge pull request #10074 from trevorturk/remove-fixme-comments-about-legacy-key-generator
Remove comments about removing LegacyKeyGenerator in 4.1
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/flash_test.rb1
-rw-r--r--actionpack/test/controller/http_digest_authentication_test.rb1
-rw-r--r--actionpack/test/dispatch/cookies_test.rb1
-rw-r--r--actionpack/test/dispatch/session/cookie_store_test.rb1
4 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index e4d0eb88db..3b874a739a 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -1,5 +1,4 @@
require 'abstract_unit'
-# FIXME remove LegacyKeyGenerator and this require in 4.1
require 'active_support/key_generator'
class FlashTest < ActionController::TestCase
diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb
index 6342fe8f9a..9f1c168209 100644
--- a/actionpack/test/controller/http_digest_authentication_test.rb
+++ b/actionpack/test/controller/http_digest_authentication_test.rb
@@ -1,5 +1,4 @@
require 'abstract_unit'
-# FIXME remove LegacyKeyGenerator and this require in 4.1
require 'active_support/key_generator'
class HttpDigestAuthenticationTest < ActionController::TestCase
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 779031605a..91ac13e7c6 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -7,7 +7,6 @@ rescue LoadError, NameError
$stderr.puts "Skipping KeyGenerator test: broken OpenSSL install"
else
-# FIXME remove LegacyKeyGenerator and this require in 4.1
require 'active_support/key_generator'
require 'active_support/message_verifier'
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index bd05e008b3..e99ff46edf 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -1,6 +1,5 @@
require 'abstract_unit'
require 'stringio'
-# FIXME remove LegacyKeyGenerator and this require in 4.1
require 'active_support/key_generator'
class CookieStoreTest < ActionDispatch::IntegrationTest