Should use config.secret_token instead of config.cookie_secret.

lib/application_checker.rb

@@ -237,14 +237,28 @@ module Rails
       end
       
       # Checks for old cookie secret settings
-      def check_old_cookie_setting
+      def check_old_cookie_secret
-        lines = grep_for("ActionController::Base.session = {", "config/**/*")
+        lines = grep_for("ActionController::Base.cookie_verifier_secret = ", "config/**/*")
         files = extract_filenames(lines)
-        
+
         if files
           alert(
             "Deprecated cookie secret setting", 
-            "Previously, session store was set directly on ActionController::Base; now it's now config.cookie_secret.",
+            "Previously, cookie secret was set directly on ActionController::Base; it's now config.secret_token.",
+            "http://weblog.rubyonrails.org/",
+            files
+          )
+        end
+      end
+
+      def check_old_session_secret
+        lines = grep_for("ActionController::Base.session = {", "config/**/*")
+        files = extract_filenames(lines)
+
+        if files
+          alert(
+            "Deprecated session secret setting", 
+            "Previously, session secret was set directly on ActionController::Base; it's now config.secret_token.",
             "http://weblog.rubyonrails.org/",
             files
           )
@@ -259,7 +273,7 @@ module Rails
         if files
           alert(
             "Old session store setting", 
-            "Previously, session store was set directly on ActionController::Base; now it's now config.session_store :whatever.",
+            "Previously, session store was set directly on ActionController::Base; it's now config.session_store :whatever.",
             "http://weblog.rubyonrails.org/",
             files
           )

test/application_checker_test.rb

@@ -161,13 +161,20 @@ class ApplicationCheckerTest < ActiveSupport::TestCase
     
     assert @checker.alerts.has_key?("Deprecated constant(s)")
   end
-  
+
   def test_check_deprecated_cookie_settings
-    make_file("config/initializers/", "more_settings.rb", "ActionController::Base.session = {\n:whatever => 'woot'\n}")
+    make_file("config/initializers/", "more_settings.rb", "ActionController::Base.cookie_verifier_secret = 'OMG'")
-    @checker.check_old_cookie_setting
+    @checker.check_old_cookie_secret
-    
+
     assert @checker.alerts.has_key?("Deprecated cookie secret setting")
   end
+
+  def test_check_deprecated_session_secret
+    make_file("config/initializers/", "more_settings.rb", "ActionController::Base.session = {\n:whatever => 'woot'\n}")
+    @checker.check_old_session_secret
+
+    assert @checker.alerts.has_key?("Deprecated session secret setting")
+  end
   
   def test_check_deprecated_session_settings
     make_file("config/initializers/", "more_settings.rb", "ActionController::Base.session_store = :cookie\nthings.awesome(:whatever)")