From 0282449e6ea95b54b32acfd2de24c8c5f64a8165 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 Nov 2019 06:06:16 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/mailers/notify_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'spec/mailers') diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index cafb96898b3..df82ac38fc6 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -1095,7 +1095,9 @@ describe Notify do context 'when note is not on text' do before do - allow_any_instance_of(DiffDiscussion).to receive(:on_text?).and_return(false) + allow_next_instance_of(DiffDiscussion) do |instance| + allow(instance).to receive(:on_text?).and_return(false) + end end it 'does not include diffs with character-level highlighting' do -- cgit v1.2.3