Commit 947ed8b8 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix/wiki-find-file-gitaly' into 'master'

Fix finding wiki file when Gitaly is enabled

Closes gitaly#1126

See merge request gitlab-org/gitlab-ce!18317
parents 84c70f43 f6112122
---
title: Fix finding wiki file when Gitaly is enabled
merge_request:
author:
type: fixed
...@@ -136,7 +136,7 @@ module Gitlab ...@@ -136,7 +136,7 @@ module Gitlab
wiki_file = nil wiki_file = nil
response.each do |message| response.each do |message|
next unless message.name.present? next unless message.name.present? || wiki_file
if wiki_file if wiki_file
wiki_file.raw_data << message.raw_data wiki_file.raw_data << message.raw_data
......
...@@ -172,11 +172,12 @@ describe ProjectWiki do ...@@ -172,11 +172,12 @@ describe ProjectWiki do
describe '#find_file' do describe '#find_file' do
shared_examples 'finding a wiki file' do shared_examples 'finding a wiki file' do
let(:image) { File.open(Rails.root.join('spec', 'fixtures', 'big-image.png')) }
before do before do
file = File.open(Rails.root.join('spec', 'fixtures', 'dk.png'))
subject.wiki # Make sure the wiki repo exists subject.wiki # Make sure the wiki repo exists
BareRepoOperations.new(subject.repository.path_to_repo).commit_file(file, 'image.png') BareRepoOperations.new(subject.repository.path_to_repo).commit_file(image, 'image.png')
end end
it 'returns the latest version of the file if it exists' do it 'returns the latest version of the file if it exists' do
...@@ -192,6 +193,13 @@ describe ProjectWiki do ...@@ -192,6 +193,13 @@ describe ProjectWiki do
file = subject.find_file('image.png') file = subject.find_file('image.png')
expect(file).to be_a Gitlab::Git::WikiFile expect(file).to be_a Gitlab::Git::WikiFile
end end
it 'returns the whole file' do
file = subject.find_file('image.png')
image.rewind
expect(file.raw_data.b).to eq(image.read.b)
end
end end
context 'when Gitaly wiki_find_file is enabled' do context 'when Gitaly wiki_find_file is enabled' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment