Merge pull request puppetlabs#153 from lucywyman/release-1.3.0

(maint) Release prep for 1.3.0

Author: lucywyman

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v1.3.0](https://github.com/puppetlabs/puppetlabs-service/tree/v1.3.0) (2020-07-24)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-service/compare/v1.2.0...v1.3.0)
+
+### Added
+
+- (maint) Add enable and disable action for \*nix Bolt task [\#151](https://github.com/puppetlabs/puppetlabs-service/pull/151) 
+
 ## [v1.2.0](https://github.com/puppetlabs/puppetlabs-service/tree/v1.2.0) (2019-12-12)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-service/compare/v1.1.0...v1.2.0)

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-service",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "author": "puppetlabs",
   "summary": "Tasks that manipulate a service",
   "license": "Apache-2.0",

spec/acceptance/linux_spec.rb

@@ -1,8 +1,6 @@
 # run a test task
 require 'spec_helper_acceptance'
 
-sysv = (os[:family] == 'redhat' && os[:release].to_i == 6) ||
-       (os[:family] == 'debian' && os[:release].to_i == 14)
 describe 'linux service task', unless: os[:family] == 'windows' do
   package_to_use = if os[:family] == 'redhat'
                      'httpd'
@@ -38,23 +36,7 @@
     it "restart #{package_to_use}" do
       result = run_bolt_task('service::linux', 'action' => 'restart', 'name' => package_to_use)
       expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('status' => %r{ActiveState=active|running})
-    end
-  end
-
-  describe 'enable action', unless: sysv do
-    it "enable #{package_to_use}" do
-      result = run_bolt_task('service::linux', 'action' => 'enable', 'name' => package_to_use)
-      expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('enabled' => 'enabled')
-    end
-  end
-
-  describe 'disable action', unless: sysv do
-    it "disable #{package_to_use}" do
-      result = run_bolt_task('service::linux', 'action' => 'disable', 'name' => package_to_use)
-      expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('enabled' => 'disabled')
+      expect(result['result']).to include('status' => %r{ActiveState=active|running|reloading})
     end
   end
 
@@ -86,7 +68,7 @@
       params = { 'action' => 'restart', 'name' => package_to_use }
       result = run_bolt_task('service', params, inventory_file: temp_inventory_file)
       expect(result.exit_code).to eq(0)
-      expect(result['result']).to include('status' => %r{ActiveState=active|running})
+      expect(result['result']).to include('status' => %r{ActiveState=active|running|reloading})
     end
   end
 end