diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-02 09:08:56 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-02 09:08:56 +0300 |
commit | 208e2e308c444624e1d864c936ad7fe178ffc7e9 (patch) | |
tree | 3d779cbf4c44a77417cef8f4764adf6e8a7316da /spec/lib/gitlab/diff | |
parent | 78214bf7421d73e288466100df584d99e91154af (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/diff')
-rw-r--r-- | spec/lib/gitlab/diff/file_spec.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb index c468af4db68..4733607ccc0 100644 --- a/spec/lib/gitlab/diff/file_spec.rb +++ b/spec/lib/gitlab/diff/file_spec.rb @@ -169,18 +169,18 @@ describe Gitlab::Diff::File do end end - describe '#old_blob' do - it 'returns blob of commit of base commit' do - old_data = diff_file.old_blob.data + describe '#old_blob and #new_blob' do + it 'returns blob of base commit and the new commit' do + items = [ + [diff_file.new_content_sha, diff_file.new_path], [diff_file.old_content_sha, diff_file.old_path] + ] - expect(old_data).to include('raise "System commands must be given as an array of strings"') - end - end + expect(project.repository).to receive(:blobs_at).with(items, blob_size_limit: 100 * 1024).and_call_original - describe '#new_blob' do - it 'returns blob of new commit' do + old_data = diff_file.old_blob.data data = diff_file.new_blob.data + expect(old_data).to include('raise "System commands must be given as an array of strings"') expect(data).to include('raise RuntimeError, "System commands must be given as an array of strings"') end end |