Clean up outdated deprecation code

1 files changed, 15 insertions, 2 deletions

diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb
index 186caa03ab..ac91874cfa 100644
--- a/spec/support/matchers.rb
+++ b/spec/support/matchers.rb
@@ -1,15 +1,28 @@
 # frozen_string_literal: true
 module Spec
   module Matchers
+    MAJOR_DEPRECATION = /^\[DEPRECATED FOR 2\.0\]\s*/
+
     RSpec::Matchers.define :lack_errors do
+      diffable
       match do |actual|
-        actual.gsub(/(^DEPRECATION:.+[\n]?)/, "") == ""
+        actual.gsub(/#{MAJOR_DEPRECATION}.+[\n]?/, "") == ""
       end
     end
 
     RSpec::Matchers.define :eq_err do |expected|
+      diffable
+      match do |actual|
+        actual.gsub(/#{MAJOR_DEPRECATION}.+[\n]?/, "") == expected
+      end
+    end
+
+    RSpec::Matchers.define :have_major_deprecation do |expected|
+      diffable
       match do |actual|
-        actual.gsub(/(^DEPRECATION:.+\n)/, "") == expected
+        actual.split(MAJOR_DEPRECATION).any? do |d|
+          !d.empty? && values_match?(expected, d.strip)
+        end
       end
     end