diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 12:09:22 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 12:09:22 +0000 |
| commit | 9d67bc14cb59a27c9877474e77d155173a1dedff (patch) | |
| tree | fae9da04bb838c0bf93df6ba7669c15413e99f8e /spec/mailers | |
| parent | 9c7b3812a22465b77ee24657ad1b446b81ffbc74 (diff) | |
| download | gitlab-ce-9d67bc14cb59a27c9877474e77d155173a1dedff.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, 1 insertions, 3 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 5286028d9c6..e56cd488a52 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -1180,9 +1180,7 @@ RSpec.describe Notify do context 'when note is not on text' do before do - allow_next_instance_of(DiffDiscussion) do |instance| - allow(instance).to receive(:on_text?).and_return(false) - end + allow(note.discussion).to receive(:on_text?).and_return(false) end it 'does not include diffs with character-level highlighting' do |