1 files changed, 19 insertions, 9 deletions

diff --git a/spec/services/ci/runners/unassign_runner_service_spec.rb b/spec/services/ci/runners/unassign_runner_service_spec.rb
index 3fb6925f4bd..cf710cf6893 100644
--- a/spec/services/ci/runners/unassign_runner_service_spec.rb
+++ b/spec/services/ci/runners/unassign_runner_service_spec.rb
@@ -3,21 +3,21 @@
 require 'spec_helper'
 
 RSpec.describe ::Ci::Runners::UnassignRunnerService, '#execute' do
-  subject(:service) { described_class.new(runner_project, user).execute }
-
-  let_it_be(:runner) { create(:ci_runner, :project, projects: [project]) }
   let_it_be(:project) { create(:project) }
+  let_it_be(:runner) { create(:ci_runner, :project, projects: [project]) }
 
   let(:runner_project) { runner.runner_projects.last }
 
+  subject(:execute) { described_class.new(runner_project, user).execute }
+
   context 'without user' do
     let(:user) { nil }
 
     it 'does not destroy runner_project', :aggregate_failures do
       expect(runner_project).not_to receive(:destroy)
-      expect { service }.not_to change { runner.runner_projects.count }.from(1)
+      expect { execute }.not_to change { runner.runner_projects.count }.from(1)
 
-      is_expected.to eq(false)
+      is_expected.to be_error
     end
   end
 
@@ -27,17 +27,27 @@ RSpec.describe ::Ci::Runners::UnassignRunnerService, '#execute' do
     it 'does not call destroy on runner_project' do
       expect(runner).not_to receive(:destroy)
 
-      service
+      is_expected.to be_error
     end
   end
 
   context 'with admin user', :enable_admin_mode do
     let(:user) { create_default(:user, :admin) }
 
-    it 'destroys runner_project' do
-      expect(runner_project).to receive(:destroy).once
+    context 'with destroy returning false' do
+      it 'returns error response' do
+        expect(runner_project).to receive(:destroy).once.and_return(false)
+
+        is_expected.to be_error
+      end
+    end
+
+    context 'with destroy returning true' do
+      it 'returns success response' do
+        expect(runner_project).to receive(:destroy).once.and_return(true)
 
-      service
+        is_expected.to be_success
+      end
     end
   end
 end