(CAT-2050) Fix service task specs

(CAT-2050) Fix rubocop
puppetlabs · Sep 25, 2024 · c171b4b · c171b4b
1 parent 13a29e8
commit c171b4b
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/spec/acceptance/init_spec.rb b/spec/acceptance/init_spec.rb
@@ -24,39 +24,39 @@
     it 'enable/status a service' do
       result = run_bolt_task('service', 'action' => 'enable', 'name' => package_to_use)
       expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('status' => %r{in_sync|enabled})
+      expect(result['result']).to include('status' => %r{in_sync|enabled|active})
 
       result = run_bolt_task('service', 'action' => 'status', 'name' => package_to_use)
       expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('enabled' => 'true')
+      expect(result['result']).to include('enabled' => %r{true|enabled}i)
     end
   end
 
   describe 'restart action' do
     it 'restart/status a service' do
       result = run_bolt_task('service', 'action' => 'restart', 'name' => package_to_use)
       expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('status' => %r{restarted}i)
+      expect(result['result']).to include('status' => %r{restarted|active}i)
 
       result = run_bolt_task('service', 'action' => 'status', 'name' => package_to_use)
       expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('status' => %r{running|Started}i)
-      expect(result['result']).to include('enabled' => %r{true|manual|automatic|delayed}i)
+      expect(result['result']).to include('status' => %r{running|Started|active}i)
+      expect(result['result']).to include('enabled' => %r{true|manual|automatic|delayed|enabled}i)
     end
   end
 
   describe 'stop action' do
     it 'stop/status a service' do
       result = run_bolt_task('service', 'action' => 'stop', 'name' => package_to_use)
       expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('status' => %r{in_sync|stopped}i)
+      expect(result['result']).to include('status' => %r{in_sync|stopped|inactive}i)
 
       # Debian can give incorrect status
       unless ['debian', 'ubuntu'].include?(os[:family])
         result = run_bolt_task('service', 'action' => 'status', 'name' => package_to_use)
         expect(result.exit_code).to eq(0)
-        expect(result['result']).to include('status' => %r{stopped}i)
-        expect(result['result']).to include('enabled' => %r{true|manual|automatic|delayed}i)
+        expect(result['result']).to include('status' => %r{stopped|inactive}i)
+        expect(result['result']).to include('enabled' => %r{true|manual|automatic|delayed|enabled}i)
       end
     end
   end
@@ -65,14 +65,14 @@
     it 'start/status a service' do
       result = run_bolt_task('service', 'action' => 'start', 'name' => package_to_use)
       expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('status' => %r{in_sync|started}i)
+      expect(result['result']).to include('status' => %r{in_sync|started|active}i)
 
       # Debian can give incorrect status
       unless ['debian', 'ubuntu'].include?(os[:family])
         result = run_bolt_task('service', 'action' => 'status', 'name' => package_to_use)
         expect(result.exit_code).to eq(0)
-        expect(result['result']).to include('status' => %r{running|Started}i)
-        expect(result['result']).to include('enabled' => %r{true|manual|automatic|delayed}i)
+        expect(result['result']).to include('status' => %r{running|Started|active}i)
+        expect(result['result']).to include('enabled' => %r{true|manual|automatic|delayed|enabled}i)
       end
     end
   end
@@ -81,11 +81,11 @@
     it 'disable/status a service' do
       result = run_bolt_task('service', 'action' => 'disable', 'name' => package_to_use)
       expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('status' => 'disabled')
+      expect(result['result']).to include('status' => %r{disabled|active})
 
       result = run_bolt_task('service', 'action' => 'status', 'name' => package_to_use)
       expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('enabled' => 'false')
+      expect(result['result']).to include('enabled' => %r{false|disabled})
     end
   end
 end