dde69bfb2a
Inside a wiki, when we show the sidebar or browse to the `pages`, all page contents are retrieved from Gitaly and that is a waste of resources, since no content from that pages are going to be showed. This MR introduces the method `ProjectWiki#list_pages`, which uses new wiki_list_pages RPC call to retrieve pages without content Also in the `WikisController` we're using the method to show pages in the sidebar and also on the `pages` page.
183 lines
5.3 KiB
Ruby
183 lines
5.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'spec_helper'
|
|
|
|
describe Projects::WikisController do
|
|
let(:project) { create(:project, :public, :repository) }
|
|
let(:user) { project.owner }
|
|
let(:project_wiki) { ProjectWiki.new(project, user) }
|
|
let(:wiki) { project_wiki.wiki }
|
|
let(:wiki_title) { 'page-title-test' }
|
|
|
|
before do
|
|
create_page(wiki_title, 'hello world')
|
|
|
|
sign_in(user)
|
|
end
|
|
|
|
after do
|
|
destroy_page(wiki_title)
|
|
end
|
|
|
|
describe 'GET #pages' do
|
|
subject { get :pages, params: { namespace_id: project.namespace, project_id: project, id: wiki_title } }
|
|
|
|
it 'does not load the pages content' do
|
|
expect(controller).to receive(:load_wiki).and_return(project_wiki)
|
|
|
|
expect(project_wiki).to receive(:list_pages).twice.and_call_original
|
|
|
|
subject
|
|
end
|
|
end
|
|
|
|
describe 'GET #show' do
|
|
render_views
|
|
|
|
subject { get :show, params: { namespace_id: project.namespace, project_id: project, id: wiki_title } }
|
|
|
|
it 'limits the retrieved pages for the sidebar' do
|
|
expect(controller).to receive(:load_wiki).and_return(project_wiki)
|
|
|
|
# empty? call
|
|
expect(project_wiki).to receive(:list_pages).with(limit: 1).and_call_original
|
|
# Sidebar entries
|
|
expect(project_wiki).to receive(:list_pages).with(limit: 15).and_call_original
|
|
|
|
subject
|
|
|
|
expect(response).to have_http_status(:ok)
|
|
expect(response.body).to include(wiki_title)
|
|
end
|
|
|
|
context 'when page content encoding is invalid' do
|
|
it 'sets flash error' do
|
|
allow(controller).to receive(:valid_encoding?).and_return(false)
|
|
|
|
subject
|
|
|
|
expect(response).to have_http_status(:ok)
|
|
expect(flash[:notice]).to eq 'The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository.'
|
|
end
|
|
end
|
|
|
|
context 'when page is a file' do
|
|
include WikiHelpers
|
|
|
|
let(:path) { upload_file_to_wiki(project, user, file_name) }
|
|
|
|
before do
|
|
get :show, params: { namespace_id: project.namespace, project_id: project, id: path }
|
|
end
|
|
|
|
context 'when file is an image' do
|
|
let(:file_name) { 'dk.png' }
|
|
|
|
it 'delivers the image' do
|
|
expect(response.headers['Content-Disposition']).to match(/^inline/)
|
|
expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
|
|
end
|
|
|
|
context 'when file is a svg' do
|
|
let(:file_name) { 'unsanitized.svg' }
|
|
|
|
it 'delivers the image' do
|
|
expect(response.headers['Content-Disposition']).to match(/^inline/)
|
|
expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when file is a pdf' do
|
|
let(:file_name) { 'git-cheat-sheet.pdf' }
|
|
|
|
it 'sets the content type to sets the content response headers' do
|
|
expect(response.headers['Content-Disposition']).to match(/^inline/)
|
|
expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'POST #preview_markdown' do
|
|
it 'renders json in a correct format' do
|
|
post :preview_markdown, params: { namespace_id: project.namespace, project_id: project, id: 'page/path', text: '*Markdown* text' }
|
|
|
|
expect(JSON.parse(response.body).keys).to match_array(%w(body references))
|
|
end
|
|
end
|
|
|
|
describe 'GET #edit' do
|
|
subject { get(:edit, params: { namespace_id: project.namespace, project_id: project, id: wiki_title }) }
|
|
|
|
context 'when page content encoding is invalid' do
|
|
it 'redirects to show' do
|
|
allow(controller).to receive(:valid_encoding?).and_return(false)
|
|
|
|
subject
|
|
|
|
expect(response).to redirect_to(project_wiki_path(project, project_wiki.list_pages.first))
|
|
end
|
|
end
|
|
|
|
context 'when page content encoding is valid' do
|
|
render_views
|
|
|
|
it 'shows the edit page' do
|
|
subject
|
|
|
|
expect(response).to have_http_status(:ok)
|
|
expect(response.body).to include('Edit Page')
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'PATCH #update' do
|
|
let(:new_title) { 'New title' }
|
|
let(:new_content) { 'New content' }
|
|
subject do
|
|
patch(:update,
|
|
params: {
|
|
namespace_id: project.namespace,
|
|
project_id: project,
|
|
id: wiki_title,
|
|
wiki: { title: new_title, content: new_content }
|
|
})
|
|
end
|
|
|
|
context 'when page content encoding is invalid' do
|
|
it 'redirects to show' do
|
|
allow(controller).to receive(:valid_encoding?).and_return(false)
|
|
|
|
subject
|
|
expect(response).to redirect_to(project_wiki_path(project, project_wiki.list_pages.first))
|
|
end
|
|
end
|
|
|
|
context 'when page content encoding is valid' do
|
|
render_views
|
|
|
|
it 'updates the page' do
|
|
subject
|
|
|
|
wiki_page = project_wiki.list_pages(load_content: true).first
|
|
|
|
expect(wiki_page.title).to eq new_title
|
|
expect(wiki_page.content).to eq new_content
|
|
end
|
|
end
|
|
end
|
|
|
|
def create_page(name, content)
|
|
wiki.write_page(name, :markdown, content, commit_details(name))
|
|
end
|
|
|
|
def commit_details(name)
|
|
Gitlab::Git::Wiki::CommitDetails.new(user.id, user.username, user.name, user.email, "created page #{name}")
|
|
end
|
|
|
|
def destroy_page(title, dir = '')
|
|
page = wiki.page(title: title, dir: dir)
|
|
project_wiki.delete_page(page, "test commit")
|
|
end
|
|
end
|