Replaces 'WikiPage::CreateService' calls with 'wiki_page' factory
We replace the usage of WikiPage::CreateService with the wiki_page factory in the specs.
This commit is contained in:
parent
9ac5338b8e
commit
c30f92464e
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Replace WikiPage::CreateService calls with wiki_page factory in specs
|
||||
merge_request: 14850
|
||||
author: Jacopo Beschi @jacopo-beschi
|
||||
type: changed
|
|
@ -14,7 +14,6 @@ feature 'Projects > Wiki > User previews markdown changes', :js do
|
|||
|
||||
background do
|
||||
project.team << [user, :master]
|
||||
WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute
|
||||
|
||||
sign_in(user)
|
||||
|
||||
|
|
|
@ -3,9 +3,7 @@ require 'spec_helper'
|
|||
feature 'Wiki shortcuts', :js do
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project, namespace: user.namespace) }
|
||||
let(:wiki_page) do
|
||||
WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute
|
||||
end
|
||||
let(:wiki_page) { create(:wiki_page, wiki: project.wiki, attrs: { title: 'home', content: 'Home page' }) }
|
||||
|
||||
before do
|
||||
sign_in(user)
|
||||
|
|
|
@ -3,14 +3,7 @@ require 'spec_helper'
|
|||
describe 'Projects > Wiki > User views Git access wiki page' do
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project, :public) }
|
||||
let(:wiki_page) do
|
||||
WikiPages::CreateService.new(
|
||||
project,
|
||||
user,
|
||||
title: 'home',
|
||||
content: '[some link](other-page)'
|
||||
).execute
|
||||
end
|
||||
let(:wiki_page) { create(:wiki_page, wiki: project.wiki, attrs: { title: 'home', content: '[some link](other-page)' }) }
|
||||
|
||||
before do
|
||||
sign_in(user)
|
||||
|
|
|
@ -18,12 +18,7 @@ describe 'Projects > Wiki > User views wiki in project page' do
|
|||
|
||||
context 'when wiki homepage contains a link' do
|
||||
before do
|
||||
WikiPages::CreateService.new(
|
||||
project,
|
||||
user,
|
||||
title: 'home',
|
||||
content: '[some link](other-page)'
|
||||
).execute
|
||||
create(:wiki_page, wiki: project.wiki, attrs: { title: 'home', content: '[some link](other-page)' })
|
||||
end
|
||||
|
||||
it 'displays the correct URL for the link' do
|
||||
|
|
|
@ -37,7 +37,7 @@ describe BlobViewer::Readme do
|
|||
|
||||
context 'when the wiki is not empty' do
|
||||
before do
|
||||
WikiPages::CreateService.new(project, project.owner, title: 'home', content: 'Home page').execute
|
||||
create(:wiki_page, wiki: project.wiki, attrs: { title: 'home', content: 'Home page' })
|
||||
end
|
||||
|
||||
it 'returns nil' do
|
||||
|
|
|
@ -108,12 +108,8 @@ describe MicrosoftTeamsService do
|
|||
message: "user created page: Awesome wiki_page"
|
||||
}
|
||||
end
|
||||
|
||||
let(:wiki_page_sample_data) do
|
||||
service = WikiPages::CreateService.new(project, user, opts)
|
||||
wiki_page = service.execute
|
||||
Gitlab::DataBuilder::WikiPage.build(wiki_page, user, 'create')
|
||||
end
|
||||
let(:wiki_page) { create(:wiki_page, wiki: project.wiki, attrs: opts) }
|
||||
let(:wiki_page_sample_data) { Gitlab::DataBuilder::WikiPage.build(wiki_page, user, 'create') }
|
||||
|
||||
it "calls Microsoft Teams API" do
|
||||
chat_service.execute(wiki_page_sample_data)
|
||||
|
|
|
@ -76,8 +76,7 @@ RSpec.shared_examples 'slack or mattermost notifications' do
|
|||
message: "user created page: Awesome wiki_page"
|
||||
}
|
||||
|
||||
wiki_page_service = WikiPages::CreateService.new(project, user, opts)
|
||||
@wiki_page = wiki_page_service.execute
|
||||
@wiki_page = create(:wiki_page, wiki: project.wiki, attrs: opts)
|
||||
@wiki_page_sample_data = Gitlab::DataBuilder::WikiPage.build(@wiki_page, user, 'create')
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue