Merge branch '31138-improve-test-settings-for-services-in-empty-projects' into 'master'

improves test settings for chat notification services for empty projects

Closes #31138

See merge request !10886

1 files changed, 28 insertions, 23 deletions

diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index 4d0181ca297..134882648b9 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -11,43 +11,48 @@ describe Service, models: true do
   end
 
   describe "Test Button" do
-    before do
-      @service = Service.new
-    end
+    describe '#can_test?' do
+      let(:service) { create(:service, project: project) }
 
-    describe "Testable" do
-      let(:project) { create(:project, :repository) }
+      context 'when repository is not empty' do
+        let(:project) { create(:project, :repository) }
 
-      before do
-        allow(@service).to receive(:project).and_return(project)
-        @testable = @service.can_test?
+        it 'returns true' do
+          expect(service.can_test?).to be true
+        end
       end
 
-      describe '#can_test?' do
-        it { expect(@testable).to eq(true) }
+      context 'when repository is empty' do
+        let(:project) { create(:empty_project) }
+
+        it 'returns true' do
+          expect(service.can_test?).to be true
+        end
       end
+    end
 
-      describe '#test' do
-        let(:data) { 'test' }
+    describe '#test' do
+      let(:data) { 'test' }
+      let(:service) { create(:service, project: project) }
+
+      context 'when repository is not empty' do
+        let(:project) { create(:project, :repository) }
 
         it 'test runs execute' do
-          expect(@service).to receive(:execute).with(data)
+          expect(service).to receive(:execute).with(data)
 
-          @service.test(data)
+          service.test(data)
         end
       end
-    end
 
-    describe "With commits" do
-      let(:project) { create(:project, :repository) }
+      context 'when repository is empty' do
+        let(:project) { create(:empty_project) }
 
-      before do
-        allow(@service).to receive(:project).and_return(project)
-        @testable = @service.can_test?
-      end
+        it 'test runs execute' do
+          expect(service).to receive(:execute).with(data)
 
-      describe '#can_test?' do
-        it { expect(@testable).to eq(true) }
+          service.test(data)
+        end
       end
     end
   end