Merge branch 'port-refactor-wiki-page-services' into 'master'
Refactor specs for WikiPage services See merge request !11862
This commit is contained in:
commit
aea03d7cdf
3 changed files with 47 additions and 42 deletions
|
@ -3,6 +3,7 @@ require 'spec_helper'
|
||||||
describe WikiPages::CreateService, services: true do
|
describe WikiPages::CreateService, services: true do
|
||||||
let(:project) { create(:empty_project) }
|
let(:project) { create(:empty_project) }
|
||||||
let(:user) { create(:user) }
|
let(:user) { create(:user) }
|
||||||
|
|
||||||
let(:opts) do
|
let(:opts) do
|
||||||
{
|
{
|
||||||
title: 'Title',
|
title: 'Title',
|
||||||
|
@ -10,27 +11,28 @@ describe WikiPages::CreateService, services: true do
|
||||||
format: 'markdown'
|
format: 'markdown'
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
let(:service) { described_class.new(project, user, opts) }
|
|
||||||
|
subject(:service) { described_class.new(project, user, opts) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
project.add_developer(user)
|
||||||
|
end
|
||||||
|
|
||||||
describe '#execute' do
|
describe '#execute' do
|
||||||
context "valid params" do
|
it 'creates wiki page with valid attributes' do
|
||||||
before do
|
page = service.execute
|
||||||
allow(service).to receive(:execute_hooks)
|
|
||||||
project.add_master(user)
|
|
||||||
end
|
|
||||||
|
|
||||||
subject { service.execute }
|
expect(page).to be_valid
|
||||||
|
expect(page.title).to eq(opts[:title])
|
||||||
|
expect(page.content).to eq(opts[:content])
|
||||||
|
expect(page.format).to eq(opts[:format].to_sym)
|
||||||
|
end
|
||||||
|
|
||||||
it 'creates a valid wiki page' do
|
it 'executes webhooks' do
|
||||||
is_expected.to be_valid
|
expect(service).to receive(:execute_hooks).once
|
||||||
expect(subject.title).to eq(opts[:title])
|
.with(instance_of(WikiPage), 'create')
|
||||||
expect(subject.content).to eq(opts[:content])
|
|
||||||
expect(subject.format).to eq(opts[:format].to_sym)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'executes webhooks' do
|
service.execute
|
||||||
expect(service).to have_received(:execute_hooks).once.with(subject, 'create')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,19 +3,20 @@ require 'spec_helper'
|
||||||
describe WikiPages::DestroyService, services: true do
|
describe WikiPages::DestroyService, services: true do
|
||||||
let(:project) { create(:empty_project) }
|
let(:project) { create(:empty_project) }
|
||||||
let(:user) { create(:user) }
|
let(:user) { create(:user) }
|
||||||
let(:wiki_page) { create(:wiki_page) }
|
let(:page) { create(:wiki_page) }
|
||||||
let(:service) { described_class.new(project, user) }
|
|
||||||
|
subject(:service) { described_class.new(project, user) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
project.add_developer(user)
|
||||||
|
end
|
||||||
|
|
||||||
describe '#execute' do
|
describe '#execute' do
|
||||||
before do
|
|
||||||
allow(service).to receive(:execute_hooks)
|
|
||||||
project.add_master(user)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'executes webhooks' do
|
it 'executes webhooks' do
|
||||||
service.execute(wiki_page)
|
expect(service).to receive(:execute_hooks).once
|
||||||
|
.with(instance_of(WikiPage), 'delete')
|
||||||
|
|
||||||
expect(service).to have_received(:execute_hooks).once.with(wiki_page, 'delete')
|
service.execute(page)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,7 +3,8 @@ require 'spec_helper'
|
||||||
describe WikiPages::UpdateService, services: true do
|
describe WikiPages::UpdateService, services: true do
|
||||||
let(:project) { create(:empty_project) }
|
let(:project) { create(:empty_project) }
|
||||||
let(:user) { create(:user) }
|
let(:user) { create(:user) }
|
||||||
let(:wiki_page) { create(:wiki_page) }
|
let(:page) { create(:wiki_page) }
|
||||||
|
|
||||||
let(:opts) do
|
let(:opts) do
|
||||||
{
|
{
|
||||||
content: 'New content for wiki page',
|
content: 'New content for wiki page',
|
||||||
|
@ -11,27 +12,28 @@ describe WikiPages::UpdateService, services: true do
|
||||||
message: 'New wiki message'
|
message: 'New wiki message'
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
let(:service) { described_class.new(project, user, opts) }
|
|
||||||
|
subject(:service) { described_class.new(project, user, opts) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
project.add_developer(user)
|
||||||
|
end
|
||||||
|
|
||||||
describe '#execute' do
|
describe '#execute' do
|
||||||
context "valid params" do
|
it 'updates the wiki page' do
|
||||||
before do
|
updated_page = service.execute(page)
|
||||||
allow(service).to receive(:execute_hooks)
|
|
||||||
project.add_master(user)
|
|
||||||
end
|
|
||||||
|
|
||||||
subject { service.execute(wiki_page) }
|
expect(updated_page).to be_valid
|
||||||
|
expect(updated_page.message).to eq(opts[:message])
|
||||||
|
expect(updated_page.content).to eq(opts[:content])
|
||||||
|
expect(updated_page.format).to eq(opts[:format].to_sym)
|
||||||
|
end
|
||||||
|
|
||||||
it 'updates the wiki page' do
|
it 'executes webhooks' do
|
||||||
is_expected.to be_valid
|
expect(service).to receive(:execute_hooks).once
|
||||||
expect(subject.content).to eq(opts[:content])
|
.with(instance_of(WikiPage), 'update')
|
||||||
expect(subject.format).to eq(opts[:format].to_sym)
|
|
||||||
expect(subject.message).to eq(opts[:message])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'executes webhooks' do
|
service.execute(page)
|
||||||
expect(service).to have_received(:execute_hooks).once.with(subject, 'update')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue