diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 15:09:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 15:09:33 +0000 |
| commit | 006000e366ad5dc61966770d33e3afd4c07e728d (patch) | |
| tree | 2724bc1cd73a6f829d62f5ca68a423b921bd1af8 /spec/features/markdown | |
| parent | 26e44c6225a19c3ec4e7d607f92b16d42b437c80 (diff) | |
| download | gitlab-ce-006000e366ad5dc61966770d33e3afd4c07e728d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/markdown')
| -rw-r--r-- | spec/features/markdown/markdown_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/markdown/markdown_spec.rb b/spec/features/markdown/markdown_spec.rb index 8e28f89f49e..e84b300a748 100644 --- a/spec/features/markdown/markdown_spec.rb +++ b/spec/features/markdown/markdown_spec.rb @@ -290,7 +290,7 @@ RSpec.describe 'GitLab Markdown', :aggregate_failures do path = 'images/example.jpg' gitaly_wiki_file = Gitlab::GitalyClient::WikiFile.new(path: path) - expect(@wiki).to receive(:find_file).with(path).and_return(Gitlab::Git::WikiFile.new(gitaly_wiki_file)) + expect(@wiki).to receive(:find_file).with(path, load_content: false).and_return(Gitlab::Git::WikiFile.new(gitaly_wiki_file)) allow(@wiki).to receive(:wiki_base_path) { '/namespace1/gitlabhq/wikis' } @html = markdown(@feat.raw_markdown, { pipeline: :wiki, wiki: @wiki, page_slug: @wiki_page.slug }) |