diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-26 14:41:04 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-10-28 14:30:41 +0300 |
| commit | dc60649685b7e02b54bd49c4af6d25b18e8abc02 (patch) | |
| tree | 0ab9ab2d208b0f951f7d613dbd8b963e1f168929 /spec | |
| parent | 80a9905414d04e478e6b4154a51ffaa8232ca5b0 (diff) | |
Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'
Add path attribute to WikiFile class
Closes #39420
See merge request gitlab-org/gitlab-ce!15019
(cherry picked from commit 98c57e9a9f73409a912189064a7adf0431768b3a)
76becfb5 Add path attribute to WikiFile class
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/banzai/filter/gollum_tags_filter_spec.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/spec/lib/banzai/filter/gollum_tags_filter_spec.rb b/spec/lib/banzai/filter/gollum_tags_filter_spec.rb index 97d612e6347..ca76d6f0881 100644 --- a/spec/lib/banzai/filter/gollum_tags_filter_spec.rb +++ b/spec/lib/banzai/filter/gollum_tags_filter_spec.rb @@ -15,9 +15,13 @@ describe Banzai::Filter::GollumTagsFilter do context 'linking internal images' do it 'creates img tag if image exists' do - file = Gollum::File.new(project_wiki.wiki) - expect(file).to receive(:path).and_return('images/image.jpg') - expect(project_wiki).to receive(:find_file).with('images/image.jpg').and_return(file) + gollum_file_double = double('Gollum::File', + mime_type: 'image/jpeg', + name: 'images/image.jpg', + path: 'images/image.jpg', + raw_data: '') + wiki_file = Gitlab::Git::WikiFile.new(gollum_file_double) + expect(project_wiki).to receive(:find_file).with('images/image.jpg').and_return(wiki_file) tag = '[[images/image.jpg]]' doc = filter("See #{tag}", project_wiki: project_wiki) |