Extract EE specific files/lines for spec/services/wiki_pages
We have the following files containing EE specific code. We should move them to ee/
spec/services/wiki_pages/create_service_spec.rb
diff --git a/spec/services/wiki_pages/create_service_spec.rb b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/spec/services/wiki_pages/create_service_spec.rb
index 259f445247e..b4e5b98e658 100644
--- a/spec/services/wiki_pages/create_service_spec.rb
+++ b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/spec/services/wiki_pages/create_service_spec.rb
@@ -15,7 +15,7 @@ describe WikiPages::CreateService do
subject(:service) { described_class.new(project, user, opts) }
before do
- project.add_developer(user)
+ project.add_maintainer(user)
end
describe '#execute' do
@@ -23,14 +23,11 @@ describe WikiPages::CreateService do
page = 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)
+ expect(page).to have_attributes(title: opts[:title], content: opts[:content], format: opts[:format].to_sym)
end
it 'executes webhooks' do
- expect(service).to receive(:execute_hooks).once
- .with(instance_of(WikiPage), 'create')
+ expect(service).to receive(:execute_hooks).once.with(instance_of(WikiPage), 'create')
service.execute
end
spec/services/wiki_pages/destroy_service_spec.rb
diff --git a/spec/services/wiki_pages/destroy_service_spec.rb b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/spec/services/wiki_pages/destroy_service_spec.rb
index 2938126914b..1425aef73f0 100644
--- a/spec/services/wiki_pages/destroy_service_spec.rb
+++ b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/spec/services/wiki_pages/destroy_service_spec.rb
@@ -8,13 +8,12 @@ describe WikiPages::DestroyService do
subject(:service) { described_class.new(project, user) }
before do
- project.add_developer(user)
+ project.add_maintainer(user)
end
describe '#execute' do
it 'executes webhooks' do
- expect(service).to receive(:execute_hooks).once
- .with(instance_of(WikiPage), 'delete')
+ expect(service).to receive(:execute_hooks).once.with(instance_of(WikiPage), 'delete')
service.execute(page)
end
spec/services/wiki_pages/update_service_spec.rb
diff --git a/spec/services/wiki_pages/update_service_spec.rb b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/spec/services/wiki_pages/update_service_spec.rb
index 2399db7d3d4..df25bbdbfbe 100644
--- a/spec/services/wiki_pages/update_service_spec.rb
+++ b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/spec/services/wiki_pages/update_service_spec.rb
@@ -17,7 +17,7 @@ describe WikiPages::UpdateService do
subject(:service) { described_class.new(project, user, opts) }
before do
- project.add_developer(user)
+ project.add_maintainer(user)
end
describe '#execute' do
@@ -25,15 +25,13 @@ describe WikiPages::UpdateService do
updated_page = service.execute(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)
+ expect(updated_page).to have_attributes(message: opts[:message], content: opts[:content], format: opts[:format].to_sym)
+
expect(updated_page.title).to eq(opts[:title])
end
it 'executes webhooks' do
- expect(service).to receive(:execute_hooks).once
- .with(instance_of(WikiPage), 'update')
+ expect(service).to receive(:execute_hooks).once.with(instance_of(WikiPage), 'update')
service.execute(page)
end
Edited by Yorick Peterse