Merge branch 'tc-fix-broken-plain-readme' into 'master'

Fix ProjectCacheWorker for plain READMEs

Closes #32540

See merge request !11506
This commit is contained in:
Douwe Maan 2017-05-18 20:25:31 +00:00
commit a3eabcc20c
2 changed files with 15 additions and 0 deletions

View File

@ -1,6 +1,9 @@
require 'nokogiri'
module MarkupHelper
include ActionView::Helpers::TagHelper
include ActionView::Context
def plain?(filename)
Gitlab::MarkupHelper.plain?(filename)
end

View File

@ -45,6 +45,18 @@ describe ProjectCacheWorker do
worker.perform(project.id, %w(readme))
end
context 'with plain readme' do
it 'refreshes the method caches' do
allow(MarkupHelper).to receive(:gitlab_markdown?).and_return(false)
allow(MarkupHelper).to receive(:plain?).and_return(true)
expect_any_instance_of(Repository).to receive(:refresh_method_caches).
with(%i(readme)).
and_call_original
worker.perform(project.id, %w(readme))
end
end
end
end