diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 09:06:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 09:06:16 +0300 |
| commit | 0282449e6ea95b54b32acfd2de24c8c5f64a8165 (patch) | |
| tree | 017b43b103e45ff571d637a5efc77b5ed25c0686 /spec/models/diff_viewer | |
| parent | 0ecdcf59f4342de55a7d2c3ee4ac0d9c3b116aa5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/diff_viewer')
| -rw-r--r-- | spec/models/diff_viewer/base_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/models/diff_viewer/base_spec.rb b/spec/models/diff_viewer/base_spec.rb index b8bdeb781dc..019597993cc 100644 --- a/spec/models/diff_viewer/base_spec.rb +++ b/spec/models/diff_viewer/base_spec.rb @@ -60,7 +60,9 @@ describe DiffViewer::Base do context 'when the binaryness does not match' do before do - allow_any_instance_of(Blob).to receive(:binary_in_repo?).and_return(true) + allow_next_instance_of(Blob) do |instance| + allow(instance).to receive(:binary_in_repo?).and_return(true) + end end it 'returns false' do |