Merge branch 'deprecate-pending'

Properly deprecate #pending from AS::TestCase. This has been previously
removed from master, and is now back with a deprecation instead, to avoid
people having tests breaking when upgrading an app.

Please check #4575 for more background.

1 files changed, 6 insertions, 0 deletions

diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index 64426d02e9..dfe9f3c11c 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -108,5 +108,11 @@ module ActiveSupport
       test = tc.new test_name
       assert_raises(Interrupt) { test.run fr }
     end
+
+    def test_pending_deprecation
+      assert_deprecated do
+        pending "should use #skip instead"
+      end
+    end
   end
 end