diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 06:06:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 06:06:16 +0000 |
| commit | 0282449e6ea95b54b32acfd2de24c8c5f64a8165 (patch) | |
| tree | 017b43b103e45ff571d637a5efc77b5ed25c0686 /spec/mailers | |
| parent | 0ecdcf59f4342de55a7d2c3ee4ac0d9c3b116aa5 (diff) | |
| download | gitlab-ce-0282449e6ea95b54b32acfd2de24c8c5f64a8165.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/mailers')
| -rw-r--r-- | spec/mailers/notify_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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 |