Remove duplicate tests for Gitaly
The disabling of Gitaly was basically stubbing `Feature.enabled?` call, which was never triggered.
This commit is contained in:
parent
35239a6aec
commit
4ca5eadddb
|
@ -1,233 +1,223 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'User updates wiki page' do
|
||||
shared_examples 'wiki page user update' do
|
||||
let(:user) { create(:user) }
|
||||
let(:user) { create(:user) }
|
||||
|
||||
before do
|
||||
project.add_maintainer(user)
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
context 'when wiki is empty' do
|
||||
before do
|
||||
project.add_maintainer(user)
|
||||
sign_in(user)
|
||||
visit(project_wikis_path(project))
|
||||
click_link "Create your first page"
|
||||
end
|
||||
|
||||
context 'when wiki is empty' do
|
||||
before do
|
||||
visit(project_wikis_path(project))
|
||||
click_link "Create your first page"
|
||||
end
|
||||
context 'in a user namespace' do
|
||||
let(:project) { create(:project, :wiki_repo) }
|
||||
|
||||
context 'in a user namespace' do
|
||||
let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
|
||||
|
||||
it 'redirects back to the home edit page' do
|
||||
page.within(:css, '.wiki-form .form-actions') do
|
||||
click_on('Cancel')
|
||||
end
|
||||
|
||||
expect(current_path).to eq project_wiki_path(project, :home)
|
||||
it 'redirects back to the home edit page' do
|
||||
page.within(:css, '.wiki-form .form-actions') do
|
||||
click_on('Cancel')
|
||||
end
|
||||
|
||||
it 'updates a page that has a path', :js do
|
||||
click_on('New page')
|
||||
expect(current_path).to eq project_wiki_path(project, :home)
|
||||
end
|
||||
|
||||
page.within('#modal-new-wiki') do
|
||||
fill_in(:new_wiki_path, with: 'one/two/three-test')
|
||||
click_on('Create page')
|
||||
end
|
||||
it 'updates a page that has a path', :js do
|
||||
click_on('New page')
|
||||
|
||||
page.within '.wiki-form' do
|
||||
fill_in(:wiki_content, with: 'wiki content')
|
||||
click_on('Create page')
|
||||
end
|
||||
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
expect(find('.wiki-pages')).to have_content('Three')
|
||||
|
||||
first(:link, text: 'Three').click
|
||||
|
||||
expect(find('.nav-text')).to have_content('Three')
|
||||
|
||||
click_on('Edit')
|
||||
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
expect(page).to have_content('Edit Page')
|
||||
|
||||
fill_in('Content', with: 'Updated Wiki Content')
|
||||
click_on('Save changes')
|
||||
|
||||
expect(page).to have_content('Updated Wiki Content')
|
||||
page.within('#modal-new-wiki') do
|
||||
fill_in(:new_wiki_path, with: 'one/two/three-test')
|
||||
click_on('Create page')
|
||||
end
|
||||
|
||||
it_behaves_like 'wiki file attachments'
|
||||
end
|
||||
end
|
||||
|
||||
context 'when wiki is not empty' do
|
||||
let(:project_wiki) { create(:project_wiki, project: project, user: project.creator) }
|
||||
let!(:wiki_page) { create(:wiki_page, wiki: project_wiki, attrs: { title: 'home', content: 'Home page' }) }
|
||||
|
||||
before do
|
||||
visit(project_wikis_path(project))
|
||||
|
||||
click_link('Edit')
|
||||
end
|
||||
|
||||
context 'in a user namespace' do
|
||||
let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
|
||||
|
||||
it 'updates a page' do
|
||||
# Commit message field should have correct value.
|
||||
expect(page).to have_field('wiki[message]', with: 'Update home')
|
||||
|
||||
fill_in(:wiki_content, with: 'My awesome wiki!')
|
||||
click_button('Save changes')
|
||||
|
||||
expect(page).to have_content('Home')
|
||||
expect(page).to have_content("Last edited by #{user.name}")
|
||||
expect(page).to have_content('My awesome wiki!')
|
||||
page.within '.wiki-form' do
|
||||
fill_in(:wiki_content, with: 'wiki content')
|
||||
click_on('Create page')
|
||||
end
|
||||
|
||||
it 'shows a validation error message' do
|
||||
fill_in(:wiki_content, with: '')
|
||||
click_button('Save changes')
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
expect(find('.wiki-pages')).to have_content('Three')
|
||||
|
||||
expect(page).to have_selector('.wiki-form')
|
||||
expect(page).to have_content('Edit Page')
|
||||
expect(page).to have_content('The form contains the following error:')
|
||||
expect(page).to have_content("Content can't be blank")
|
||||
expect(find('textarea#wiki_content').value).to eq('')
|
||||
end
|
||||
first(:link, text: 'Three').click
|
||||
|
||||
it 'shows the emoji autocompletion dropdown', :js do
|
||||
find('#wiki_content').native.send_keys('')
|
||||
fill_in(:wiki_content, with: ':')
|
||||
expect(find('.nav-text')).to have_content('Three')
|
||||
|
||||
expect(page).to have_selector('.atwho-view')
|
||||
end
|
||||
click_on('Edit')
|
||||
|
||||
it 'shows the error message' do
|
||||
wiki_page.update(content: 'Update')
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
expect(page).to have_content('Edit Page')
|
||||
|
||||
click_button('Save changes')
|
||||
fill_in('Content', with: 'Updated Wiki Content')
|
||||
click_on('Save changes')
|
||||
|
||||
expect(page).to have_content('Someone edited the page the same time you did.')
|
||||
end
|
||||
|
||||
it 'updates a page' do
|
||||
fill_in('Content', with: 'Updated Wiki Content')
|
||||
click_on('Save changes')
|
||||
|
||||
expect(page).to have_content('Updated Wiki Content')
|
||||
end
|
||||
|
||||
it 'cancels editing of a page' do
|
||||
page.within(:css, '.wiki-form .form-actions') do
|
||||
click_on('Cancel')
|
||||
end
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, wiki_page))
|
||||
end
|
||||
|
||||
it_behaves_like 'wiki file attachments'
|
||||
end
|
||||
|
||||
context 'in a group namespace' do
|
||||
let(:project) { create(:project, :wiki_repo, namespace: create(:group, :public)) }
|
||||
|
||||
it 'updates a page' do
|
||||
# Commit message field should have correct value.
|
||||
expect(page).to have_field('wiki[message]', with: 'Update home')
|
||||
|
||||
fill_in(:wiki_content, with: 'My awesome wiki!')
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(page).to have_content('Home')
|
||||
expect(page).to have_content("Last edited by #{user.name}")
|
||||
expect(page).to have_content('My awesome wiki!')
|
||||
end
|
||||
|
||||
it_behaves_like 'wiki file attachments'
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the page is in a subdir' do
|
||||
let!(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
|
||||
let(:project_wiki) { create(:project_wiki, project: project, user: project.creator) }
|
||||
let(:page_name) { 'page_name' }
|
||||
let(:page_dir) { "foo/bar/#{page_name}" }
|
||||
let!(:wiki_page) { create(:wiki_page, wiki: project_wiki, attrs: { title: page_dir, content: 'Home page' }) }
|
||||
|
||||
before do
|
||||
visit(project_wiki_edit_path(project, wiki_page))
|
||||
end
|
||||
|
||||
it 'moves the page to the root folder', :skip_gitaly_mock do
|
||||
fill_in(:wiki_title, with: "/#{page_name}")
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, page_name))
|
||||
end
|
||||
|
||||
it 'moves the page to other dir' do
|
||||
new_page_dir = "foo1/bar1/#{page_name}"
|
||||
|
||||
fill_in(:wiki_title, with: new_page_dir)
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, new_page_dir))
|
||||
end
|
||||
|
||||
it 'remains in the same place if title has not changed' do
|
||||
original_path = project_wiki_path(project, wiki_page)
|
||||
|
||||
fill_in(:wiki_title, with: page_name)
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(original_path)
|
||||
end
|
||||
|
||||
it 'can be moved to a different dir with a different name' do
|
||||
new_page_dir = "foo1/bar1/new_page_name"
|
||||
|
||||
fill_in(:wiki_title, with: new_page_dir)
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, new_page_dir))
|
||||
end
|
||||
|
||||
it 'can be renamed and moved to the root folder' do
|
||||
new_name = 'new_page_name'
|
||||
|
||||
fill_in(:wiki_title, with: "/#{new_name}")
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, new_name))
|
||||
end
|
||||
|
||||
it 'squishes the title before creating the page' do
|
||||
new_page_dir = " foo1 / bar1 / #{page_name} "
|
||||
|
||||
fill_in(:wiki_title, with: new_page_dir)
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, "foo1/bar1/#{page_name}"))
|
||||
expect(page).to have_content('Updated Wiki Content')
|
||||
end
|
||||
|
||||
it_behaves_like 'wiki file attachments'
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly is enabled' do
|
||||
it_behaves_like 'wiki page user update'
|
||||
context 'when wiki is not empty' do
|
||||
let(:project_wiki) { create(:project_wiki, project: project, user: project.creator) }
|
||||
let!(:wiki_page) { create(:wiki_page, wiki: project_wiki, attrs: { title: 'home', content: 'Home page' }) }
|
||||
|
||||
before do
|
||||
visit(project_wikis_path(project))
|
||||
|
||||
click_link('Edit')
|
||||
end
|
||||
|
||||
context 'in a user namespace' do
|
||||
let(:project) { create(:project, :wiki_repo) }
|
||||
|
||||
it 'updates a page' do
|
||||
# Commit message field should have correct value.
|
||||
expect(page).to have_field('wiki[message]', with: 'Update home')
|
||||
|
||||
fill_in(:wiki_content, with: 'My awesome wiki!')
|
||||
click_button('Save changes')
|
||||
|
||||
expect(page).to have_content('Home')
|
||||
expect(page).to have_content("Last edited by #{user.name}")
|
||||
expect(page).to have_content('My awesome wiki!')
|
||||
end
|
||||
|
||||
it 'shows a validation error message' do
|
||||
fill_in(:wiki_content, with: '')
|
||||
click_button('Save changes')
|
||||
|
||||
expect(page).to have_selector('.wiki-form')
|
||||
expect(page).to have_content('Edit Page')
|
||||
expect(page).to have_content('The form contains the following error:')
|
||||
expect(page).to have_content("Content can't be blank")
|
||||
expect(find('textarea#wiki_content').value).to eq('')
|
||||
end
|
||||
|
||||
it 'shows the emoji autocompletion dropdown', :js do
|
||||
find('#wiki_content').native.send_keys('')
|
||||
fill_in(:wiki_content, with: ':')
|
||||
|
||||
expect(page).to have_selector('.atwho-view')
|
||||
end
|
||||
|
||||
it 'shows the error message' do
|
||||
wiki_page.update(content: 'Update')
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(page).to have_content('Someone edited the page the same time you did.')
|
||||
end
|
||||
|
||||
it 'updates a page' do
|
||||
fill_in('Content', with: 'Updated Wiki Content')
|
||||
click_on('Save changes')
|
||||
|
||||
expect(page).to have_content('Updated Wiki Content')
|
||||
end
|
||||
|
||||
it 'cancels editing of a page' do
|
||||
page.within(:css, '.wiki-form .form-actions') do
|
||||
click_on('Cancel')
|
||||
end
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, wiki_page))
|
||||
end
|
||||
|
||||
it_behaves_like 'wiki file attachments'
|
||||
end
|
||||
|
||||
context 'in a group namespace' do
|
||||
let(:project) { create(:project, :wiki_repo, namespace: create(:group, :public)) }
|
||||
|
||||
it 'updates a page' do
|
||||
# Commit message field should have correct value.
|
||||
expect(page).to have_field('wiki[message]', with: 'Update home')
|
||||
|
||||
fill_in(:wiki_content, with: 'My awesome wiki!')
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(page).to have_content('Home')
|
||||
expect(page).to have_content("Last edited by #{user.name}")
|
||||
expect(page).to have_content('My awesome wiki!')
|
||||
end
|
||||
|
||||
it_behaves_like 'wiki file attachments'
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'wiki page user update'
|
||||
context 'when the page is in a subdir' do
|
||||
let!(:project) { create(:project, :wiki_repo) }
|
||||
let(:project_wiki) { create(:project_wiki, project: project, user: project.creator) }
|
||||
let(:page_name) { 'page_name' }
|
||||
let(:page_dir) { "foo/bar/#{page_name}" }
|
||||
let!(:wiki_page) { create(:wiki_page, wiki: project_wiki, attrs: { title: page_dir, content: 'Home page' }) }
|
||||
|
||||
before do
|
||||
visit(project_wiki_edit_path(project, wiki_page))
|
||||
end
|
||||
|
||||
it 'moves the page to the root folder' do
|
||||
fill_in(:wiki_title, with: "/#{page_name}")
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, page_name))
|
||||
end
|
||||
|
||||
it 'moves the page to other dir' do
|
||||
new_page_dir = "foo1/bar1/#{page_name}"
|
||||
|
||||
fill_in(:wiki_title, with: new_page_dir)
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, new_page_dir))
|
||||
end
|
||||
|
||||
it 'remains in the same place if title has not changed' do
|
||||
original_path = project_wiki_path(project, wiki_page)
|
||||
|
||||
fill_in(:wiki_title, with: page_name)
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(original_path)
|
||||
end
|
||||
|
||||
it 'can be moved to a different dir with a different name' do
|
||||
new_page_dir = "foo1/bar1/new_page_name"
|
||||
|
||||
fill_in(:wiki_title, with: new_page_dir)
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, new_page_dir))
|
||||
end
|
||||
|
||||
it 'can be renamed and moved to the root folder' do
|
||||
new_name = 'new_page_name'
|
||||
|
||||
fill_in(:wiki_title, with: "/#{new_name}")
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, new_name))
|
||||
end
|
||||
|
||||
it 'squishes the title before creating the page' do
|
||||
new_page_dir = " foo1 / bar1 / #{page_name} "
|
||||
|
||||
fill_in(:wiki_title, with: new_page_dir)
|
||||
|
||||
click_button('Save changes')
|
||||
|
||||
expect(current_path).to eq(project_wiki_path(project, "foo1/bar1/#{page_name}"))
|
||||
end
|
||||
|
||||
it_behaves_like 'wiki file attachments'
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,174 +1,164 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'User views a wiki page' do
|
||||
shared_examples 'wiki page user view' do
|
||||
include WikiHelpers
|
||||
include WikiHelpers
|
||||
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
|
||||
let(:path) { 'image.png' }
|
||||
let(:wiki_page) do
|
||||
create(:wiki_page,
|
||||
wiki: project.wiki,
|
||||
attrs: { title: 'home', content: "Look at this [image](#{path})\n\n ![alt text](#{path})" })
|
||||
end
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
|
||||
let(:path) { 'image.png' }
|
||||
let(:wiki_page) do
|
||||
create(:wiki_page,
|
||||
wiki: project.wiki,
|
||||
attrs: { title: 'home', content: "Look at this [image](#{path})\n\n ![alt text](#{path})" })
|
||||
end
|
||||
|
||||
before do
|
||||
project.add_maintainer(user)
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
context 'when wiki is empty' do
|
||||
before do
|
||||
project.add_maintainer(user)
|
||||
sign_in(user)
|
||||
end
|
||||
visit(project_wikis_path(project))
|
||||
click_link "Create your first page"
|
||||
|
||||
context 'when wiki is empty' do
|
||||
before do
|
||||
visit(project_wikis_path(project))
|
||||
click_link "Create your first page"
|
||||
click_on('New page')
|
||||
|
||||
click_on('New page')
|
||||
|
||||
page.within('#modal-new-wiki') do
|
||||
fill_in(:new_wiki_path, with: 'one/two/three-test')
|
||||
click_on('Create page')
|
||||
end
|
||||
|
||||
page.within('.wiki-form') do
|
||||
fill_in(:wiki_content, with: 'wiki content')
|
||||
click_on('Create page')
|
||||
end
|
||||
page.within('#modal-new-wiki') do
|
||||
fill_in(:new_wiki_path, with: 'one/two/three-test')
|
||||
click_on('Create page')
|
||||
end
|
||||
|
||||
it 'shows the history of a page that has a path', :js do
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
|
||||
first(:link, text: 'Three').click
|
||||
click_on('Page history')
|
||||
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
|
||||
page.within(:css, '.nav-text') do
|
||||
expect(page).to have_content('History')
|
||||
end
|
||||
end
|
||||
|
||||
it 'shows an old version of a page', :js do
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
expect(find('.wiki-pages')).to have_content('Three')
|
||||
|
||||
first(:link, text: 'Three').click
|
||||
|
||||
expect(find('.nav-text')).to have_content('Three')
|
||||
|
||||
click_on('Edit')
|
||||
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
expect(page).to have_content('Edit Page')
|
||||
|
||||
fill_in('Content', with: 'Updated Wiki Content')
|
||||
|
||||
click_on('Save changes')
|
||||
click_on('Page history')
|
||||
|
||||
page.within(:css, '.nav-text') do
|
||||
expect(page).to have_content('History')
|
||||
end
|
||||
|
||||
find('a[href*="?version_id"]')
|
||||
page.within('.wiki-form') do
|
||||
fill_in(:wiki_content, with: 'wiki content')
|
||||
click_on('Create page')
|
||||
end
|
||||
end
|
||||
|
||||
context 'when a page does not have history' do
|
||||
before do
|
||||
visit(project_wiki_path(project, wiki_page))
|
||||
it 'shows the history of a page that has a path', :js do
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
|
||||
first(:link, text: 'Three').click
|
||||
click_on('Page history')
|
||||
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
|
||||
page.within(:css, '.nav-text') do
|
||||
expect(page).to have_content('History')
|
||||
end
|
||||
end
|
||||
|
||||
it 'shows an old version of a page', :js do
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
expect(find('.wiki-pages')).to have_content('Three')
|
||||
|
||||
first(:link, text: 'Three').click
|
||||
|
||||
expect(find('.nav-text')).to have_content('Three')
|
||||
|
||||
click_on('Edit')
|
||||
|
||||
expect(current_path).to include('one/two/three-test')
|
||||
expect(page).to have_content('Edit Page')
|
||||
|
||||
fill_in('Content', with: 'Updated Wiki Content')
|
||||
|
||||
click_on('Save changes')
|
||||
click_on('Page history')
|
||||
|
||||
page.within(:css, '.nav-text') do
|
||||
expect(page).to have_content('History')
|
||||
end
|
||||
|
||||
it 'shows all the pages' do
|
||||
expect(page).to have_content(user.name)
|
||||
expect(find('.wiki-pages')).to have_content(wiki_page.title.capitalize)
|
||||
end
|
||||
find('a[href*="?version_id"]')
|
||||
end
|
||||
end
|
||||
|
||||
context 'shows a file stored in a page' do
|
||||
let(:path) { upload_file_to_wiki(project, user, 'dk.png') }
|
||||
context 'when a page does not have history' do
|
||||
before do
|
||||
visit(project_wiki_path(project, wiki_page))
|
||||
end
|
||||
|
||||
it do
|
||||
expect(page).to have_xpath("//img[@data-src='#{project.wiki.wiki_base_path}/#{path}']")
|
||||
expect(page).to have_link('image', href: "#{project.wiki.wiki_base_path}/#{path}")
|
||||
it 'shows all the pages' do
|
||||
expect(page).to have_content(user.name)
|
||||
expect(find('.wiki-pages')).to have_content(wiki_page.title.capitalize)
|
||||
end
|
||||
|
||||
click_on('image')
|
||||
context 'shows a file stored in a page' do
|
||||
let(:path) { upload_file_to_wiki(project, user, 'dk.png') }
|
||||
|
||||
expect(current_path).to match("wikis/#{path}")
|
||||
expect(page).not_to have_xpath('/html') # Page should render the image which means there is no html involved
|
||||
end
|
||||
end
|
||||
|
||||
it 'shows the creation page if file does not exist' do
|
||||
it do
|
||||
expect(page).to have_xpath("//img[@data-src='#{project.wiki.wiki_base_path}/#{path}']")
|
||||
expect(page).to have_link('image', href: "#{project.wiki.wiki_base_path}/#{path}")
|
||||
|
||||
click_on('image')
|
||||
|
||||
expect(current_path).to match("wikis/#{path}")
|
||||
expect(page).to have_content('New Wiki Page')
|
||||
expect(page).to have_content('Create page')
|
||||
expect(page).not_to have_xpath('/html') # Page should render the image which means there is no html involved
|
||||
end
|
||||
end
|
||||
|
||||
context 'when a page has history' do
|
||||
before do
|
||||
wiki_page.update(message: 'updated home', content: 'updated [some link](other-page)')
|
||||
end
|
||||
it 'shows the creation page if file does not exist' do
|
||||
expect(page).to have_link('image', href: "#{project.wiki.wiki_base_path}/#{path}")
|
||||
|
||||
it 'shows the page history' do
|
||||
visit(project_wiki_path(project, wiki_page))
|
||||
click_on('image')
|
||||
|
||||
expect(page).to have_selector('a.btn', text: 'Edit')
|
||||
|
||||
click_on('Page history')
|
||||
|
||||
expect(page).to have_content(user.name)
|
||||
expect(page).to have_content("#{user.username} created page: home")
|
||||
expect(page).to have_content('updated home')
|
||||
end
|
||||
|
||||
it 'does not show the "Edit" button' do
|
||||
visit(project_wiki_path(project, wiki_page, version_id: wiki_page.versions.last.id))
|
||||
|
||||
expect(page).not_to have_selector('a.btn', text: 'Edit')
|
||||
end
|
||||
end
|
||||
|
||||
context 'when page has invalid content encoding' do
|
||||
let(:content) { 'whatever'.force_encoding('ISO-8859-1') }
|
||||
|
||||
before do
|
||||
allow(Gitlab::EncodingHelper).to receive(:encode!).and_return(content)
|
||||
|
||||
visit(project_wiki_path(project, wiki_page))
|
||||
end
|
||||
|
||||
it 'does not show "Edit" button' do
|
||||
expect(page).not_to have_selector('a.btn', text: 'Edit')
|
||||
end
|
||||
|
||||
it 'shows error' do
|
||||
page.within(:css, '.flash-notice') do
|
||||
expect(page).to have_content('The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository.')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
it 'opens a default wiki page', :js do
|
||||
visit(project_path(project))
|
||||
|
||||
find('.shortcuts-wiki').click
|
||||
click_link "Create your first page"
|
||||
|
||||
expect(page).to have_content('Home · Create Page')
|
||||
expect(current_path).to match("wikis/#{path}")
|
||||
expect(page).to have_content('New Wiki Page')
|
||||
expect(page).to have_content('Create page')
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly is enabled' do
|
||||
it_behaves_like 'wiki page user view'
|
||||
context 'when a page has history' do
|
||||
before do
|
||||
wiki_page.update(message: 'updated home', content: 'updated [some link](other-page)')
|
||||
end
|
||||
|
||||
it 'shows the page history' do
|
||||
visit(project_wiki_path(project, wiki_page))
|
||||
|
||||
expect(page).to have_selector('a.btn', text: 'Edit')
|
||||
|
||||
click_on('Page history')
|
||||
|
||||
expect(page).to have_content(user.name)
|
||||
expect(page).to have_content("#{user.username} created page: home")
|
||||
expect(page).to have_content('updated home')
|
||||
end
|
||||
|
||||
it 'does not show the "Edit" button' do
|
||||
visit(project_wiki_path(project, wiki_page, version_id: wiki_page.versions.last.id))
|
||||
|
||||
expect(page).not_to have_selector('a.btn', text: 'Edit')
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'wiki page user view'
|
||||
context 'when page has invalid content encoding' do
|
||||
let(:content) { 'whatever'.force_encoding('ISO-8859-1') }
|
||||
|
||||
before do
|
||||
allow(Gitlab::EncodingHelper).to receive(:encode!).and_return(content)
|
||||
|
||||
visit(project_wiki_path(project, wiki_page))
|
||||
end
|
||||
|
||||
it 'does not show "Edit" button' do
|
||||
expect(page).not_to have_selector('a.btn', text: 'Edit')
|
||||
end
|
||||
|
||||
it 'shows error' do
|
||||
page.within(:css, '.flash-notice') do
|
||||
expect(page).to have_content('The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository.')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
it 'opens a default wiki page', :js do
|
||||
visit(project_path(project))
|
||||
|
||||
find('.shortcuts-wiki').click
|
||||
click_link "Create your first page"
|
||||
|
||||
expect(page).to have_content('Home · Create Page')
|
||||
end
|
||||
end
|
||||
|
|
|
@ -205,28 +205,18 @@ describe ExtractsPath do
|
|||
end
|
||||
|
||||
describe '#lfs_blob_ids' do
|
||||
shared_examples '#lfs_blob_ids' do
|
||||
let(:tag) { @project.repository.add_tag(@project.owner, 'my-annotated-tag', 'master', 'test tag') }
|
||||
let(:ref) { tag.target }
|
||||
let(:params) { { ref: ref, path: 'README.md' } }
|
||||
let(:tag) { @project.repository.add_tag(@project.owner, 'my-annotated-tag', 'master', 'test tag') }
|
||||
let(:ref) { tag.target }
|
||||
let(:params) { { ref: ref, path: 'README.md' } }
|
||||
|
||||
before do
|
||||
@project = create(:project, :repository)
|
||||
end
|
||||
|
||||
it 'handles annotated tags' do
|
||||
assign_ref_vars
|
||||
|
||||
expect(lfs_blob_ids).to eq([])
|
||||
end
|
||||
before do
|
||||
@project = create(:project, :repository)
|
||||
end
|
||||
|
||||
context 'when gitaly is enabled' do
|
||||
it_behaves_like '#lfs_blob_ids'
|
||||
end
|
||||
it 'handles annotated tags' do
|
||||
assign_ref_vars
|
||||
|
||||
context 'when gitaly is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like '#lfs_blob_ids'
|
||||
expect(lfs_blob_ids).to eq([])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -37,17 +37,7 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiff do
|
|||
let(:stub_path) { '.gitignore' }
|
||||
end
|
||||
|
||||
shared_examples 'initializes a DiffCollection' do
|
||||
it 'returns a valid instance of a DiffCollection' do
|
||||
expect(diff_files).to be_a(Gitlab::Git::DiffCollection)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with Gitaly disabled', :disable_gitaly do
|
||||
it_behaves_like 'initializes a DiffCollection'
|
||||
end
|
||||
|
||||
context 'with Gitaly enabled' do
|
||||
it_behaves_like 'initializes a DiffCollection'
|
||||
it 'returns a valid instance of a DiffCollection' do
|
||||
expect(diff_files).to be_a(Gitlab::Git::DiffCollection)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -128,7 +128,7 @@ describe Gitlab::Git::Blob, :seed_helper do
|
|||
end
|
||||
end
|
||||
|
||||
shared_examples 'finding blobs by ID' do
|
||||
describe '.raw' do
|
||||
let(:raw_blob) { Gitlab::Git::Blob.raw(repository, SeedRepo::RubyBlob::ID) }
|
||||
let(:bad_blob) { Gitlab::Git::Blob.raw(repository, SeedRepo::BigCommit::ID) }
|
||||
|
||||
|
@ -166,16 +166,6 @@ describe Gitlab::Git::Blob, :seed_helper do
|
|||
end
|
||||
end
|
||||
|
||||
describe '.raw' do
|
||||
context 'when the blob_raw Gitaly feature is enabled' do
|
||||
it_behaves_like 'finding blobs by ID'
|
||||
end
|
||||
|
||||
context 'when the blob_raw Gitaly feature is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'finding blobs by ID'
|
||||
end
|
||||
end
|
||||
|
||||
describe '.batch' do
|
||||
let(:blob_references) do
|
||||
[
|
||||
|
|
|
@ -183,110 +183,100 @@ describe Gitlab::Git::Commit, :seed_helper do
|
|||
end
|
||||
end
|
||||
|
||||
shared_examples '.where' do
|
||||
context 'path is empty string' do
|
||||
subject do
|
||||
commits = described_class.where(
|
||||
repo: repository,
|
||||
ref: 'master',
|
||||
path: '',
|
||||
limit: 10
|
||||
)
|
||||
context 'path is empty string' do
|
||||
subject do
|
||||
commits = described_class.where(
|
||||
repo: repository,
|
||||
ref: 'master',
|
||||
path: '',
|
||||
limit: 10
|
||||
)
|
||||
|
||||
commits.map { |c| c.id }
|
||||
end
|
||||
|
||||
it 'has 10 elements' do
|
||||
expect(subject.size).to eq(10)
|
||||
end
|
||||
it { is_expected.to include(SeedRepo::EmptyCommit::ID) }
|
||||
commits.map { |c| c.id }
|
||||
end
|
||||
|
||||
context 'path is nil' do
|
||||
subject do
|
||||
commits = described_class.where(
|
||||
repo: repository,
|
||||
ref: 'master',
|
||||
path: nil,
|
||||
limit: 10
|
||||
)
|
||||
|
||||
commits.map { |c| c.id }
|
||||
end
|
||||
|
||||
it 'has 10 elements' do
|
||||
expect(subject.size).to eq(10)
|
||||
end
|
||||
it { is_expected.to include(SeedRepo::EmptyCommit::ID) }
|
||||
end
|
||||
|
||||
context 'ref is branch name' do
|
||||
subject do
|
||||
commits = described_class.where(
|
||||
repo: repository,
|
||||
ref: 'master',
|
||||
path: 'files',
|
||||
limit: 3,
|
||||
offset: 1
|
||||
)
|
||||
|
||||
commits.map { |c| c.id }
|
||||
end
|
||||
|
||||
it 'has 3 elements' do
|
||||
expect(subject.size).to eq(3)
|
||||
end
|
||||
it { is_expected.to include("d14d6c0abdd253381df51a723d58691b2ee1ab08") }
|
||||
it { is_expected.not_to include("eb49186cfa5c4338011f5f590fac11bd66c5c631") }
|
||||
end
|
||||
|
||||
context 'ref is commit id' do
|
||||
subject do
|
||||
commits = described_class.where(
|
||||
repo: repository,
|
||||
ref: "874797c3a73b60d2187ed6e2fcabd289ff75171e",
|
||||
path: 'files',
|
||||
limit: 3,
|
||||
offset: 1
|
||||
)
|
||||
|
||||
commits.map { |c| c.id }
|
||||
end
|
||||
|
||||
it 'has 3 elements' do
|
||||
expect(subject.size).to eq(3)
|
||||
end
|
||||
it { is_expected.to include("2f63565e7aac07bcdadb654e253078b727143ec4") }
|
||||
it { is_expected.not_to include(SeedRepo::Commit::ID) }
|
||||
end
|
||||
|
||||
context 'ref is tag' do
|
||||
subject do
|
||||
commits = described_class.where(
|
||||
repo: repository,
|
||||
ref: 'v1.0.0',
|
||||
path: 'files',
|
||||
limit: 3,
|
||||
offset: 1
|
||||
)
|
||||
|
||||
commits.map { |c| c.id }
|
||||
end
|
||||
|
||||
it 'has 3 elements' do
|
||||
expect(subject.size).to eq(3)
|
||||
end
|
||||
it { is_expected.to include("874797c3a73b60d2187ed6e2fcabd289ff75171e") }
|
||||
it { is_expected.not_to include(SeedRepo::Commit::ID) }
|
||||
it 'has 10 elements' do
|
||||
expect(subject.size).to eq(10)
|
||||
end
|
||||
it { is_expected.to include(SeedRepo::EmptyCommit::ID) }
|
||||
end
|
||||
|
||||
describe '.where with gitaly' do
|
||||
it_should_behave_like '.where'
|
||||
context 'path is nil' do
|
||||
subject do
|
||||
commits = described_class.where(
|
||||
repo: repository,
|
||||
ref: 'master',
|
||||
path: nil,
|
||||
limit: 10
|
||||
)
|
||||
|
||||
commits.map { |c| c.id }
|
||||
end
|
||||
|
||||
it 'has 10 elements' do
|
||||
expect(subject.size).to eq(10)
|
||||
end
|
||||
it { is_expected.to include(SeedRepo::EmptyCommit::ID) }
|
||||
end
|
||||
|
||||
describe '.where without gitaly', :skip_gitaly_mock do
|
||||
it_should_behave_like '.where'
|
||||
context 'ref is branch name' do
|
||||
subject do
|
||||
commits = described_class.where(
|
||||
repo: repository,
|
||||
ref: 'master',
|
||||
path: 'files',
|
||||
limit: 3,
|
||||
offset: 1
|
||||
)
|
||||
|
||||
commits.map { |c| c.id }
|
||||
end
|
||||
|
||||
it 'has 3 elements' do
|
||||
expect(subject.size).to eq(3)
|
||||
end
|
||||
it { is_expected.to include("d14d6c0abdd253381df51a723d58691b2ee1ab08") }
|
||||
it { is_expected.not_to include("eb49186cfa5c4338011f5f590fac11bd66c5c631") }
|
||||
end
|
||||
|
||||
context 'ref is commit id' do
|
||||
subject do
|
||||
commits = described_class.where(
|
||||
repo: repository,
|
||||
ref: "874797c3a73b60d2187ed6e2fcabd289ff75171e",
|
||||
path: 'files',
|
||||
limit: 3,
|
||||
offset: 1
|
||||
)
|
||||
|
||||
commits.map { |c| c.id }
|
||||
end
|
||||
|
||||
it 'has 3 elements' do
|
||||
expect(subject.size).to eq(3)
|
||||
end
|
||||
it { is_expected.to include("2f63565e7aac07bcdadb654e253078b727143ec4") }
|
||||
it { is_expected.not_to include(SeedRepo::Commit::ID) }
|
||||
end
|
||||
|
||||
context 'ref is tag' do
|
||||
subject do
|
||||
commits = described_class.where(
|
||||
repo: repository,
|
||||
ref: 'v1.0.0',
|
||||
path: 'files',
|
||||
limit: 3,
|
||||
offset: 1
|
||||
)
|
||||
|
||||
commits.map { |c| c.id }
|
||||
end
|
||||
|
||||
it 'has 3 elements' do
|
||||
expect(subject.size).to eq(3)
|
||||
end
|
||||
it { is_expected.to include("874797c3a73b60d2187ed6e2fcabd289ff75171e") }
|
||||
it { is_expected.not_to include(SeedRepo::Commit::ID) }
|
||||
end
|
||||
|
||||
describe '.between' do
|
||||
|
@ -508,7 +498,7 @@ describe Gitlab::Git::Commit, :seed_helper do
|
|||
end
|
||||
end
|
||||
|
||||
shared_examples '#stats' do
|
||||
describe '#stats' do
|
||||
subject { commit.stats }
|
||||
|
||||
describe '#additions' do
|
||||
|
@ -527,14 +517,6 @@ describe Gitlab::Git::Commit, :seed_helper do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#stats with gitaly on' do
|
||||
it_should_behave_like '#stats'
|
||||
end
|
||||
|
||||
describe '#stats with gitaly disabled', :skip_gitaly_mock do
|
||||
it_should_behave_like '#stats'
|
||||
end
|
||||
|
||||
describe '#has_zero_stats?' do
|
||||
it { expect(commit.has_zero_stats?).to eq(false) }
|
||||
end
|
||||
|
@ -577,25 +559,15 @@ describe Gitlab::Git::Commit, :seed_helper do
|
|||
commit_ids.map { |id| described_class.get_message(repository, id) }
|
||||
end
|
||||
|
||||
shared_examples 'getting commit messages' do
|
||||
it 'gets commit messages' do
|
||||
expect(subject).to contain_exactly(
|
||||
"Added contributing guide\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
|
||||
"Add submodule\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n"
|
||||
)
|
||||
end
|
||||
it 'gets commit messages' do
|
||||
expect(subject).to contain_exactly(
|
||||
"Added contributing guide\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
|
||||
"Add submodule\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n"
|
||||
)
|
||||
end
|
||||
|
||||
context 'when Gitaly commit_messages feature is enabled' do
|
||||
it_behaves_like 'getting commit messages'
|
||||
|
||||
it 'gets messages in one batch', :request_store do
|
||||
expect { subject.map(&:itself) }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly commit_messages feature is disabled', :disable_gitaly do
|
||||
it_behaves_like 'getting commit messages'
|
||||
it 'gets messages in one batch', :request_store do
|
||||
expect { subject.map(&:itself) }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ require "spec_helper"
|
|||
describe Gitlab::Git::Tag, :seed_helper do
|
||||
let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '') }
|
||||
|
||||
shared_examples 'Gitlab::Git::Repository#tags' do
|
||||
describe '#tags' do
|
||||
describe 'first tag' do
|
||||
let(:tag) { repository.tags.first }
|
||||
|
||||
|
@ -25,14 +25,6 @@ describe Gitlab::Git::Tag, :seed_helper do
|
|||
it { expect(repository.tags.size).to eq(SeedRepo::Repo::TAGS.size) }
|
||||
end
|
||||
|
||||
context 'when Gitaly tags feature is enabled' do
|
||||
it_behaves_like 'Gitlab::Git::Repository#tags'
|
||||
end
|
||||
|
||||
context 'when Gitaly tags feature is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'Gitlab::Git::Repository#tags'
|
||||
end
|
||||
|
||||
describe '.get_message' do
|
||||
let(:tag_ids) { %w[f4e6814c3e4e7a0de82a9e7cd20c626cc963a2f8 8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b] }
|
||||
|
||||
|
@ -40,23 +32,13 @@ describe Gitlab::Git::Tag, :seed_helper do
|
|||
tag_ids.map { |id| described_class.get_message(repository, id) }
|
||||
end
|
||||
|
||||
shared_examples 'getting tag messages' do
|
||||
it 'gets tag messages' do
|
||||
expect(subject[0]).to eq("Release\n")
|
||||
expect(subject[1]).to eq("Version 1.1.0\n")
|
||||
end
|
||||
it 'gets tag messages' do
|
||||
expect(subject[0]).to eq("Release\n")
|
||||
expect(subject[1]).to eq("Version 1.1.0\n")
|
||||
end
|
||||
|
||||
context 'when Gitaly tag_messages feature is enabled' do
|
||||
it_behaves_like 'getting tag messages'
|
||||
|
||||
it 'gets messages in one batch', :request_store do
|
||||
expect { subject.map(&:itself) }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly tag_messages feature is disabled', :disable_gitaly do
|
||||
it_behaves_like 'getting tag messages'
|
||||
it 'gets messages in one batch', :request_store do
|
||||
expect { subject.map(&:itself) }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -80,18 +80,8 @@ describe Gitlab::Git::Tree, :seed_helper do
|
|||
end
|
||||
|
||||
describe '#where' do
|
||||
shared_examples '#where' do
|
||||
it 'returns an empty array when called with an invalid ref' do
|
||||
expect(described_class.where(repository, 'foobar-does-not-exist')).to eq([])
|
||||
end
|
||||
end
|
||||
|
||||
context 'with gitaly' do
|
||||
it_behaves_like '#where'
|
||||
end
|
||||
|
||||
context 'without gitaly', :skip_gitaly_mock do
|
||||
it_behaves_like '#where'
|
||||
it 'returns an empty array when called with an invalid ref' do
|
||||
expect(described_class.where(repository, 'foobar-does-not-exist')).to eq([])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
# We stub Gitaly in `spec/support/gitaly.rb` for other tests. We don't want
|
||||
# those stubs while testing the GitalyClient itself.
|
||||
describe Gitlab::GitalyClient, skip_gitaly_mock: true do
|
||||
describe Gitlab::GitalyClient do
|
||||
describe '.stub_class' do
|
||||
it 'returns the gRPC health check stub' do
|
||||
expect(described_class.stub_class(:health_check)).to eq(::Grpc::Health::V1::Health::Stub)
|
||||
|
@ -191,102 +191,13 @@ describe Gitlab::GitalyClient, skip_gitaly_mock: true do
|
|||
let(:feature_name) { 'my_feature' }
|
||||
let(:real_feature_name) { "gitaly_#{feature_name}" }
|
||||
|
||||
context 'when Gitaly is disabled' do
|
||||
before do
|
||||
allow(described_class).to receive(:enabled?).and_return(false)
|
||||
end
|
||||
|
||||
it 'returns false' do
|
||||
expect(described_class.feature_enabled?(feature_name)).to be(false)
|
||||
end
|
||||
before do
|
||||
allow(Feature).to receive(:enabled?).and_return(false)
|
||||
end
|
||||
|
||||
context 'when the feature status is DISABLED' do
|
||||
let(:feature_status) { Gitlab::GitalyClient::MigrationStatus::DISABLED }
|
||||
|
||||
it 'returns false' do
|
||||
expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the feature_status is OPT_IN' do
|
||||
let(:feature_status) { Gitlab::GitalyClient::MigrationStatus::OPT_IN }
|
||||
|
||||
context "when the feature flag hasn't been set" do
|
||||
it 'returns false' do
|
||||
expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
|
||||
end
|
||||
end
|
||||
|
||||
context "when the feature flag is set to disable" do
|
||||
before do
|
||||
Feature.get(real_feature_name).disable
|
||||
end
|
||||
|
||||
it 'returns false' do
|
||||
expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
|
||||
end
|
||||
end
|
||||
|
||||
context "when the feature flag is set to enable" do
|
||||
before do
|
||||
Feature.get(real_feature_name).enable
|
||||
end
|
||||
|
||||
it 'returns true' do
|
||||
expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(true)
|
||||
end
|
||||
end
|
||||
|
||||
context "when the feature flag is set to a percentage of time" do
|
||||
before do
|
||||
Feature.get(real_feature_name).enable_percentage_of_time(70)
|
||||
end
|
||||
|
||||
it 'bases the result on pseudo-random numbers' do
|
||||
expect(Random).to receive(:rand).and_return(0.3)
|
||||
expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(true)
|
||||
|
||||
expect(Random).to receive(:rand).and_return(0.8)
|
||||
expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
|
||||
end
|
||||
end
|
||||
|
||||
context "when a feature is not persisted" do
|
||||
it 'returns false when opt_into_all_features is off' do
|
||||
allow(Feature).to receive(:persisted?).and_return(false)
|
||||
allow(described_class).to receive(:opt_into_all_features?).and_return(false)
|
||||
|
||||
expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
|
||||
end
|
||||
|
||||
it 'returns true when the override is on' do
|
||||
allow(Feature).to receive(:persisted?).and_return(false)
|
||||
allow(described_class).to receive(:opt_into_all_features?).and_return(true)
|
||||
|
||||
expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(true)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the feature_status is OPT_OUT' do
|
||||
let(:feature_status) { Gitlab::GitalyClient::MigrationStatus::OPT_OUT }
|
||||
|
||||
context "when the feature flag hasn't been set" do
|
||||
it 'returns true' do
|
||||
expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(true)
|
||||
end
|
||||
end
|
||||
|
||||
context "when the feature flag is set to disable" do
|
||||
before do
|
||||
Feature.get(real_feature_name).disable
|
||||
end
|
||||
|
||||
it 'returns false' do
|
||||
expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
|
||||
end
|
||||
end
|
||||
it 'returns false' do
|
||||
expect(Feature).to receive(:enabled?).with(real_feature_name)
|
||||
expect(described_class.feature_enabled?(feature_name)).to be(false)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -30,48 +30,38 @@ describe MergeRequest do
|
|||
end
|
||||
|
||||
describe '#squash_in_progress?' do
|
||||
shared_examples 'checking whether a squash is in progress' do
|
||||
let(:repo_path) do
|
||||
Gitlab::GitalyClient::StorageSettings.allow_disk_access do
|
||||
subject.source_project.repository.path
|
||||
end
|
||||
end
|
||||
let(:squash_path) { File.join(repo_path, "gitlab-worktree", "squash-#{subject.id}") }
|
||||
|
||||
before do
|
||||
system(*%W(#{Gitlab.config.git.bin_path} -C #{repo_path} worktree add --detach #{squash_path} master))
|
||||
end
|
||||
|
||||
it 'returns true when there is a current squash directory' do
|
||||
expect(subject.squash_in_progress?).to be_truthy
|
||||
end
|
||||
|
||||
it 'returns false when there is no squash directory' do
|
||||
FileUtils.rm_rf(squash_path)
|
||||
|
||||
expect(subject.squash_in_progress?).to be_falsey
|
||||
end
|
||||
|
||||
it 'returns false when the squash directory has expired' do
|
||||
time = 20.minutes.ago.to_time
|
||||
File.utime(time, time, squash_path)
|
||||
|
||||
expect(subject.squash_in_progress?).to be_falsey
|
||||
end
|
||||
|
||||
it 'returns false when the source project has been removed' do
|
||||
allow(subject).to receive(:source_project).and_return(nil)
|
||||
|
||||
expect(subject.squash_in_progress?).to be_falsey
|
||||
let(:repo_path) do
|
||||
Gitlab::GitalyClient::StorageSettings.allow_disk_access do
|
||||
subject.source_project.repository.path
|
||||
end
|
||||
end
|
||||
let(:squash_path) { File.join(repo_path, "gitlab-worktree", "squash-#{subject.id}") }
|
||||
|
||||
context 'when Gitaly squash_in_progress is enabled' do
|
||||
it_behaves_like 'checking whether a squash is in progress'
|
||||
before do
|
||||
system(*%W(#{Gitlab.config.git.bin_path} -C #{repo_path} worktree add --detach #{squash_path} master))
|
||||
end
|
||||
|
||||
context 'when Gitaly squash_in_progress is disabled', :disable_gitaly do
|
||||
it_behaves_like 'checking whether a squash is in progress'
|
||||
it 'returns true when there is a current squash directory' do
|
||||
expect(subject.squash_in_progress?).to be_truthy
|
||||
end
|
||||
|
||||
it 'returns false when there is no squash directory' do
|
||||
FileUtils.rm_rf(squash_path)
|
||||
|
||||
expect(subject.squash_in_progress?).to be_falsey
|
||||
end
|
||||
|
||||
it 'returns false when the squash directory has expired' do
|
||||
time = 20.minutes.ago.to_time
|
||||
File.utime(time, time, squash_path)
|
||||
|
||||
expect(subject.squash_in_progress?).to be_falsey
|
||||
end
|
||||
|
||||
it 'returns false when the source project has been removed' do
|
||||
allow(subject).to receive(:source_project).and_return(nil)
|
||||
|
||||
expect(subject.squash_in_progress?).to be_falsey
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -2587,14 +2577,6 @@ describe MergeRequest do
|
|||
expect(subject.rebase_in_progress?).to be_falsey
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly rebase_in_progress is enabled' do
|
||||
it_behaves_like 'checking whether a rebase is in progress'
|
||||
end
|
||||
|
||||
context 'when Gitaly rebase_in_progress is enabled', :disable_gitaly do
|
||||
it_behaves_like 'checking whether a rebase is in progress'
|
||||
end
|
||||
end
|
||||
|
||||
describe '#allow_collaboration' do
|
||||
|
|
|
@ -130,63 +130,53 @@ describe ProjectWiki do
|
|||
end
|
||||
|
||||
describe "#find_page" do
|
||||
shared_examples 'finding a wiki page' do
|
||||
before do
|
||||
create_page("index page", "This is an awesome Gollum Wiki")
|
||||
end
|
||||
|
||||
after do
|
||||
subject.pages.each { |page| destroy_page(page.page) }
|
||||
end
|
||||
|
||||
it "returns the latest version of the page if it exists" do
|
||||
page = subject.find_page("index page")
|
||||
expect(page.title).to eq("index page")
|
||||
end
|
||||
|
||||
it "returns nil if the page does not exist" do
|
||||
expect(subject.find_page("non-existent")).to eq(nil)
|
||||
end
|
||||
|
||||
it "can find a page by slug" do
|
||||
page = subject.find_page("index-page")
|
||||
expect(page.title).to eq("index page")
|
||||
end
|
||||
|
||||
it "returns a WikiPage instance" do
|
||||
page = subject.find_page("index page")
|
||||
expect(page).to be_a WikiPage
|
||||
end
|
||||
|
||||
context 'pages with multibyte-character title' do
|
||||
before do
|
||||
create_page("index page", "This is an awesome Gollum Wiki")
|
||||
end
|
||||
|
||||
after do
|
||||
subject.pages.each { |page| destroy_page(page.page) }
|
||||
end
|
||||
|
||||
it "returns the latest version of the page if it exists" do
|
||||
page = subject.find_page("index page")
|
||||
expect(page.title).to eq("index page")
|
||||
end
|
||||
|
||||
it "returns nil if the page does not exist" do
|
||||
expect(subject.find_page("non-existent")).to eq(nil)
|
||||
create_page("autre pagé", "C'est un génial Gollum Wiki")
|
||||
end
|
||||
|
||||
it "can find a page by slug" do
|
||||
page = subject.find_page("index-page")
|
||||
expect(page.title).to eq("index page")
|
||||
end
|
||||
|
||||
it "returns a WikiPage instance" do
|
||||
page = subject.find_page("index page")
|
||||
expect(page).to be_a WikiPage
|
||||
end
|
||||
|
||||
context 'pages with multibyte-character title' do
|
||||
before do
|
||||
create_page("autre pagé", "C'est un génial Gollum Wiki")
|
||||
end
|
||||
|
||||
it "can find a page by slug" do
|
||||
page = subject.find_page("autre pagé")
|
||||
expect(page.title).to eq("autre pagé")
|
||||
end
|
||||
end
|
||||
|
||||
context 'pages with invalidly-encoded content' do
|
||||
before do
|
||||
create_page("encoding is fun", "f\xFCr".b)
|
||||
end
|
||||
|
||||
it "can find the page" do
|
||||
page = subject.find_page("encoding is fun")
|
||||
expect(page.content).to eq("fr")
|
||||
end
|
||||
page = subject.find_page("autre pagé")
|
||||
expect(page.title).to eq("autre pagé")
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly wiki_find_page is enabled' do
|
||||
it_behaves_like 'finding a wiki page'
|
||||
end
|
||||
context 'pages with invalidly-encoded content' do
|
||||
before do
|
||||
create_page("encoding is fun", "f\xFCr".b)
|
||||
end
|
||||
|
||||
context 'when Gitaly wiki_find_page is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'finding a wiki page'
|
||||
it "can find the page" do
|
||||
page = subject.find_page("encoding is fun")
|
||||
expect(page.content).to eq("fr")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -207,100 +197,80 @@ describe ProjectWiki do
|
|||
end
|
||||
|
||||
describe '#find_file' do
|
||||
shared_examples 'finding a wiki file' do
|
||||
let(:image) { File.open(Rails.root.join('spec', 'fixtures', 'big-image.png')) }
|
||||
let(:image) { File.open(Rails.root.join('spec', 'fixtures', 'big-image.png')) }
|
||||
|
||||
before do
|
||||
subject.wiki # Make sure the wiki repo exists
|
||||
before do
|
||||
subject.wiki # Make sure the wiki repo exists
|
||||
|
||||
repo_path = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
|
||||
subject.repository.path_to_repo
|
||||
end
|
||||
|
||||
BareRepoOperations.new(repo_path).commit_file(image, 'image.png')
|
||||
repo_path = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
|
||||
subject.repository.path_to_repo
|
||||
end
|
||||
|
||||
it 'returns the latest version of the file if it exists' do
|
||||
file = subject.find_file('image.png')
|
||||
expect(file.mime_type).to eq('image/png')
|
||||
end
|
||||
|
||||
it 'returns nil if the page does not exist' do
|
||||
expect(subject.find_file('non-existent')).to eq(nil)
|
||||
end
|
||||
|
||||
it 'returns a Gitlab::Git::WikiFile instance' do
|
||||
file = subject.find_file('image.png')
|
||||
expect(file).to be_a Gitlab::Git::WikiFile
|
||||
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
|
||||
BareRepoOperations.new(repo_path).commit_file(image, 'image.png')
|
||||
end
|
||||
|
||||
context 'when Gitaly wiki_find_file is enabled' do
|
||||
it_behaves_like 'finding a wiki file'
|
||||
it 'returns the latest version of the file if it exists' do
|
||||
file = subject.find_file('image.png')
|
||||
expect(file.mime_type).to eq('image/png')
|
||||
end
|
||||
|
||||
context 'when Gitaly wiki_find_file is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'finding a wiki file'
|
||||
it 'returns nil if the page does not exist' do
|
||||
expect(subject.find_file('non-existent')).to eq(nil)
|
||||
end
|
||||
|
||||
it 'returns a Gitlab::Git::WikiFile instance' do
|
||||
file = subject.find_file('image.png')
|
||||
expect(file).to be_a Gitlab::Git::WikiFile
|
||||
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
|
||||
|
||||
describe "#create_page" do
|
||||
shared_examples 'creating a wiki page' do
|
||||
after do
|
||||
destroy_page(subject.pages.first.page)
|
||||
end
|
||||
|
||||
it "creates a new wiki page" do
|
||||
expect(subject.create_page("test page", "this is content")).not_to eq(false)
|
||||
expect(subject.pages.count).to eq(1)
|
||||
end
|
||||
|
||||
it "returns false when a duplicate page exists" do
|
||||
subject.create_page("test page", "content")
|
||||
expect(subject.create_page("test page", "content")).to eq(false)
|
||||
end
|
||||
|
||||
it "stores an error message when a duplicate page exists" do
|
||||
2.times { subject.create_page("test page", "content") }
|
||||
expect(subject.error_message).to match(/Duplicate page:/)
|
||||
end
|
||||
|
||||
it "sets the correct commit message" do
|
||||
subject.create_page("test page", "some content", :markdown, "commit message")
|
||||
expect(subject.pages.first.page.version.message).to eq("commit message")
|
||||
end
|
||||
|
||||
it 'sets the correct commit email' do
|
||||
subject.create_page('test page', 'content')
|
||||
|
||||
expect(user.commit_email).not_to eq(user.email)
|
||||
expect(commit.author_email).to eq(user.commit_email)
|
||||
expect(commit.committer_email).to eq(user.commit_email)
|
||||
end
|
||||
|
||||
it 'updates project activity' do
|
||||
subject.create_page('Test Page', 'This is content')
|
||||
|
||||
project.reload
|
||||
|
||||
expect(project.last_activity_at).to be_within(1.minute).of(Time.now)
|
||||
expect(project.last_repository_updated_at).to be_within(1.minute).of(Time.now)
|
||||
end
|
||||
after do
|
||||
destroy_page(subject.pages.first.page)
|
||||
end
|
||||
|
||||
context 'when Gitaly wiki_write_page is enabled' do
|
||||
it_behaves_like 'creating a wiki page'
|
||||
it "creates a new wiki page" do
|
||||
expect(subject.create_page("test page", "this is content")).not_to eq(false)
|
||||
expect(subject.pages.count).to eq(1)
|
||||
end
|
||||
|
||||
context 'when Gitaly wiki_write_page is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'creating a wiki page'
|
||||
it "returns false when a duplicate page exists" do
|
||||
subject.create_page("test page", "content")
|
||||
expect(subject.create_page("test page", "content")).to eq(false)
|
||||
end
|
||||
|
||||
it "stores an error message when a duplicate page exists" do
|
||||
2.times { subject.create_page("test page", "content") }
|
||||
expect(subject.error_message).to match(/Duplicate page:/)
|
||||
end
|
||||
|
||||
it "sets the correct commit message" do
|
||||
subject.create_page("test page", "some content", :markdown, "commit message")
|
||||
expect(subject.pages.first.page.version.message).to eq("commit message")
|
||||
end
|
||||
|
||||
it 'sets the correct commit email' do
|
||||
subject.create_page('test page', 'content')
|
||||
|
||||
expect(user.commit_email).not_to eq(user.email)
|
||||
expect(commit.author_email).to eq(user.commit_email)
|
||||
expect(commit.committer_email).to eq(user.commit_email)
|
||||
end
|
||||
|
||||
it 'updates project activity' do
|
||||
subject.create_page('Test Page', 'This is content')
|
||||
|
||||
project.reload
|
||||
|
||||
expect(project.last_activity_at).to be_within(1.minute).of(Time.now)
|
||||
expect(project.last_repository_updated_at).to be_within(1.minute).of(Time.now)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -351,41 +321,31 @@ describe ProjectWiki do
|
|||
end
|
||||
|
||||
describe "#delete_page" do
|
||||
shared_examples 'deleting a wiki page' do
|
||||
before do
|
||||
create_page("index", "some content")
|
||||
@page = subject.wiki.page(title: "index")
|
||||
end
|
||||
|
||||
it "deletes the page" do
|
||||
subject.delete_page(@page)
|
||||
expect(subject.pages.count).to eq(0)
|
||||
end
|
||||
|
||||
it 'sets the correct commit email' do
|
||||
subject.delete_page(@page)
|
||||
|
||||
expect(user.commit_email).not_to eq(user.email)
|
||||
expect(commit.author_email).to eq(user.commit_email)
|
||||
expect(commit.committer_email).to eq(user.commit_email)
|
||||
end
|
||||
|
||||
it 'updates project activity' do
|
||||
subject.delete_page(@page)
|
||||
|
||||
project.reload
|
||||
|
||||
expect(project.last_activity_at).to be_within(1.minute).of(Time.now)
|
||||
expect(project.last_repository_updated_at).to be_within(1.minute).of(Time.now)
|
||||
end
|
||||
before do
|
||||
create_page("index", "some content")
|
||||
@page = subject.wiki.page(title: "index")
|
||||
end
|
||||
|
||||
context 'when Gitaly wiki_delete_page is enabled' do
|
||||
it_behaves_like 'deleting a wiki page'
|
||||
it "deletes the page" do
|
||||
subject.delete_page(@page)
|
||||
expect(subject.pages.count).to eq(0)
|
||||
end
|
||||
|
||||
context 'when Gitaly wiki_delete_page is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'deleting a wiki page'
|
||||
it 'sets the correct commit email' do
|
||||
subject.delete_page(@page)
|
||||
|
||||
expect(user.commit_email).not_to eq(user.email)
|
||||
expect(commit.author_email).to eq(user.commit_email)
|
||||
expect(commit.committer_email).to eq(user.commit_email)
|
||||
end
|
||||
|
||||
it 'updates project activity' do
|
||||
subject.delete_page(@page)
|
||||
|
||||
project.reload
|
||||
|
||||
expect(project.last_activity_at).to be_within(1.minute).of(Time.now)
|
||||
expect(project.last_repository_updated_at).to be_within(1.minute).of(Time.now)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -38,49 +38,29 @@ describe Repository do
|
|||
end
|
||||
|
||||
describe '#branch_names_contains' do
|
||||
shared_examples '#branch_names_contains' do
|
||||
set(:project) { create(:project, :repository) }
|
||||
let(:repository) { project.repository }
|
||||
set(:project) { create(:project, :repository) }
|
||||
let(:repository) { project.repository }
|
||||
|
||||
subject { repository.branch_names_contains(sample_commit.id) }
|
||||
subject { repository.branch_names_contains(sample_commit.id) }
|
||||
|
||||
it { is_expected.to include('master') }
|
||||
it { is_expected.not_to include('feature') }
|
||||
it { is_expected.not_to include('fix') }
|
||||
it { is_expected.to include('master') }
|
||||
it { is_expected.not_to include('feature') }
|
||||
it { is_expected.not_to include('fix') }
|
||||
|
||||
describe 'when storage is broken', :broken_storage do
|
||||
it 'should raise a storage error' do
|
||||
expect_to_raise_storage_error do
|
||||
broken_repository.branch_names_contains(sample_commit.id)
|
||||
end
|
||||
describe 'when storage is broken', :broken_storage do
|
||||
it 'should raise a storage error' do
|
||||
expect_to_raise_storage_error do
|
||||
broken_repository.branch_names_contains(sample_commit.id)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when gitaly is enabled' do
|
||||
it_behaves_like '#branch_names_contains'
|
||||
end
|
||||
|
||||
context 'when gitaly is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like '#branch_names_contains'
|
||||
end
|
||||
end
|
||||
|
||||
describe '#tag_names_contains' do
|
||||
shared_examples '#tag_names_contains' do
|
||||
subject { repository.tag_names_contains(sample_commit.id) }
|
||||
subject { repository.tag_names_contains(sample_commit.id) }
|
||||
|
||||
it { is_expected.to include('v1.1.0') }
|
||||
it { is_expected.not_to include('v1.0.0') }
|
||||
end
|
||||
|
||||
context 'when gitaly is enabled' do
|
||||
it_behaves_like '#tag_names_contains'
|
||||
end
|
||||
|
||||
context 'when gitaly is enabled', :skip_gitaly_mock do
|
||||
it_behaves_like '#tag_names_contains'
|
||||
end
|
||||
it { is_expected.to include('v1.1.0') }
|
||||
it { is_expected.not_to include('v1.0.0') }
|
||||
end
|
||||
|
||||
describe 'tags_sorted_by' do
|
||||
|
@ -238,61 +218,41 @@ describe Repository do
|
|||
end
|
||||
|
||||
describe '#last_commit_for_path' do
|
||||
shared_examples 'getting last commit for path' do
|
||||
subject { repository.last_commit_for_path(sample_commit.id, '.gitignore').id }
|
||||
subject { repository.last_commit_for_path(sample_commit.id, '.gitignore').id }
|
||||
|
||||
it { is_expected.to eq('c1acaa58bbcbc3eafe538cb8274ba387047b69f8') }
|
||||
it { is_expected.to eq('c1acaa58bbcbc3eafe538cb8274ba387047b69f8') }
|
||||
|
||||
describe 'when storage is broken', :broken_storage do
|
||||
it 'should raise a storage error' do
|
||||
expect_to_raise_storage_error do
|
||||
broken_repository.last_commit_id_for_path(sample_commit.id, '.gitignore')
|
||||
end
|
||||
describe 'when storage is broken', :broken_storage do
|
||||
it 'should raise a storage error' do
|
||||
expect_to_raise_storage_error do
|
||||
broken_repository.last_commit_id_for_path(sample_commit.id, '.gitignore')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly feature last_commit_for_path is enabled' do
|
||||
it_behaves_like 'getting last commit for path'
|
||||
end
|
||||
|
||||
context 'when Gitaly feature last_commit_for_path is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'getting last commit for path'
|
||||
end
|
||||
end
|
||||
|
||||
describe '#last_commit_id_for_path' do
|
||||
shared_examples 'getting last commit ID for path' do
|
||||
subject { repository.last_commit_id_for_path(sample_commit.id, '.gitignore') }
|
||||
subject { repository.last_commit_id_for_path(sample_commit.id, '.gitignore') }
|
||||
|
||||
it "returns last commit id for a given path" do
|
||||
is_expected.to eq('c1acaa58bbcbc3eafe538cb8274ba387047b69f8')
|
||||
end
|
||||
it "returns last commit id for a given path" do
|
||||
is_expected.to eq('c1acaa58bbcbc3eafe538cb8274ba387047b69f8')
|
||||
end
|
||||
|
||||
it "caches last commit id for a given path" do
|
||||
cache = repository.send(:cache)
|
||||
key = "last_commit_id_for_path:#{sample_commit.id}:#{Digest::SHA1.hexdigest('.gitignore')}"
|
||||
it "caches last commit id for a given path" do
|
||||
cache = repository.send(:cache)
|
||||
key = "last_commit_id_for_path:#{sample_commit.id}:#{Digest::SHA1.hexdigest('.gitignore')}"
|
||||
|
||||
expect(cache).to receive(:fetch).with(key).and_return('c1acaa5')
|
||||
is_expected.to eq('c1acaa5')
|
||||
end
|
||||
expect(cache).to receive(:fetch).with(key).and_return('c1acaa5')
|
||||
is_expected.to eq('c1acaa5')
|
||||
end
|
||||
|
||||
describe 'when storage is broken', :broken_storage do
|
||||
it 'should raise a storage error' do
|
||||
expect_to_raise_storage_error do
|
||||
broken_repository.last_commit_for_path(sample_commit.id, '.gitignore').id
|
||||
end
|
||||
describe 'when storage is broken', :broken_storage do
|
||||
it 'should raise a storage error' do
|
||||
expect_to_raise_storage_error do
|
||||
broken_repository.last_commit_for_path(sample_commit.id, '.gitignore').id
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly feature last_commit_for_path is enabled' do
|
||||
it_behaves_like 'getting last commit ID for path'
|
||||
end
|
||||
|
||||
context 'when Gitaly feature last_commit_for_path is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'getting last commit ID for path'
|
||||
end
|
||||
end
|
||||
|
||||
describe '#commits' do
|
||||
|
@ -374,78 +334,57 @@ describe Repository do
|
|||
|
||||
describe '#commits_by' do
|
||||
set(:project) { create(:project, :repository) }
|
||||
let(:oids) { TestEnv::BRANCH_SHA.values }
|
||||
|
||||
shared_examples 'batch commits fetching' do
|
||||
let(:oids) { TestEnv::BRANCH_SHA.values }
|
||||
subject { project.repository.commits_by(oids: oids) }
|
||||
|
||||
subject { project.repository.commits_by(oids: oids) }
|
||||
it 'finds each commit' do
|
||||
expect(subject).not_to include(nil)
|
||||
expect(subject.size).to eq(oids.size)
|
||||
end
|
||||
|
||||
it 'finds each commit' do
|
||||
it 'returns only Commit instances' do
|
||||
expect(subject).to all( be_a(Commit) )
|
||||
end
|
||||
|
||||
context 'when some commits are not found ' do
|
||||
let(:oids) do
|
||||
['deadbeef'] + TestEnv::BRANCH_SHA.values.first(10)
|
||||
end
|
||||
|
||||
it 'returns only found commits' do
|
||||
expect(subject).not_to include(nil)
|
||||
expect(subject.size).to eq(oids.size)
|
||||
end
|
||||
|
||||
it 'returns only Commit instances' do
|
||||
expect(subject).to all( be_a(Commit) )
|
||||
end
|
||||
|
||||
context 'when some commits are not found ' do
|
||||
let(:oids) do
|
||||
['deadbeef'] + TestEnv::BRANCH_SHA.values.first(10)
|
||||
end
|
||||
|
||||
it 'returns only found commits' do
|
||||
expect(subject).not_to include(nil)
|
||||
expect(subject.size).to eq(10)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when no oids are passed' do
|
||||
let(:oids) { [] }
|
||||
|
||||
it 'does not call #batch_by_oid' do
|
||||
expect(Gitlab::Git::Commit).not_to receive(:batch_by_oid)
|
||||
|
||||
subject
|
||||
end
|
||||
expect(subject.size).to eq(10)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly list_commits_by_oid is enabled' do
|
||||
it_behaves_like 'batch commits fetching'
|
||||
end
|
||||
context 'when no oids are passed' do
|
||||
let(:oids) { [] }
|
||||
|
||||
context 'when Gitaly list_commits_by_oid is enabled', :disable_gitaly do
|
||||
it_behaves_like 'batch commits fetching'
|
||||
it 'does not call #batch_by_oid' do
|
||||
expect(Gitlab::Git::Commit).not_to receive(:batch_by_oid)
|
||||
|
||||
subject
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#find_commits_by_message' do
|
||||
shared_examples 'finding commits by message' do
|
||||
it 'returns commits with messages containing a given string' do
|
||||
commit_ids = repository.find_commits_by_message('submodule').map(&:id)
|
||||
it 'returns commits with messages containing a given string' do
|
||||
commit_ids = repository.find_commits_by_message('submodule').map(&:id)
|
||||
|
||||
expect(commit_ids).to include(
|
||||
'5937ac0a7beb003549fc5fd26fc247adbce4a52e',
|
||||
'6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9',
|
||||
'cfe32cf61b73a0d5e9f13e774abde7ff789b1660'
|
||||
)
|
||||
expect(commit_ids).not_to include('913c66a37b4a45b9769037c55c2d238bd0942d2e')
|
||||
end
|
||||
|
||||
it 'is case insensitive' do
|
||||
commit_ids = repository.find_commits_by_message('SUBMODULE').map(&:id)
|
||||
|
||||
expect(commit_ids).to include('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
|
||||
end
|
||||
expect(commit_ids).to include(
|
||||
'5937ac0a7beb003549fc5fd26fc247adbce4a52e',
|
||||
'6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9',
|
||||
'cfe32cf61b73a0d5e9f13e774abde7ff789b1660'
|
||||
)
|
||||
expect(commit_ids).not_to include('913c66a37b4a45b9769037c55c2d238bd0942d2e')
|
||||
end
|
||||
|
||||
context 'when Gitaly commits_by_message feature is enabled' do
|
||||
it_behaves_like 'finding commits by message'
|
||||
end
|
||||
it 'is case insensitive' do
|
||||
commit_ids = repository.find_commits_by_message('SUBMODULE').map(&:id)
|
||||
|
||||
context 'when Gitaly commits_by_message feature is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'finding commits by message'
|
||||
expect(commit_ids).to include('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
|
||||
end
|
||||
|
||||
describe 'when storage is broken', :broken_storage do
|
||||
|
@ -1328,34 +1267,23 @@ describe Repository do
|
|||
|
||||
describe '#merge' do
|
||||
let(:merge_request) { create(:merge_request, source_branch: 'feature', target_branch: 'master', source_project: project) }
|
||||
|
||||
let(:message) { 'Test \r\n\r\n message' }
|
||||
|
||||
shared_examples '#merge' do
|
||||
it 'merges the code and returns the commit id' do
|
||||
expect(merge_commit).to be_present
|
||||
expect(repository.blob_at(merge_commit.id, 'files/ruby/feature.rb')).to be_present
|
||||
end
|
||||
|
||||
it 'sets the `in_progress_merge_commit_sha` flag for the given merge request' do
|
||||
merge_commit_id = merge(repository, user, merge_request, message)
|
||||
|
||||
expect(merge_request.in_progress_merge_commit_sha).to eq(merge_commit_id)
|
||||
end
|
||||
|
||||
it 'removes carriage returns from commit message' do
|
||||
merge_commit_id = merge(repository, user, merge_request, message)
|
||||
|
||||
expect(repository.commit(merge_commit_id).message).to eq(message.delete("\r"))
|
||||
end
|
||||
it 'merges the code and returns the commit id' do
|
||||
expect(merge_commit).to be_present
|
||||
expect(repository.blob_at(merge_commit.id, 'files/ruby/feature.rb')).to be_present
|
||||
end
|
||||
|
||||
context 'with gitaly' do
|
||||
it_behaves_like '#merge'
|
||||
it 'sets the `in_progress_merge_commit_sha` flag for the given merge request' do
|
||||
merge_commit_id = merge(repository, user, merge_request, message)
|
||||
|
||||
expect(merge_request.in_progress_merge_commit_sha).to eq(merge_commit_id)
|
||||
end
|
||||
|
||||
context 'without gitaly', :skip_gitaly_mock do
|
||||
it_behaves_like '#merge'
|
||||
it 'removes carriage returns from commit message' do
|
||||
merge_commit_id = merge(repository, user, merge_request, message)
|
||||
|
||||
expect(repository.commit(merge_commit_id).message).to eq(message.delete("\r"))
|
||||
end
|
||||
|
||||
def merge(repository, user, merge_request, message)
|
||||
|
@ -1392,97 +1320,77 @@ describe Repository do
|
|||
end
|
||||
|
||||
describe '#revert' do
|
||||
shared_examples 'reverting a commit' do
|
||||
let(:new_image_commit) { repository.commit('33f3729a45c02fc67d00adb1b8bca394b0e761d9') }
|
||||
let(:update_image_commit) { repository.commit('2f63565e7aac07bcdadb654e253078b727143ec4') }
|
||||
let(:message) { 'revert message' }
|
||||
let(:new_image_commit) { repository.commit('33f3729a45c02fc67d00adb1b8bca394b0e761d9') }
|
||||
let(:update_image_commit) { repository.commit('2f63565e7aac07bcdadb654e253078b727143ec4') }
|
||||
let(:message) { 'revert message' }
|
||||
|
||||
context 'when there is a conflict' do
|
||||
it 'raises an error' do
|
||||
expect { repository.revert(user, new_image_commit, 'master', message) }.to raise_error(Gitlab::Git::Repository::CreateTreeError)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when commit was already reverted' do
|
||||
it 'raises an error' do
|
||||
repository.revert(user, update_image_commit, 'master', message)
|
||||
|
||||
expect { repository.revert(user, update_image_commit, 'master', message) }.to raise_error(Gitlab::Git::Repository::CreateTreeError)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when commit can be reverted' do
|
||||
it 'reverts the changes' do
|
||||
expect(repository.revert(user, update_image_commit, 'master', message)).to be_truthy
|
||||
end
|
||||
end
|
||||
|
||||
context 'reverting a merge commit' do
|
||||
it 'reverts the changes' do
|
||||
merge_commit
|
||||
expect(repository.blob_at_branch('master', 'files/ruby/feature.rb')).to be_present
|
||||
|
||||
repository.revert(user, merge_commit, 'master', message)
|
||||
expect(repository.blob_at_branch('master', 'files/ruby/feature.rb')).not_to be_present
|
||||
end
|
||||
context 'when there is a conflict' do
|
||||
it 'raises an error' do
|
||||
expect { repository.revert(user, new_image_commit, 'master', message) }.to raise_error(Gitlab::Git::Repository::CreateTreeError)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly revert feature is enabled' do
|
||||
it_behaves_like 'reverting a commit'
|
||||
context 'when commit was already reverted' do
|
||||
it 'raises an error' do
|
||||
repository.revert(user, update_image_commit, 'master', message)
|
||||
|
||||
expect { repository.revert(user, update_image_commit, 'master', message) }.to raise_error(Gitlab::Git::Repository::CreateTreeError)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly revert feature is disabled', :disable_gitaly do
|
||||
it_behaves_like 'reverting a commit'
|
||||
context 'when commit can be reverted' do
|
||||
it 'reverts the changes' do
|
||||
expect(repository.revert(user, update_image_commit, 'master', message)).to be_truthy
|
||||
end
|
||||
end
|
||||
|
||||
context 'reverting a merge commit' do
|
||||
it 'reverts the changes' do
|
||||
merge_commit
|
||||
expect(repository.blob_at_branch('master', 'files/ruby/feature.rb')).to be_present
|
||||
|
||||
repository.revert(user, merge_commit, 'master', message)
|
||||
expect(repository.blob_at_branch('master', 'files/ruby/feature.rb')).not_to be_present
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#cherry_pick' do
|
||||
shared_examples 'cherry-picking a commit' do
|
||||
let(:conflict_commit) { repository.commit('c642fe9b8b9f28f9225d7ea953fe14e74748d53b') }
|
||||
let(:pickable_commit) { repository.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
|
||||
let(:pickable_merge) { repository.commit('e56497bb5f03a90a51293fc6d516788730953899') }
|
||||
let(:message) { 'cherry-pick message' }
|
||||
let(:conflict_commit) { repository.commit('c642fe9b8b9f28f9225d7ea953fe14e74748d53b') }
|
||||
let(:pickable_commit) { repository.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
|
||||
let(:pickable_merge) { repository.commit('e56497bb5f03a90a51293fc6d516788730953899') }
|
||||
let(:message) { 'cherry-pick message' }
|
||||
|
||||
context 'when there is a conflict' do
|
||||
it 'raises an error' do
|
||||
expect { repository.cherry_pick(user, conflict_commit, 'master', message) }.to raise_error(Gitlab::Git::Repository::CreateTreeError)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when commit was already cherry-picked' do
|
||||
it 'raises an error' do
|
||||
repository.cherry_pick(user, pickable_commit, 'master', message)
|
||||
|
||||
expect { repository.cherry_pick(user, pickable_commit, 'master', message) }.to raise_error(Gitlab::Git::Repository::CreateTreeError)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when commit can be cherry-picked' do
|
||||
it 'cherry-picks the changes' do
|
||||
expect(repository.cherry_pick(user, pickable_commit, 'master', message)).to be_truthy
|
||||
end
|
||||
end
|
||||
|
||||
context 'cherry-picking a merge commit' do
|
||||
it 'cherry-picks the changes' do
|
||||
expect(repository.blob_at_branch('improve/awesome', 'foo/bar/.gitkeep')).to be_nil
|
||||
|
||||
cherry_pick_commit_sha = repository.cherry_pick(user, pickable_merge, 'improve/awesome', message)
|
||||
cherry_pick_commit_message = project.commit(cherry_pick_commit_sha).message
|
||||
|
||||
expect(repository.blob_at_branch('improve/awesome', 'foo/bar/.gitkeep')).not_to be_nil
|
||||
expect(cherry_pick_commit_message).to eq(message)
|
||||
end
|
||||
context 'when there is a conflict' do
|
||||
it 'raises an error' do
|
||||
expect { repository.cherry_pick(user, conflict_commit, 'master', message) }.to raise_error(Gitlab::Git::Repository::CreateTreeError)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly cherry_pick feature is enabled' do
|
||||
it_behaves_like 'cherry-picking a commit'
|
||||
context 'when commit was already cherry-picked' do
|
||||
it 'raises an error' do
|
||||
repository.cherry_pick(user, pickable_commit, 'master', message)
|
||||
|
||||
expect { repository.cherry_pick(user, pickable_commit, 'master', message) }.to raise_error(Gitlab::Git::Repository::CreateTreeError)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly cherry_pick feature is disabled', :disable_gitaly do
|
||||
it_behaves_like 'cherry-picking a commit'
|
||||
context 'when commit can be cherry-picked' do
|
||||
it 'cherry-picks the changes' do
|
||||
expect(repository.cherry_pick(user, pickable_commit, 'master', message)).to be_truthy
|
||||
end
|
||||
end
|
||||
|
||||
context 'cherry-picking a merge commit' do
|
||||
it 'cherry-picks the changes' do
|
||||
expect(repository.blob_at_branch('improve/awesome', 'foo/bar/.gitkeep')).to be_nil
|
||||
|
||||
cherry_pick_commit_sha = repository.cherry_pick(user, pickable_merge, 'improve/awesome', message)
|
||||
cherry_pick_commit_message = project.commit(cherry_pick_commit_sha).message
|
||||
|
||||
expect(repository.blob_at_branch('improve/awesome', 'foo/bar/.gitkeep')).not_to be_nil
|
||||
expect(cherry_pick_commit_message).to eq(message)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -2190,33 +2098,23 @@ describe Repository do
|
|||
let(:commit) { repository.commit }
|
||||
let(:ancestor) { commit.parents.first }
|
||||
|
||||
shared_examples '#ancestor?' do
|
||||
it 'it is an ancestor' do
|
||||
expect(repository.ancestor?(ancestor.id, commit.id)).to eq(true)
|
||||
end
|
||||
|
||||
it 'it is not an ancestor' do
|
||||
expect(repository.ancestor?(commit.id, ancestor.id)).to eq(false)
|
||||
end
|
||||
|
||||
it 'returns false on nil-values' do
|
||||
expect(repository.ancestor?(nil, commit.id)).to eq(false)
|
||||
expect(repository.ancestor?(ancestor.id, nil)).to eq(false)
|
||||
expect(repository.ancestor?(nil, nil)).to eq(false)
|
||||
end
|
||||
|
||||
it 'returns false for invalid commit IDs' do
|
||||
expect(repository.ancestor?(commit.id, Gitlab::Git::BLANK_SHA)).to eq(false)
|
||||
expect(repository.ancestor?( Gitlab::Git::BLANK_SHA, commit.id)).to eq(false)
|
||||
end
|
||||
it 'it is an ancestor' do
|
||||
expect(repository.ancestor?(ancestor.id, commit.id)).to eq(true)
|
||||
end
|
||||
|
||||
context 'with Gitaly enabled' do
|
||||
it_behaves_like('#ancestor?')
|
||||
it 'it is not an ancestor' do
|
||||
expect(repository.ancestor?(commit.id, ancestor.id)).to eq(false)
|
||||
end
|
||||
|
||||
context 'with Gitaly disabled', :skip_gitaly_mock do
|
||||
it_behaves_like('#ancestor?')
|
||||
it 'returns false on nil-values' do
|
||||
expect(repository.ancestor?(nil, commit.id)).to eq(false)
|
||||
expect(repository.ancestor?(ancestor.id, nil)).to eq(false)
|
||||
expect(repository.ancestor?(nil, nil)).to eq(false)
|
||||
end
|
||||
|
||||
it 'returns false for invalid commit IDs' do
|
||||
expect(repository.ancestor?(commit.id, Gitlab::Git::BLANK_SHA)).to eq(false)
|
||||
expect(repository.ancestor?( Gitlab::Git::BLANK_SHA, commit.id)).to eq(false)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -200,180 +200,160 @@ describe WikiPage do
|
|||
end
|
||||
|
||||
describe '#create' do
|
||||
shared_examples 'create method' do
|
||||
context 'with valid attributes' do
|
||||
it 'raises an error if a page with the same path already exists' do
|
||||
create_page('New Page', 'content')
|
||||
create_page('foo/bar', 'content')
|
||||
expect { create_page('New Page', 'other content') }.to raise_error Gitlab::Git::Wiki::DuplicatePageError
|
||||
expect { create_page('foo/bar', 'other content') }.to raise_error Gitlab::Git::Wiki::DuplicatePageError
|
||||
context 'with valid attributes' do
|
||||
it 'raises an error if a page with the same path already exists' do
|
||||
create_page('New Page', 'content')
|
||||
create_page('foo/bar', 'content')
|
||||
expect { create_page('New Page', 'other content') }.to raise_error Gitlab::Git::Wiki::DuplicatePageError
|
||||
expect { create_page('foo/bar', 'other content') }.to raise_error Gitlab::Git::Wiki::DuplicatePageError
|
||||
|
||||
destroy_page('New Page')
|
||||
destroy_page('bar', 'foo')
|
||||
end
|
||||
|
||||
it 'if the title is preceded by a / it is removed' do
|
||||
create_page('/New Page', 'content')
|
||||
|
||||
expect(wiki.find_page('New Page')).not_to be_nil
|
||||
|
||||
destroy_page('New Page')
|
||||
end
|
||||
destroy_page('New Page')
|
||||
destroy_page('bar', 'foo')
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly is enabled' do
|
||||
it_behaves_like 'create method'
|
||||
end
|
||||
it 'if the title is preceded by a / it is removed' do
|
||||
create_page('/New Page', 'content')
|
||||
|
||||
context 'when Gitaly is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'create method'
|
||||
expect(wiki.find_page('New Page')).not_to be_nil
|
||||
|
||||
destroy_page('New Page')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe "#update" do
|
||||
shared_examples 'update method' do
|
||||
before do
|
||||
create_page("Update", "content")
|
||||
before do
|
||||
create_page("Update", "content")
|
||||
@page = wiki.find_page("Update")
|
||||
end
|
||||
|
||||
after do
|
||||
destroy_page(@page.title, @page.directory)
|
||||
end
|
||||
|
||||
context "with valid attributes" do
|
||||
it "updates the content of the page" do
|
||||
new_content = "new content"
|
||||
|
||||
@page.update(content: new_content)
|
||||
@page = wiki.find_page("Update")
|
||||
|
||||
expect(@page.content).to eq("new content")
|
||||
end
|
||||
|
||||
after do
|
||||
destroy_page(@page.title, @page.directory)
|
||||
it "updates the title of the page" do
|
||||
new_title = "Index v.1.2.4"
|
||||
|
||||
@page.update(title: new_title)
|
||||
@page = wiki.find_page(new_title)
|
||||
|
||||
expect(@page.title).to eq(new_title)
|
||||
end
|
||||
|
||||
context "with valid attributes" do
|
||||
it "updates the content of the page" do
|
||||
new_content = "new content"
|
||||
it "returns true" do
|
||||
expect(@page.update(content: "more content")).to be_truthy
|
||||
end
|
||||
end
|
||||
|
||||
@page.update(content: new_content)
|
||||
@page = wiki.find_page("Update")
|
||||
context 'with same last commit sha' do
|
||||
it 'returns true' do
|
||||
expect(@page.update(content: 'more content', last_commit_sha: @page.last_commit_sha)).to be_truthy
|
||||
end
|
||||
end
|
||||
|
||||
expect(@page.content).to eq("new content")
|
||||
end
|
||||
context 'with different last commit sha' do
|
||||
it 'raises exception' do
|
||||
expect { @page.update(content: 'more content', last_commit_sha: 'xxx') }.to raise_error(WikiPage::PageChangedError)
|
||||
end
|
||||
end
|
||||
|
||||
it "updates the title of the page" do
|
||||
new_title = "Index v.1.2.4"
|
||||
context 'when renaming a page' do
|
||||
it 'raises an error if the page already exists' do
|
||||
create_page('Existing Page', 'content')
|
||||
|
||||
@page.update(title: new_title)
|
||||
@page = wiki.find_page(new_title)
|
||||
expect { @page.update(title: 'Existing Page', content: 'new_content') }.to raise_error(WikiPage::PageRenameError)
|
||||
expect(@page.title).to eq 'Update'
|
||||
expect(@page.content).to eq 'new_content'
|
||||
|
||||
expect(@page.title).to eq(new_title)
|
||||
end
|
||||
|
||||
it "returns true" do
|
||||
expect(@page.update(content: "more content")).to be_truthy
|
||||
end
|
||||
destroy_page('Existing Page')
|
||||
end
|
||||
|
||||
context 'with same last commit sha' do
|
||||
it 'returns true' do
|
||||
expect(@page.update(content: 'more content', last_commit_sha: @page.last_commit_sha)).to be_truthy
|
||||
end
|
||||
it 'updates the content and rename the file' do
|
||||
new_title = 'Renamed Page'
|
||||
new_content = 'updated content'
|
||||
|
||||
expect(@page.update(title: new_title, content: new_content)).to be_truthy
|
||||
|
||||
@page = wiki.find_page(new_title)
|
||||
|
||||
expect(@page).not_to be_nil
|
||||
expect(@page.content).to eq new_content
|
||||
end
|
||||
end
|
||||
|
||||
context 'when moving a page' do
|
||||
it 'raises an error if the page already exists' do
|
||||
create_page('foo/Existing Page', 'content')
|
||||
|
||||
expect { @page.update(title: 'foo/Existing Page', content: 'new_content') }.to raise_error(WikiPage::PageRenameError)
|
||||
expect(@page.title).to eq 'Update'
|
||||
expect(@page.content).to eq 'new_content'
|
||||
|
||||
destroy_page('Existing Page', 'foo')
|
||||
end
|
||||
|
||||
context 'with different last commit sha' do
|
||||
it 'raises exception' do
|
||||
expect { @page.update(content: 'more content', last_commit_sha: 'xxx') }.to raise_error(WikiPage::PageChangedError)
|
||||
end
|
||||
it 'updates the content and moves the file' do
|
||||
new_title = 'foo/Other Page'
|
||||
new_content = 'new_content'
|
||||
|
||||
expect(@page.update(title: new_title, content: new_content)).to be_truthy
|
||||
|
||||
page = wiki.find_page(new_title)
|
||||
|
||||
expect(page).not_to be_nil
|
||||
expect(page.content).to eq new_content
|
||||
end
|
||||
|
||||
context 'when renaming a page' do
|
||||
it 'raises an error if the page already exists' do
|
||||
create_page('Existing Page', 'content')
|
||||
|
||||
expect { @page.update(title: 'Existing Page', content: 'new_content') }.to raise_error(WikiPage::PageRenameError)
|
||||
expect(@page.title).to eq 'Update'
|
||||
expect(@page.content).to eq 'new_content'
|
||||
|
||||
destroy_page('Existing Page')
|
||||
end
|
||||
|
||||
it 'updates the content and rename the file' do
|
||||
new_title = 'Renamed Page'
|
||||
new_content = 'updated content'
|
||||
|
||||
expect(@page.update(title: new_title, content: new_content)).to be_truthy
|
||||
|
||||
@page = wiki.find_page(new_title)
|
||||
|
||||
expect(@page).not_to be_nil
|
||||
expect(@page.content).to eq new_content
|
||||
end
|
||||
end
|
||||
|
||||
context 'when moving a page' do
|
||||
it 'raises an error if the page already exists' do
|
||||
context 'in subdir' do
|
||||
before do
|
||||
create_page('foo/Existing Page', 'content')
|
||||
|
||||
expect { @page.update(title: 'foo/Existing Page', content: 'new_content') }.to raise_error(WikiPage::PageRenameError)
|
||||
expect(@page.title).to eq 'Update'
|
||||
expect(@page.content).to eq 'new_content'
|
||||
|
||||
destroy_page('Existing Page', 'foo')
|
||||
@page = wiki.find_page('foo/Existing Page')
|
||||
end
|
||||
|
||||
it 'updates the content and moves the file' do
|
||||
new_title = 'foo/Other Page'
|
||||
new_content = 'new_content'
|
||||
|
||||
expect(@page.update(title: new_title, content: new_content)).to be_truthy
|
||||
|
||||
page = wiki.find_page(new_title)
|
||||
|
||||
expect(page).not_to be_nil
|
||||
expect(page.content).to eq new_content
|
||||
it 'moves the page to the root folder if the title is preceded by /' do
|
||||
expect(@page.slug).to eq 'foo/Existing-Page'
|
||||
expect(@page.update(title: '/Existing Page', content: 'new_content')).to be_truthy
|
||||
expect(@page.slug).to eq 'Existing-Page'
|
||||
end
|
||||
|
||||
context 'in subdir' do
|
||||
before do
|
||||
create_page('foo/Existing Page', 'content')
|
||||
@page = wiki.find_page('foo/Existing Page')
|
||||
end
|
||||
it 'does nothing if it has the same title' do
|
||||
original_path = @page.slug
|
||||
|
||||
it 'moves the page to the root folder if the title is preceded by /', :skip_gitaly_mock do
|
||||
expect(@page.slug).to eq 'foo/Existing-Page'
|
||||
expect(@page.update(title: '/Existing Page', content: 'new_content')).to be_truthy
|
||||
expect(@page.slug).to eq 'Existing-Page'
|
||||
end
|
||||
|
||||
it 'does nothing if it has the same title' do
|
||||
original_path = @page.slug
|
||||
|
||||
expect(@page.update(title: 'Existing Page', content: 'new_content')).to be_truthy
|
||||
expect(@page.slug).to eq original_path
|
||||
end
|
||||
end
|
||||
|
||||
context 'in root dir' do
|
||||
it 'does nothing if the title is preceded by /' do
|
||||
original_path = @page.slug
|
||||
|
||||
expect(@page.update(title: '/Update', content: 'new_content')).to be_truthy
|
||||
expect(@page.slug).to eq original_path
|
||||
end
|
||||
expect(@page.update(title: 'Existing Page', content: 'new_content')).to be_truthy
|
||||
expect(@page.slug).to eq original_path
|
||||
end
|
||||
end
|
||||
|
||||
context "with invalid attributes" do
|
||||
it 'aborts update if title blank' do
|
||||
expect(@page.update(title: '', content: 'new_content')).to be_falsey
|
||||
expect(@page.content).to eq 'new_content'
|
||||
context 'in root dir' do
|
||||
it 'does nothing if the title is preceded by /' do
|
||||
original_path = @page.slug
|
||||
|
||||
page = wiki.find_page('Update')
|
||||
expect(page.content).to eq 'content'
|
||||
|
||||
@page.title = 'Update'
|
||||
expect(@page.update(title: '/Update', content: 'new_content')).to be_truthy
|
||||
expect(@page.slug).to eq original_path
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly is enabled' do
|
||||
it_behaves_like 'update method'
|
||||
end
|
||||
context "with invalid attributes" do
|
||||
it 'aborts update if title blank' do
|
||||
expect(@page.update(title: '', content: 'new_content')).to be_falsey
|
||||
expect(@page.content).to eq 'new_content'
|
||||
|
||||
context 'when Gitaly is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'update method'
|
||||
page = wiki.find_page('Update')
|
||||
expect(page.content).to eq 'content'
|
||||
|
||||
@page.title = 'Update'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -394,34 +374,24 @@ describe WikiPage do
|
|||
end
|
||||
|
||||
describe "#versions" do
|
||||
shared_examples 'wiki page versions' do
|
||||
let(:page) { wiki.find_page("Update") }
|
||||
let(:page) { wiki.find_page("Update") }
|
||||
|
||||
before do
|
||||
create_page("Update", "content")
|
||||
end
|
||||
|
||||
after do
|
||||
destroy_page("Update")
|
||||
end
|
||||
|
||||
it "returns an array of all commits for the page" do
|
||||
3.times { |i| page.update(content: "content #{i}") }
|
||||
|
||||
expect(page.versions.count).to eq(4)
|
||||
end
|
||||
|
||||
it 'returns instances of WikiPageVersion' do
|
||||
expect(page.versions).to all( be_a(Gitlab::Git::WikiPageVersion) )
|
||||
end
|
||||
before do
|
||||
create_page("Update", "content")
|
||||
end
|
||||
|
||||
context 'when Gitaly is enabled' do
|
||||
it_behaves_like 'wiki page versions'
|
||||
after do
|
||||
destroy_page("Update")
|
||||
end
|
||||
|
||||
context 'when Gitaly is disabled', :disable_gitaly do
|
||||
it_behaves_like 'wiki page versions'
|
||||
it "returns an array of all commits for the page" do
|
||||
3.times { |i| page.update(content: "content #{i}") }
|
||||
|
||||
expect(page.versions.count).to eq(4)
|
||||
end
|
||||
|
||||
it 'returns instances of WikiPageVersion' do
|
||||
expect(page.versions).to all( be_a(Gitlab::Git::WikiPageVersion) )
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -555,23 +525,13 @@ describe WikiPage do
|
|||
end
|
||||
|
||||
describe '#formatted_content' do
|
||||
shared_examples 'fetching page formatted content' do
|
||||
it 'returns processed content of the page' do
|
||||
subject.create({ title: "RDoc", content: "*bold*", format: "rdoc" })
|
||||
page = wiki.find_page('RDoc')
|
||||
it 'returns processed content of the page' do
|
||||
subject.create({ title: "RDoc", content: "*bold*", format: "rdoc" })
|
||||
page = wiki.find_page('RDoc')
|
||||
|
||||
expect(page.formatted_content).to eq("\n<p><strong>bold</strong></p>\n")
|
||||
expect(page.formatted_content).to eq("\n<p><strong>bold</strong></p>\n")
|
||||
|
||||
destroy_page('RDoc')
|
||||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly wiki_page_formatted_data is enabled' do
|
||||
it_behaves_like 'fetching page formatted content'
|
||||
end
|
||||
|
||||
context 'when Gitaly wiki_page_formatted_data is disabled', :disable_gitaly do
|
||||
it_behaves_like 'fetching page formatted content'
|
||||
destroy_page('RDoc')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
RSpec.configure do |config|
|
||||
config.before(:each) do |example|
|
||||
if example.metadata[:disable_gitaly]
|
||||
# Use 'and_wrap_original' to make sure the arguments are valid
|
||||
allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_wrap_original { |m, *args| m.call(*args) && false }
|
||||
else
|
||||
next if example.metadata[:skip_gitaly_mock]
|
||||
|
||||
# Use 'and_wrap_original' to make sure the arguments are valid
|
||||
allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_wrap_original do |m, *args|
|
||||
m.call(*args)
|
||||
!Gitlab::GitalyClient.explicit_opt_in_required.include?(args.first)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue