1 files changed, 19 insertions, 1 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 50d343865c..7bcfc86d03 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -79,6 +79,24 @@ module ApplicationTests
       end
     end
 
+    test "By default logs tags are not set in development" do
+      restore_default_config
+
+      with_rails_env "development" do
+        app 'development'
+        assert Rails.application.config.log_tags.blank?
+      end
+    end
+
+    test "By default logs are tagged with :request_id in production" do
+      restore_default_config
+
+      with_rails_env "production" do
+        app 'production'
+        assert_equal [:request_id], Rails.application.config.log_tags
+      end
+    end
+
     test "lib dir is on LOAD_PATH during config" do
       app_file 'lib/my_logger.rb', <<-RUBY
         require "logger"
@@ -657,7 +675,7 @@ module ApplicationTests
 
         private
 
-        def form_authenticity_token; token; end # stub the authenticy token
+        def form_authenticity_token(*args); token; end # stub the authenticy token
       end
       RUBY