Merge branch 'port-refactor-wiki-page-services' into 'master'

Refactor specs for WikiPage services

See merge request !11862

spec/services/wiki_pages/create_service_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe WikiPages::CreateService, services: true do
   let(:project) { create(:empty_project) }
   let(:user) { create(:user) }
+
   let(:opts) do
     {
       title: 'Title',
@@ -10,27 +11,28 @@ describe WikiPages::CreateService, services: true do
       format: 'markdown'
     }
   end
-  let(:service) { described_class.new(project, user, opts) }
 
-  describe '#execute' do
-    context "valid params" do
+  subject(:service) { described_class.new(project, user, opts) }
+
   before do
-        allow(service).to receive(:execute_hooks)
-        project.add_master(user)
+    project.add_developer(user)
   end
 
-      subject { service.execute }
+  describe '#execute' do
+    it 'creates wiki page with valid attributes' do
+      page = service.execute
 
-      it 'creates a valid wiki page' do
-        is_expected.to be_valid
-        expect(subject.title).to eq(opts[:title])
-        expect(subject.content).to eq(opts[:content])
-        expect(subject.format).to eq(opts[:format].to_sym)
+      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 'executes webhooks' do
-        expect(service).to have_received(:execute_hooks).once.with(subject, 'create')
-      end
+      expect(service).to receive(:execute_hooks).once
+        .with(instance_of(WikiPage), 'create')
+
+      service.execute
     end
   end
 end

spec/services/wiki_pages/destroy_service_spec.rb

@@ -3,19 +3,20 @@ require 'spec_helper'
 describe WikiPages::DestroyService, services: true do
   let(:project) { create(:empty_project) }
   let(:user) { create(:user) }
-  let(:wiki_page) { create(:wiki_page) }
-  let(:service) { described_class.new(project, user) }
+  let(:page) { create(:wiki_page) }
+
+  subject(:service) { described_class.new(project, user) }
 
-  describe '#execute' do
   before do
-      allow(service).to receive(:execute_hooks)
-      project.add_master(user)
+    project.add_developer(user)
   end
 
+  describe '#execute' 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

spec/services/wiki_pages/update_service_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe WikiPages::UpdateService, services: true do
   let(:project) { create(:empty_project) }
   let(:user) { create(:user) }
-  let(:wiki_page) { create(:wiki_page) }
+  let(:page) { create(:wiki_page) }
+
   let(:opts) do
     {
       content: 'New content for wiki page',
@@ -11,27 +12,28 @@ describe WikiPages::UpdateService, services: true do
       message: 'New wiki message'
     }
   end
-  let(:service) { described_class.new(project, user, opts) }
 
-  describe '#execute' do
-    context "valid params" do
+  subject(:service) { described_class.new(project, user, opts) }
+
   before do
-        allow(service).to receive(:execute_hooks)
-        project.add_master(user)
+    project.add_developer(user)
   end
 
-      subject { service.execute(wiki_page) }
-
+  describe '#execute' do
     it 'updates the wiki page' do
-        is_expected.to be_valid
-        expect(subject.content).to eq(opts[:content])
-        expect(subject.format).to eq(opts[:format].to_sym)
-        expect(subject.message).to eq(opts[:message])
+      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)
     end
 
     it 'executes webhooks' do
-        expect(service).to have_received(:execute_hooks).once.with(subject, 'update')
-      end
+      expect(service).to receive(:execute_hooks).once
+        .with(instance_of(WikiPage), 'update')
+
+      service.execute(page)
     end
   end
 end