Update to ruby/mspec@3fb5112

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/mspec/lib/mspec/guards/conflict.rb b/spec/mspec/lib/mspec/guards/conflict.rb
index 7a27671c1e..4930e5734d 100644
--- a/spec/mspec/lib/mspec/guards/conflict.rb
+++ b/spec/mspec/lib/mspec/guards/conflict.rb
@@ -1,6 +1,12 @@
 require 'mspec/guards/guard'
+require 'mspec/utils/deprecate'
 
 class ConflictsGuard < SpecGuard
+  def initialize(*args)
+    MSpec.deprecate 'conflicts_with', 'guard -> { condition } do'
+    super(*args)
+  end
+
   def match?
     # Always convert constants to symbols regardless of version.
     constants = Object.constants.map { |x| x.to_sym }