From a74fbb2972bb161c553d7a5bd3a13299de6c7927 Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Tue, 28 Jul 2015 12:22:37 +0200
Subject: Add `:nodoc:` for internal testing methods [ci skip]

---
 actionpack/lib/action_dispatch/testing/integration.rb          | 2 +-
 activejob/lib/active_job/test_helper.rb                        | 4 ++--
 activerecord/lib/active_record/fixtures.rb                     | 4 ++--
 activesupport/lib/active_support/log_subscriber/test_helper.rb | 4 ++--
 railties/lib/rails/test_help.rb                                | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index dc664d5540..0298962409 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -391,7 +391,7 @@ module ActionDispatch
 
       attr_reader :app
 
-      def before_setup
+      def before_setup # :nodoc:
         @app = nil
         @integration_session = nil
         super
diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb
index 9b307e8dc8..e71a3b4f85 100644
--- a/activejob/lib/active_job/test_helper.rb
+++ b/activejob/lib/active_job/test_helper.rb
@@ -7,7 +7,7 @@ module ActiveJob
     extend ActiveSupport::Concern
 
     included do
-      def before_setup
+      def before_setup # :nodoc:
         test_adapter = ActiveJob::QueueAdapters::TestAdapter.new
 
         @old_queue_adapters = (ActiveJob::Base.subclasses << ActiveJob::Base).select do |klass|
@@ -24,7 +24,7 @@ module ActiveJob
         super
       end
 
-      def after_teardown
+      def after_teardown # :nodoc:
         super
         @old_queue_adapters.each do |(klass, adapter)|
           klass.queue_adapter = adapter
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index d062dd9e34..f1dc56df63 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -827,12 +827,12 @@ module ActiveRecord
   module TestFixtures
     extend ActiveSupport::Concern
 
-    def before_setup
+    def before_setup # :nodoc:
       setup_fixtures
       super
     end
 
-    def after_teardown
+    def after_teardown # :nodoc:
       super
       teardown_fixtures
     end
diff --git a/activesupport/lib/active_support/log_subscriber/test_helper.rb b/activesupport/lib/active_support/log_subscriber/test_helper.rb
index 75f353f62c..70ac4a4d5c 100644
--- a/activesupport/lib/active_support/log_subscriber/test_helper.rb
+++ b/activesupport/lib/active_support/log_subscriber/test_helper.rb
@@ -33,7 +33,7 @@ module ActiveSupport
     # you can collect them doing @logger.logged(level), where level is the level
     # used in logging, like info, debug, warn and so on.
     module TestHelper
-      def setup
+      def setup # :nodoc:
         @logger   = MockLogger.new
         @notifier = ActiveSupport::Notifications::Fanout.new
 
@@ -44,7 +44,7 @@ module ActiveSupport
         ActiveSupport::Notifications.notifier = @notifier
       end
 
-      def teardown
+      def teardown # :nodoc:
         set_logger(nil)
         ActiveSupport::Notifications.notifier = @old_notifier
       end
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 828039dc43..5cc1b5b219 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -28,14 +28,14 @@ if defined?(ActiveRecord::Base)
 end
 
 class ActionController::TestCase
-  def before_setup
+  def before_setup # :nodoc:
     @routes = Rails.application.routes
     super
   end
 end
 
 class ActionDispatch::IntegrationTest
-  def before_setup
+  def before_setup # :nodoc:
     @routes = Rails.application.routes
     super
   end
-- 
cgit v1.2.3