summaryrefslogtreecommitdiff
path: root/spec/mspec/spec/guards/conflict_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/mspec/spec/guards/conflict_spec.rb')
-rw-r--r--spec/mspec/spec/guards/conflict_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/mspec/spec/guards/conflict_spec.rb b/spec/mspec/spec/guards/conflict_spec.rb
index e06a2809ee..deada96821 100644
--- a/spec/mspec/spec/guards/conflict_spec.rb
+++ b/spec/mspec/spec/guards/conflict_spec.rb
@@ -3,6 +3,7 @@ require 'mspec/guards'
describe Object, "#conflicts_with" do
before :each do
+ hide_deprecation_warnings
ScratchPad.clear
end
@@ -33,6 +34,7 @@ end
describe Object, "#conflicts_with" do
before :each do
+ hide_deprecation_warnings
@guard = ConflictsGuard.new
ConflictsGuard.stub(:new).and_return(@guard)
end