puppet 6.0.7-x64-mingw32 → 6.0.8-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (632) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +4 -8
  4. data/lib/puppet/application/device.rb +99 -83
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/configurer.rb +5 -4
  7. data/lib/puppet/defaults.rb +31 -11
  8. data/lib/puppet/indirector/request.rb +26 -15
  9. data/lib/puppet/network/http/connection.rb +15 -7
  10. data/lib/puppet/transaction/event_manager.rb +1 -5
  11. data/lib/puppet/type/file/source.rb +0 -1
  12. data/lib/puppet/util/connection.rb +15 -6
  13. data/lib/puppet/util/http_proxy.rb +3 -2
  14. data/lib/puppet/version.rb +1 -1
  15. data/locales/puppet.pot +99 -40
  16. data/man/man5/puppet.conf.5 +8 -8
  17. data/man/man8/puppet-agent.8 +1 -1
  18. data/man/man8/puppet-apply.8 +1 -1
  19. data/man/man8/puppet-catalog.8 +1 -1
  20. data/man/man8/puppet-config.8 +1 -1
  21. data/man/man8/puppet-describe.8 +1 -1
  22. data/man/man8/puppet-device.8 +1 -1
  23. data/man/man8/puppet-doc.8 +1 -1
  24. data/man/man8/puppet-epp.8 +1 -1
  25. data/man/man8/puppet-facts.8 +1 -1
  26. data/man/man8/puppet-filebucket.8 +1 -1
  27. data/man/man8/puppet-generate.8 +1 -1
  28. data/man/man8/puppet-help.8 +1 -1
  29. data/man/man8/puppet-key.8 +1 -1
  30. data/man/man8/puppet-lookup.8 +1 -1
  31. data/man/man8/puppet-man.8 +1 -1
  32. data/man/man8/puppet-module.8 +1 -1
  33. data/man/man8/puppet-node.8 +1 -1
  34. data/man/man8/puppet-parser.8 +1 -1
  35. data/man/man8/puppet-plugin.8 +1 -1
  36. data/man/man8/puppet-report.8 +1 -1
  37. data/man/man8/puppet-resource.8 +1 -1
  38. data/man/man8/puppet-script.8 +1 -1
  39. data/man/man8/puppet-ssl.8 +1 -1
  40. data/man/man8/puppet-status.8 +1 -1
  41. data/man/man8/puppet.8 +2 -2
  42. data/spec/integration/agent/logging_spec.rb +5 -7
  43. data/spec/integration/application/apply_spec.rb +18 -16
  44. data/spec/integration/application/doc_spec.rb +1 -2
  45. data/spec/integration/application/lookup_spec.rb +5 -5
  46. data/spec/integration/configurer_spec.rb +5 -6
  47. data/spec/integration/defaults_spec.rb +5 -6
  48. data/spec/integration/directory_environments_spec.rb +1 -1
  49. data/spec/integration/faces/config_spec.rb +3 -4
  50. data/spec/integration/faces/documentation_spec.rb +0 -1
  51. data/spec/integration/faces/plugin_spec.rb +1 -1
  52. data/spec/integration/file_bucket/file_spec.rb +2 -4
  53. data/spec/integration/file_serving/content_spec.rb +0 -1
  54. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  55. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  56. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  57. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  58. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  59. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  60. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  61. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  62. data/spec/integration/network/authconfig_spec.rb +23 -24
  63. data/spec/integration/network/formats_spec.rb +0 -1
  64. data/spec/integration/node/environment_spec.rb +0 -1
  65. data/spec/integration/node/facts_spec.rb +9 -10
  66. data/spec/integration/node_spec.rb +6 -7
  67. data/spec/integration/parser/catalog_spec.rb +1 -5
  68. data/spec/integration/parser/collection_spec.rb +1 -2
  69. data/spec/integration/parser/compiler_spec.rb +6 -6
  70. data/spec/integration/parser/scope_spec.rb +1 -1
  71. data/spec/integration/parser/undef_param_spec.rb +1 -1
  72. data/spec/integration/provider/service/init_spec.rb +4 -5
  73. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  74. data/spec/integration/provider/service/windows_spec.rb +1 -2
  75. data/spec/integration/reference/providers_spec.rb +1 -2
  76. data/spec/integration/reports_spec.rb +1 -2
  77. data/spec/integration/resource/catalog_spec.rb +14 -17
  78. data/spec/integration/resource/type_collection_spec.rb +4 -5
  79. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  80. data/spec/integration/ssl/host_spec.rb +1 -2
  81. data/spec/integration/ssl/key_spec.rb +0 -1
  82. data/spec/integration/test/test_helper_spec.rb +0 -1
  83. data/spec/integration/transaction/report_spec.rb +6 -11
  84. data/spec/integration/transaction_spec.rb +18 -19
  85. data/spec/integration/type/exec_spec.rb +0 -1
  86. data/spec/integration/type/file_spec.rb +13 -14
  87. data/spec/integration/type/package_spec.rb +19 -23
  88. data/spec/integration/type/tidy_spec.rb +1 -2
  89. data/spec/integration/type_spec.rb +0 -1
  90. data/spec/integration/util/autoload_spec.rb +1 -2
  91. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  92. data/spec/integration/util/settings_spec.rb +0 -1
  93. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  94. data/spec/integration/util/windows/principal_spec.rb +0 -1
  95. data/spec/integration/util/windows/process_spec.rb +4 -6
  96. data/spec/integration/util/windows/registry_spec.rb +41 -51
  97. data/spec/integration/util/windows/security_spec.rb +2 -4
  98. data/spec/integration/util/windows/user_spec.rb +18 -20
  99. data/spec/integration/util_spec.rb +4 -7
  100. data/spec/lib/puppet_spec/compiler.rb +1 -1
  101. data/spec/lib/puppet_spec/files.rb +0 -1
  102. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  103. data/spec/lib/puppet_spec/scope.rb +1 -2
  104. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  105. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  106. data/spec/shared_behaviours/file_serving.rb +6 -8
  107. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  108. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  109. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  110. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  111. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  112. data/spec/spec_helper.rb +10 -1
  113. data/spec/unit/agent/disabler_spec.rb +4 -5
  114. data/spec/unit/agent/locker_spec.rb +12 -13
  115. data/spec/unit/agent_spec.rb +80 -85
  116. data/spec/unit/application/agent_spec.rb +88 -93
  117. data/spec/unit/application/apply_spec.rb +82 -83
  118. data/spec/unit/application/config_spec.rb +0 -1
  119. data/spec/unit/application/describe_spec.rb +6 -7
  120. data/spec/unit/application/device_spec.rb +395 -419
  121. data/spec/unit/application/doc_spec.rb +44 -46
  122. data/spec/unit/application/face_base_spec.rb +61 -62
  123. data/spec/unit/application/facts_spec.rb +3 -4
  124. data/spec/unit/application/filebucket_spec.rb +66 -74
  125. data/spec/unit/application/indirection_base_spec.rb +8 -6
  126. data/spec/unit/application/lookup_spec.rb +26 -26
  127. data/spec/unit/application/resource_spec.rb +42 -48
  128. data/spec/unit/application/ssl_spec.rb +3 -3
  129. data/spec/unit/application_spec.rb +82 -92
  130. data/spec/unit/capability_spec.rb +6 -6
  131. data/spec/unit/certificate_factory_spec.rb +3 -5
  132. data/spec/unit/configurer/downloader_spec.rb +20 -21
  133. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  134. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  135. data/spec/unit/configurer_spec.rb +189 -192
  136. data/spec/unit/confine/exists_spec.rb +17 -15
  137. data/spec/unit/confine/false_spec.rb +5 -6
  138. data/spec/unit/confine/feature_spec.rb +7 -5
  139. data/spec/unit/confine/true_spec.rb +5 -6
  140. data/spec/unit/confine/variable_spec.rb +14 -15
  141. data/spec/unit/confine_collection_spec.rb +28 -29
  142. data/spec/unit/confine_spec.rb +13 -14
  143. data/spec/unit/confiner_spec.rb +10 -11
  144. data/spec/unit/context/trusted_information_spec.rb +1 -1
  145. data/spec/unit/daemon_spec.rb +35 -36
  146. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  147. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  148. data/spec/unit/datatypes_spec.rb +3 -4
  149. data/spec/unit/defaults_spec.rb +18 -13
  150. data/spec/unit/environments_spec.rb +7 -7
  151. data/spec/unit/etc_spec.rb +30 -32
  152. data/spec/unit/external/pson_spec.rb +0 -1
  153. data/spec/unit/face/catalog_spec.rb +0 -1
  154. data/spec/unit/face/config_spec.rb +31 -35
  155. data/spec/unit/face/epp_face_spec.rb +3 -4
  156. data/spec/unit/face/facts_spec.rb +5 -6
  157. data/spec/unit/face/generate_spec.rb +4 -5
  158. data/spec/unit/face/help_spec.rb +7 -8
  159. data/spec/unit/face/key_spec.rb +0 -1
  160. data/spec/unit/face/man_spec.rb +1 -2
  161. data/spec/unit/face/module/install_spec.rb +3 -5
  162. data/spec/unit/face/module/list_spec.rb +2 -12
  163. data/spec/unit/face/module/search_spec.rb +11 -9
  164. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  165. data/spec/unit/face/node_spec.rb +23 -24
  166. data/spec/unit/face/parser_spec.rb +3 -3
  167. data/spec/unit/face/plugin_spec.rb +36 -9
  168. data/spec/unit/face/status_spec.rb +0 -1
  169. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  170. data/spec/unit/file_bucket/file_spec.rb +0 -2
  171. data/spec/unit/file_serving/base_spec.rb +14 -15
  172. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  173. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  174. data/spec/unit/file_serving/content_spec.rb +10 -11
  175. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  176. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  177. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  178. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  179. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  180. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  181. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  182. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  183. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  184. data/spec/unit/file_serving/mount_spec.rb +0 -1
  185. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  186. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  187. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  188. data/spec/unit/file_system_spec.rb +2 -2
  189. data/spec/unit/forge/errors_spec.rb +1 -1
  190. data/spec/unit/forge/forge_spec.rb +13 -14
  191. data/spec/unit/forge/module_release_spec.rb +18 -18
  192. data/spec/unit/forge/repository_spec.rb +29 -30
  193. data/spec/unit/forge_spec.rb +15 -11
  194. data/spec/unit/functions/binary_file_spec.rb +3 -3
  195. data/spec/unit/functions/contain_spec.rb +0 -2
  196. data/spec/unit/functions/defined_spec.rb +0 -1
  197. data/spec/unit/functions/epp_spec.rb +2 -2
  198. data/spec/unit/functions/find_file_spec.rb +7 -7
  199. data/spec/unit/functions/include_spec.rb +0 -4
  200. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  201. data/spec/unit/functions/lookup_spec.rb +1 -2
  202. data/spec/unit/functions/module_directory_spec.rb +12 -12
  203. data/spec/unit/functions/require_spec.rb +0 -3
  204. data/spec/unit/functions/shared.rb +5 -8
  205. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  206. data/spec/unit/functions4_spec.rb +9 -10
  207. data/spec/unit/gettext/config_spec.rb +4 -4
  208. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  209. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  210. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  211. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  212. data/spec/unit/hiera_puppet_spec.rb +20 -20
  213. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  214. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  215. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  216. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  217. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  218. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  219. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  220. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  221. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  222. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  223. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  224. data/spec/unit/indirector/envelope_spec.rb +1 -2
  225. data/spec/unit/indirector/exec_spec.rb +4 -5
  226. data/spec/unit/indirector/face_spec.rb +9 -9
  227. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  228. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  229. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  230. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  231. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  232. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  233. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  234. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  235. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  236. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  237. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  238. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  239. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  240. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  241. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  242. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  243. data/spec/unit/indirector/file_server_spec.rb +87 -87
  244. data/spec/unit/indirector/indirection_spec.rb +242 -226
  245. data/spec/unit/indirector/json_spec.rb +7 -9
  246. data/spec/unit/indirector/key/file_spec.rb +21 -22
  247. data/spec/unit/indirector/memory_spec.rb +6 -7
  248. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  249. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  250. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  251. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  252. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  253. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  254. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  255. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  256. data/spec/unit/indirector/none_spec.rb +5 -5
  257. data/spec/unit/indirector/plain_spec.rb +7 -8
  258. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  259. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  260. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  261. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  262. data/spec/unit/indirector/request_spec.rb +11 -12
  263. data/spec/unit/indirector/resource/ral_spec.rb +46 -54
  264. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  265. data/spec/unit/indirector/rest_spec.rb +113 -110
  266. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  267. data/spec/unit/indirector/status/local_spec.rb +0 -1
  268. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  269. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  270. data/spec/unit/indirector/terminus_spec.rb +27 -27
  271. data/spec/unit/indirector/yaml_spec.rb +5 -6
  272. data/spec/unit/indirector_spec.rb +1 -2
  273. data/spec/unit/info_service_spec.rb +1 -1
  274. data/spec/unit/interface/action_builder_spec.rb +0 -1
  275. data/spec/unit/interface/action_manager_spec.rb +0 -1
  276. data/spec/unit/interface/action_spec.rb +2 -3
  277. data/spec/unit/interface/documentation_spec.rb +0 -1
  278. data/spec/unit/interface/face_collection_spec.rb +19 -12
  279. data/spec/unit/interface_spec.rb +3 -3
  280. data/spec/unit/man_spec.rb +3 -4
  281. data/spec/unit/module_spec.rb +46 -51
  282. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  283. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  284. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  285. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  286. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  287. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  288. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  289. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  290. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  291. data/spec/unit/module_tool/tar_spec.rb +12 -13
  292. data/spec/unit/module_tool_spec.rb +7 -12
  293. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  294. data/spec/unit/network/authconfig_spec.rb +17 -18
  295. data/spec/unit/network/authorization_spec.rb +4 -5
  296. data/spec/unit/network/authstore_spec.rb +0 -1
  297. data/spec/unit/network/format_handler_spec.rb +0 -1
  298. data/spec/unit/network/format_spec.rb +9 -10
  299. data/spec/unit/network/format_support_spec.rb +28 -29
  300. data/spec/unit/network/formats_spec.rb +4 -5
  301. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  302. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  303. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  304. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  305. data/spec/unit/network/http/api_spec.rb +0 -2
  306. data/spec/unit/network/http/compression_spec.rb +21 -22
  307. data/spec/unit/network/http/connection_spec.rb +41 -36
  308. data/spec/unit/network/http/factory_spec.rb +5 -6
  309. data/spec/unit/network/http/handler_spec.rb +9 -18
  310. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  311. data/spec/unit/network/http/pool_spec.rb +28 -29
  312. data/spec/unit/network/http/request_spec.rb +0 -2
  313. data/spec/unit/network/http/response_spec.rb +11 -13
  314. data/spec/unit/network/http/route_spec.rb +0 -1
  315. data/spec/unit/network/http/session_spec.rb +1 -2
  316. data/spec/unit/network/http/site_spec.rb +0 -1
  317. data/spec/unit/network/http_pool_spec.rb +18 -9
  318. data/spec/unit/network/http_spec.rb +0 -1
  319. data/spec/unit/network/resolver_spec.rb +25 -26
  320. data/spec/unit/network/rights_spec.rb +52 -53
  321. data/spec/unit/node/environment_spec.rb +14 -15
  322. data/spec/unit/node/facts_spec.rb +5 -7
  323. data/spec/unit/node_spec.rb +4 -10
  324. data/spec/unit/other/selinux_spec.rb +0 -1
  325. data/spec/unit/parameter/boolean_spec.rb +1 -2
  326. data/spec/unit/parameter/package_options_spec.rb +1 -2
  327. data/spec/unit/parameter/path_spec.rb +0 -1
  328. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  329. data/spec/unit/parameter/value_spec.rb +0 -1
  330. data/spec/unit/parameter_spec.rb +9 -9
  331. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  332. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  333. data/spec/unit/parser/compiler_spec.rb +84 -96
  334. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  335. data/spec/unit/parser/files_spec.rb +0 -1
  336. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  337. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  338. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  339. data/spec/unit/parser/functions/file_spec.rb +13 -14
  340. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  341. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  342. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  343. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  344. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  345. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  346. data/spec/unit/parser/functions/split_spec.rb +0 -1
  347. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  348. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  349. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  350. data/spec/unit/parser/functions/template_spec.rb +13 -13
  351. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  352. data/spec/unit/parser/functions_spec.rb +6 -7
  353. data/spec/unit/parser/relationship_spec.rb +0 -1
  354. data/spec/unit/parser/resource_spec.rb +42 -42
  355. data/spec/unit/parser/scope_spec.rb +39 -35
  356. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  357. data/spec/unit/parser/type_loader_spec.rb +17 -19
  358. data/spec/unit/pops/adaptable_spec.rb +0 -1
  359. data/spec/unit/pops/benchmark_spec.rb +0 -1
  360. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  361. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  362. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  363. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  364. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  365. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  366. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  367. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  368. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  371. data/spec/unit/pops/factory_spec.rb +3 -4
  372. data/spec/unit/pops/issues_spec.rb +19 -20
  373. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  374. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  375. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  376. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  377. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  378. data/spec/unit/pops/migration_spec.rb +3 -5
  379. data/spec/unit/pops/model/model_spec.rb +0 -1
  380. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  381. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  382. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  383. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  384. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  385. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  386. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  387. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  388. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  389. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  390. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  391. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  392. data/spec/unit/pops/pn_spec.rb +0 -1
  393. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  394. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  395. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  396. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  397. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  398. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  399. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  400. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  401. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  402. data/spec/unit/pops/visitor_spec.rb +0 -1
  403. data/spec/unit/property/boolean_spec.rb +1 -1
  404. data/spec/unit/property/ensure_spec.rb +0 -1
  405. data/spec/unit/property/keyvalue_spec.rb +32 -34
  406. data/spec/unit/property/list_spec.rb +26 -27
  407. data/spec/unit/property/ordered_list_spec.rb +10 -14
  408. data/spec/unit/property_spec.rb +42 -43
  409. data/spec/unit/provider/aix_object_spec.rb +47 -45
  410. data/spec/unit/provider/command_spec.rb +9 -9
  411. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  412. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  413. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  414. data/spec/unit/provider/exec_spec.rb +0 -1
  415. data/spec/unit/provider/file/posix_spec.rb +22 -24
  416. data/spec/unit/provider/file/windows_spec.rb +15 -17
  417. data/spec/unit/provider/group/aix_spec.rb +3 -2
  418. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  419. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  420. data/spec/unit/provider/group/pw_spec.rb +11 -11
  421. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  422. data/spec/unit/provider/ldap_spec.rb +61 -62
  423. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  424. data/spec/unit/provider/nameservice_spec.rb +38 -40
  425. data/spec/unit/provider/package/aix_spec.rb +15 -15
  426. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  427. data/spec/unit/provider/package/apt_spec.rb +44 -27
  428. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  429. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  430. data/spec/unit/provider/package/base_spec.rb +4 -4
  431. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  432. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  433. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  434. data/spec/unit/provider/package/gem_spec.rb +51 -43
  435. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  436. data/spec/unit/provider/package/macports_spec.rb +46 -42
  437. data/spec/unit/provider/package/nim_spec.rb +30 -39
  438. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  439. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  440. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  441. data/spec/unit/provider/package/pip_spec.rb +71 -72
  442. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  443. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  444. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  445. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  446. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  447. data/spec/unit/provider/package/portage_spec.rb +70 -74
  448. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  449. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  450. data/spec/unit/provider/package/sun_spec.rb +16 -18
  451. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  452. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  453. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  454. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  455. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  456. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  457. data/spec/unit/provider/package/windows_spec.rb +36 -32
  458. data/spec/unit/provider/package/yum_spec.rb +7 -7
  459. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  460. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  461. data/spec/unit/provider/service/base_spec.rb +4 -5
  462. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  463. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  464. data/spec/unit/provider/service/debian_spec.rb +38 -38
  465. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  466. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  467. data/spec/unit/provider/service/init_spec.rb +53 -52
  468. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  469. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  470. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  471. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  472. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  473. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  474. data/spec/unit/provider/service/runit_spec.rb +29 -27
  475. data/spec/unit/provider/service/smf_spec.rb +74 -66
  476. data/spec/unit/provider/service/src_spec.rb +46 -47
  477. data/spec/unit/provider/service/systemd_spec.rb +104 -113
  478. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  479. data/spec/unit/provider/service/windows_spec.rb +33 -41
  480. data/spec/unit/provider/user/aix_spec.rb +31 -31
  481. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  482. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  483. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  484. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  485. data/spec/unit/provider/user/pw_spec.rb +37 -35
  486. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  487. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  488. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  489. data/spec/unit/provider_spec.rb +35 -35
  490. data/spec/unit/puppet_pal_2pec.rb +4 -5
  491. data/spec/unit/puppet_pal_spec.rb +0 -1
  492. data/spec/unit/puppet_spec.rb +6 -7
  493. data/spec/unit/relationship_spec.rb +0 -1
  494. data/spec/unit/reports/http_spec.rb +21 -23
  495. data/spec/unit/reports/store_spec.rb +3 -4
  496. data/spec/unit/reports_spec.rb +12 -14
  497. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  498. data/spec/unit/resource/catalog_spec.rb +72 -68
  499. data/spec/unit/resource/status_spec.rb +6 -8
  500. data/spec/unit/resource/type_collection_spec.rb +17 -18
  501. data/spec/unit/resource/type_spec.rb +34 -35
  502. data/spec/unit/resource_spec.rb +36 -32
  503. data/spec/unit/rest/client_spec.rb +58 -27
  504. data/spec/unit/rest/route_spec.rb +5 -5
  505. data/spec/unit/scheduler/job_spec.rb +0 -1
  506. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  507. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  508. data/spec/unit/settings/array_setting_spec.rb +1 -1
  509. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  510. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  511. data/spec/unit/settings/config_file_spec.rb +0 -1
  512. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  513. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  514. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  515. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  516. data/spec/unit/settings/file_setting_spec.rb +44 -46
  517. data/spec/unit/settings/path_setting_spec.rb +1 -2
  518. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  519. data/spec/unit/settings/string_setting_spec.rb +14 -15
  520. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  521. data/spec/unit/settings/value_translator_spec.rb +0 -1
  522. data/spec/unit/settings_spec.rb +228 -235
  523. data/spec/unit/ssl/base_spec.rb +14 -15
  524. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  525. data/spec/unit/ssl/certificate_spec.rb +23 -25
  526. data/spec/unit/ssl/digest_spec.rb +0 -1
  527. data/spec/unit/ssl/host_spec.rb +166 -149
  528. data/spec/unit/ssl/key_spec.rb +30 -31
  529. data/spec/unit/ssl/validator_spec.rb +38 -39
  530. data/spec/unit/task_spec.rb +44 -45
  531. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  532. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  533. data/spec/unit/transaction/event_spec.rb +16 -15
  534. data/spec/unit/transaction/persistence_spec.rb +16 -17
  535. data/spec/unit/transaction/report_spec.rb +11 -12
  536. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  537. data/spec/unit/transaction_spec.rb +100 -101
  538. data/spec/unit/type/component_spec.rb +0 -1
  539. data/spec/unit/type/exec_spec.rb +60 -56
  540. data/spec/unit/type/file/checksum_spec.rb +9 -10
  541. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  542. data/spec/unit/type/file/content_spec.rb +58 -61
  543. data/spec/unit/type/file/ctime_spec.rb +0 -1
  544. data/spec/unit/type/file/ensure_spec.rb +12 -13
  545. data/spec/unit/type/file/group_spec.rb +5 -7
  546. data/spec/unit/type/file/mode_spec.rb +4 -6
  547. data/spec/unit/type/file/mtime_spec.rb +0 -1
  548. data/spec/unit/type/file/owner_spec.rb +6 -8
  549. data/spec/unit/type/file/selinux_spec.rb +17 -19
  550. data/spec/unit/type/file/source_spec.rb +104 -101
  551. data/spec/unit/type/file/type_spec.rb +0 -1
  552. data/spec/unit/type/file_spec.rb +195 -185
  553. data/spec/unit/type/filebucket_spec.rb +4 -5
  554. data/spec/unit/type/group_spec.rb +6 -8
  555. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  556. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  557. data/spec/unit/type/package_spec.rb +56 -57
  558. data/spec/unit/type/resources_spec.rb +72 -74
  559. data/spec/unit/type/schedule_spec.rb +24 -26
  560. data/spec/unit/type/service_spec.rb +48 -48
  561. data/spec/unit/type/stage_spec.rb +0 -1
  562. data/spec/unit/type/tidy_spec.rb +61 -62
  563. data/spec/unit/type/user_spec.rb +24 -25
  564. data/spec/unit/type/whit_spec.rb +0 -1
  565. data/spec/unit/type_spec.rb +55 -54
  566. data/spec/unit/util/at_fork_spec.rb +18 -19
  567. data/spec/unit/util/autoload_spec.rb +55 -56
  568. data/spec/unit/util/backups_spec.rb +34 -35
  569. data/spec/unit/util/character_encoding_spec.rb +5 -5
  570. data/spec/unit/util/checksums_spec.rb +38 -39
  571. data/spec/unit/util/colors_spec.rb +1 -2
  572. data/spec/unit/util/command_line_spec.rb +24 -25
  573. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  574. data/spec/unit/util/diff_spec.rb +7 -8
  575. data/spec/unit/util/errors_spec.rb +0 -1
  576. data/spec/unit/util/execution_spec.rb +185 -161
  577. data/spec/unit/util/execution_stub_spec.rb +0 -1
  578. data/spec/unit/util/feature_spec.rb +21 -14
  579. data/spec/unit/util/filetype_spec.rb +49 -49
  580. data/spec/unit/util/http_proxy_spec.rb +12 -12
  581. data/spec/unit/util/inifile_spec.rb +26 -31
  582. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  583. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  584. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  585. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  586. data/spec/unit/util/lockfile_spec.rb +0 -1
  587. data/spec/unit/util/log/destinations_spec.rb +30 -33
  588. data/spec/unit/util/log_spec.rb +35 -36
  589. data/spec/unit/util/logging_spec.rb +58 -72
  590. data/spec/unit/util/metric_spec.rb +0 -1
  591. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  592. data/spec/unit/util/multi_match_spec.rb +0 -1
  593. data/spec/unit/util/network_device/config_spec.rb +0 -1
  594. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  595. data/spec/unit/util/network_device_spec.rb +7 -9
  596. data/spec/unit/util/package_spec.rb +0 -1
  597. data/spec/unit/util/pidlock_spec.rb +21 -22
  598. data/spec/unit/util/plist_spec.rb +40 -33
  599. data/spec/unit/util/posix_spec.rb +54 -51
  600. data/spec/unit/util/rdoc_spec.rb +9 -10
  601. data/spec/unit/util/reference_spec.rb +0 -1
  602. data/spec/unit/util/resource_template_spec.rb +20 -20
  603. data/spec/unit/util/retry_action_spec.rb +7 -8
  604. data/spec/unit/util/rubygems_spec.rb +7 -8
  605. data/spec/unit/util/run_mode_spec.rb +3 -4
  606. data/spec/unit/util/selinux_spec.rb +79 -72
  607. data/spec/unit/util/splayer_spec.rb +8 -9
  608. data/spec/unit/util/ssl_spec.rb +0 -1
  609. data/spec/unit/util/storage_spec.rb +3 -4
  610. data/spec/unit/util/suidmanager_spec.rb +45 -54
  611. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  612. data/spec/unit/util/tag_set_spec.rb +0 -1
  613. data/spec/unit/util/tagging_spec.rb +0 -1
  614. data/spec/unit/util/terminal_spec.rb +9 -10
  615. data/spec/unit/util/user_attr_spec.rb +1 -2
  616. data/spec/unit/util/warnings_spec.rb +3 -4
  617. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  618. data/spec/unit/util/watcher_spec.rb +51 -21
  619. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  620. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  621. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  622. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  623. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  624. data/spec/unit/util/windows/file_spec.rb +0 -1
  625. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  626. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  627. data/spec/unit/util/windows/service_spec.rb +66 -68
  628. data/spec/unit/util/windows/sid_spec.rb +11 -13
  629. data/spec/unit/util/windows/string_spec.rb +0 -1
  630. data/spec/unit/util_spec.rb +55 -57
  631. data/spec/unit/version_spec.rb +6 -6
  632. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platform.jruby? do
@@ -23,13 +22,13 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
23
22
  end
24
23
 
25
24
  def lists_processes_as(output)
26
- Puppet::Util::Execution.stubs(:execpipe).with("/sbin/initctl list").yields(output)
27
- provider_class.stubs(:which).with("/sbin/initctl").returns("/sbin/initctl")
25
+ allow(Puppet::Util::Execution).to receive(:execpipe).with("/sbin/initctl list").and_yield(output)
26
+ allow(provider_class).to receive(:which).with("/sbin/initctl").and_return("/sbin/initctl")
28
27
  end
29
28
 
30
29
  it "should be the default provider on Ubuntu" do
31
- Facter.expects(:value).with(:operatingsystem).returns("Ubuntu")
32
- Facter.expects(:value).with(:operatingsystemmajrelease).returns("12.04")
30
+ expect(Facter).to receive(:value).with(:operatingsystem).and_return("Ubuntu")
31
+ expect(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("12.04")
33
32
  expect(provider_class.default?).to be_truthy
34
33
  end
35
34
 
@@ -48,9 +47,10 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
48
47
  end
49
48
 
50
49
  let(:initctl_version) { ['/sbin/initctl', 'version', '--quiet'] }
50
+
51
51
  before(:each) do
52
52
  # Stub out /sbin/initctl
53
- Puppet::Util.stubs(:which).with('/sbin/initctl').returns('/sbin/initctl')
53
+ allow(Puppet::Util).to receive(:which).with('/sbin/initctl').and_return('/sbin/initctl')
54
54
 
55
55
  # Both of our tests are asserting the confine :true block that shells out to
56
56
  # `initctl version --quiet`. Its expression is evaluated at provider load-time.
@@ -60,14 +60,14 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
60
60
  end
61
61
 
62
62
  it "should return true when the daemon is running" do
63
- Puppet::Util::Execution.expects(:execute).with(initctl_version, instance_of(Hash))
63
+ expect(Puppet::Util::Execution).to receive(:execute).with(initctl_version, instance_of(Hash))
64
64
  assert_upstart_daemon_existence_confine_is(true)
65
65
  end
66
66
 
67
67
  it "should return false when the daemon is not running" do
68
- Puppet::Util::Execution.expects(:execute)
68
+ expect(Puppet::Util::Execution).to receive(:execute)
69
69
  .with(initctl_version, instance_of(Hash))
70
- .raises(Puppet::ExecutionFailure, "initctl failed!")
70
+ .and_raise(Puppet::ExecutionFailure, "initctl failed!")
71
71
 
72
72
  assert_upstart_daemon_existence_confine_is(false)
73
73
  end
@@ -75,7 +75,7 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
75
75
 
76
76
  describe "excluding services" do
77
77
  it "ignores tty and serial on Redhat systems" do
78
- Facter.stubs(:value).with(:osfamily).returns('RedHat')
78
+ allow(Facter).to receive(:value).with(:osfamily).and_return('RedHat')
79
79
  expect(provider_class.excludes).to include 'serial'
80
80
  expect(provider_class.excludes).to include 'tty'
81
81
  end
@@ -96,7 +96,7 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
96
96
 
97
97
  it "should attach the job name for network interface security" do
98
98
  processes = "network-interface-security (network-interface/eth0)"
99
- provider_class.stubs(:execpipe).yields(processes)
99
+ allow(provider_class).to receive(:execpipe).and_yield(processes)
100
100
  expect(provider_class.instances.first.name).to eq("network-interface-security JOB=network-interface/eth0")
101
101
  end
102
102
 
@@ -108,16 +108,16 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
108
108
  processes += "\ncryptdisks-udev stop/waiting"
109
109
  processes += "\nstatd-mounting stop/waiting"
110
110
  processes += "\ngssd-mounting stop/waiting"
111
- provider_class.stubs(:execpipe).yields(processes)
111
+ allow(provider_class).to receive(:execpipe).and_yield(processes)
112
112
  expect(provider_class.instances).to be_empty
113
113
  end
114
114
  end
115
115
 
116
116
  describe "#search" do
117
117
  it "searches through paths to find a matching conf file" do
118
- File.stubs(:directory?).returns(true)
119
- Puppet::FileSystem.stubs(:exist?).returns(false)
120
- Puppet::FileSystem.expects(:exist?).with("/etc/init/foo-bar.conf").returns(true)
118
+ allow(File).to receive(:directory?).and_return(true)
119
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
120
+ expect(Puppet::FileSystem).to receive(:exist?).with("/etc/init/foo-bar.conf").and_return(true)
121
121
  resource = Puppet::Type.type(:service).new(:name => "foo-bar", :provider => :upstart)
122
122
  provider = provider_class.new(resource)
123
123
 
@@ -125,9 +125,9 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
125
125
  end
126
126
 
127
127
  it "searches for just the name of a compound named service" do
128
- File.stubs(:directory?).returns(true)
129
- Puppet::FileSystem.stubs(:exist?).returns(false)
130
- Puppet::FileSystem.expects(:exist?).with("/etc/init/network-interface.conf").returns(true)
128
+ allow(File).to receive(:directory?).and_return(true)
129
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
130
+ expect(Puppet::FileSystem).to receive(:exist?).with("/etc/init/network-interface.conf").and_return(true)
131
131
  resource = Puppet::Type.type(:service).new(:name => "network-interface INTERFACE=lo", :provider => :upstart)
132
132
  provider = provider_class.new(resource)
133
133
 
@@ -139,10 +139,10 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
139
139
  it "should use the default status command if none is specified" do
140
140
  resource = Puppet::Type.type(:service).new(:name => "foo", :provider => :upstart)
141
141
  provider = provider_class.new(resource)
142
- provider.stubs(:is_upstart?).returns(true)
142
+ allow(provider).to receive(:is_upstart?).and_return(true)
143
143
 
144
- provider.expects(:status_exec).with(["foo"]).returns("foo start/running, process 1000")
145
- Process::Status.any_instance.stubs(:exitstatus).returns(0)
144
+ expect(provider).to receive(:status_exec).with(["foo"]).and_return("foo start/running, process 1000")
145
+ allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(0)
146
146
  expect(provider.status).to eq(:running)
147
147
  end
148
148
 
@@ -150,33 +150,33 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
150
150
  it "should use the provided status command" do
151
151
  resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo')
152
152
  provider = provider_class.new(resource)
153
- provider.stubs(:is_upstart?).returns(true)
153
+ allow(provider).to receive(:is_upstart?).and_return(true)
154
154
 
155
- provider.expects(:status_exec).with(['foo']).never
156
- provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
157
- Process::Status.any_instance.stubs(:exitstatus).returns(0)
155
+ expect(provider).not_to receive(:status_exec).with(['foo'])
156
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
157
+ allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(0)
158
158
  provider.status
159
159
  end
160
160
 
161
161
  it "should return :stopped when the provided status command return non-zero" do
162
162
  resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo')
163
163
  provider = provider_class.new(resource)
164
- provider.stubs(:is_upstart?).returns(true)
164
+ allow(provider).to receive(:is_upstart?).and_return(true)
165
165
 
166
- provider.expects(:status_exec).with(['foo']).never
167
- provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
168
- $CHILD_STATUS.stubs(:exitstatus).returns 1
166
+ expect(provider).not_to receive(:status_exec).with(['foo'])
167
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
168
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(1)
169
169
  expect(provider.status).to eq(:stopped)
170
170
  end
171
171
 
172
172
  it "should return :running when the provided status command return zero" do
173
173
  resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo')
174
174
  provider = provider_class.new(resource)
175
- provider.stubs(:is_upstart?).returns(true)
175
+ allow(provider).to receive(:is_upstart?).and_return(true)
176
176
 
177
- provider.expects(:status_exec).with(['foo']).never
178
- provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
179
- $CHILD_STATUS.stubs(:exitstatus).returns 0
177
+ expect(provider).not_to receive(:status_exec).with(['foo'])
178
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
179
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
180
180
  expect(provider.status).to eq(:running)
181
181
  end
182
182
  end
@@ -185,20 +185,20 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
185
185
  it "should return :stopped if the pid can not be found" do
186
186
  resource = Puppet::Type.type(:service).new(:name => 'foo', :hasstatus => false, :provider => :upstart)
187
187
  provider = provider_class.new(resource)
188
- provider.stubs(:is_upstart?).returns(true)
188
+ allow(provider).to receive(:is_upstart?).and_return(true)
189
189
 
190
- provider.expects(:status_exec).with(['foo']).never
191
- provider.expects(:getpid).returns nil
190
+ expect(provider).not_to receive(:status_exec).with(['foo'])
191
+ expect(provider).to receive(:getpid).and_return(nil)
192
192
  expect(provider.status).to eq(:stopped)
193
193
  end
194
194
 
195
195
  it "should return :running if the pid can be found" do
196
196
  resource = Puppet::Type.type(:service).new(:name => 'foo', :hasstatus => false, :provider => :upstart)
197
197
  provider = provider_class.new(resource)
198
- provider.stubs(:is_upstart?).returns(true)
198
+ allow(provider).to receive(:is_upstart?).and_return(true)
199
199
 
200
- provider.expects(:status_exec).with(['foo']).never
201
- provider.expects(:getpid).returns 2706
200
+ expect(provider).not_to receive(:status_exec).with(['foo'])
201
+ expect(provider).to receive(:getpid).and_return(2706)
202
202
  expect(provider.status).to eq(:running)
203
203
  end
204
204
  end
@@ -207,33 +207,33 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
207
207
  it "should use the provided status command" do
208
208
  resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo')
209
209
  provider = provider_class.new(resource)
210
- provider.stubs(:is_upstart?).returns(true)
210
+ allow(provider).to receive(:is_upstart?).and_return(true)
211
211
 
212
- provider.expects(:status_exec).with(['foo']).never
213
- provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
214
- Process::Status.any_instance.stubs(:exitstatus).returns(0)
212
+ expect(provider).not_to receive(:status_exec).with(['foo'])
213
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
214
+ allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(0)
215
215
  provider.status
216
216
  end
217
217
 
218
218
  it "should return :stopped when the provided status command return non-zero" do
219
219
  resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo')
220
220
  provider = provider_class.new(resource)
221
- provider.stubs(:is_upstart?).returns(true)
221
+ allow(provider).to receive(:is_upstart?).and_return(true)
222
222
 
223
- provider.expects(:status_exec).with(['foo']).never
224
- provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
225
- $CHILD_STATUS.stubs(:exitstatus).returns 1
223
+ expect(provider).not_to receive(:status_exec).with(['foo'])
224
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
225
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(1)
226
226
  expect(provider.status).to eq(:stopped)
227
227
  end
228
228
 
229
229
  it "should return :running when the provided status command return zero" do
230
230
  resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo')
231
231
  provider = provider_class.new(resource)
232
- provider.stubs(:is_upstart?).returns(true)
232
+ allow(provider).to receive(:is_upstart?).and_return(true)
233
233
 
234
- provider.expects(:status_exec).with(['foo']).never
235
- provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
236
- $CHILD_STATUS.stubs(:exitstatus).returns 0
234
+ expect(provider).not_to receive(:status_exec).with(['foo'])
235
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
236
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
237
237
  expect(provider.status).to eq(:running)
238
238
  end
239
239
  end
@@ -242,20 +242,20 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
242
242
  it "should return :stopped if the pid can not be found" do
243
243
  resource = Puppet::Type.type(:service).new(:name => 'foo', :hasstatus => false, :provider => :upstart)
244
244
  provider = provider_class.new(resource)
245
- provider.stubs(:is_upstart?).returns(true)
245
+ allow(provider).to receive(:is_upstart?).and_return(true)
246
246
 
247
- provider.expects(:status_exec).with(['foo']).never
248
- provider.expects(:getpid).returns nil
247
+ expect(provider).not_to receive(:status_exec).with(['foo'])
248
+ expect(provider).to receive(:getpid).and_return(nil)
249
249
  expect(provider.status).to eq(:stopped)
250
250
  end
251
251
 
252
252
  it "should return :running if the pid can be found" do
253
253
  resource = Puppet::Type.type(:service).new(:name => 'foo', :hasstatus => false, :provider => :upstart)
254
254
  provider = provider_class.new(resource)
255
- provider.stubs(:is_upstart?).returns(true)
255
+ allow(provider).to receive(:is_upstart?).and_return(true)
256
256
 
257
- provider.expects(:status_exec).with(['foo']).never
258
- provider.expects(:getpid).returns 2706
257
+ expect(provider).not_to receive(:status_exec).with(['foo'])
258
+ expect(provider).to receive(:getpid).and_return(2706)
259
259
  expect(provider.status).to eq(:running)
260
260
  end
261
261
  end
@@ -263,10 +263,10 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
263
263
  it "should properly handle services with 'start' in their name" do
264
264
  resource = Puppet::Type.type(:service).new(:name => "foostartbar", :provider => :upstart)
265
265
  provider = provider_class.new(resource)
266
- provider.stubs(:is_upstart?).returns(true)
266
+ allow(provider).to receive(:is_upstart?).and_return(true)
267
267
 
268
- provider.expects(:status_exec).with(["foostartbar"]).returns("foostartbar stop/waiting")
269
- Process::Status.any_instance.stubs(:exitstatus).returns(0)
268
+ expect(provider).to receive(:status_exec).with(["foostartbar"]).and_return("foostartbar stop/waiting")
269
+ allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(0)
270
270
  expect(provider.status).to eq(:stopped)
271
271
  end
272
272
  end
@@ -282,13 +282,15 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
282
282
 
283
283
  describe "when upstart job" do
284
284
  before(:each) do
285
- provider.stubs(:is_upstart?).returns(true)
285
+ allow(provider).to receive(:is_upstart?).and_return(true)
286
286
  end
287
+
287
288
  ["start", "stop"].each do |action|
288
289
  it "should return the #{action}cmd of its parent provider" do
289
290
  expect(provider.send("#{action}cmd".to_sym)).to eq([provider.command(action.to_sym), resource.name])
290
291
  end
291
292
  end
293
+
292
294
  it "should return nil for the statuscmd" do
293
295
  expect(provider.statuscmd).to be_nil
294
296
  end
@@ -367,9 +369,9 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
367
369
 
368
370
  describe "Upstart version < 0.6.7" do
369
371
  before(:each) do
370
- provider.stubs(:is_upstart?).returns(true)
371
- provider.stubs(:upstart_version).returns("0.6.5")
372
- provider.stubs(:search).returns(init_script)
372
+ allow(provider).to receive(:is_upstart?).and_return(true)
373
+ allow(provider).to receive(:upstart_version).and_return("0.6.5")
374
+ allow(provider).to receive(:search).and_return(init_script)
373
375
  end
374
376
 
375
377
  [:enabled?,:enable,:disable].each do |enableable|
@@ -453,9 +455,9 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
453
455
 
454
456
  describe "Upstart version < 0.9.0" do
455
457
  before(:each) do
456
- provider.stubs(:is_upstart?).returns(true)
457
- provider.stubs(:upstart_version).returns("0.7.0")
458
- provider.stubs(:search).returns(init_script)
458
+ allow(provider).to receive(:is_upstart?).and_return(true)
459
+ allow(provider).to receive(:upstart_version).and_return("0.7.0")
460
+ allow(provider).to receive(:search).and_return(init_script)
459
461
  end
460
462
 
461
463
  [:enabled?,:enable,:disable].each do |enableable|
@@ -571,10 +573,10 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
571
573
 
572
574
  describe "Upstart version > 0.9.0" do
573
575
  before(:each) do
574
- provider.stubs(:is_upstart?).returns(true)
575
- provider.stubs(:upstart_version).returns("0.9.5")
576
- provider.stubs(:search).returns(init_script)
577
- provider.stubs(:overscript).returns(over_script)
576
+ allow(provider).to receive(:is_upstart?).and_return(true)
577
+ allow(provider).to receive(:upstart_version).and_return("0.9.5")
578
+ allow(provider).to receive(:search).and_return(init_script)
579
+ allow(provider).to receive(:overscript).and_return(over_script)
578
580
  end
579
581
 
580
582
  [:enabled?,:enable,:disable].each do |enableable|
@@ -672,6 +674,7 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
672
674
  expect(provider.enabled?).to eq(:false)
673
675
  end
674
676
  end
677
+
675
678
  describe "with override file" do
676
679
  it "should consider 'start on ...' to be disabled if there is manual in override file" do
677
680
  given_contents_of(init_script, enabled_content)
@@ -1,10 +1,4 @@
1
- #! /usr/bin/env ruby
2
- #
3
- # Unit testing for the Windows service Provider
4
- #
5
-
6
1
  require 'spec_helper'
7
-
8
2
  require 'win32/service' if Puppet::Util::Platform.windows?
9
3
 
10
4
  describe 'Puppet::Type::Service::Provider::Windows',
@@ -16,20 +10,20 @@ describe 'Puppet::Type::Service::Provider::Windows',
16
10
  let(:config) { Struct::ServiceConfigInfo.new }
17
11
  let(:status) { Struct::ServiceStatus.new }
18
12
  let(:service_util) { Puppet::Util::Windows::Service }
19
- let(:service_handle) { mock() }
13
+ let(:service_handle) { double() }
20
14
 
21
15
  before :each do
22
16
  # make sure we never actually execute anything (there are two execute methods)
23
- provider.class.expects(:execute).never
24
- provider.expects(:execute).never
17
+ allow(provider.class).to receive(:execute)
18
+ allow(provider).to receive(:execute)
25
19
 
26
- service_util.stubs(:exists?).with(resource[:name]).returns(true)
20
+ allow(service_util).to receive(:exists?).with(resource[:name]).and_return(true)
27
21
  end
28
22
 
29
23
  describe ".instances" do
30
24
  it "should enumerate all services" do
31
25
  list_of_services = {'snmptrap' => {}, 'svchost' => {}, 'sshd' => {}}
32
- service_util.expects(:services).returns(list_of_services)
26
+ expect(service_util).to receive(:services).and_return(list_of_services)
33
27
 
34
28
  expect(provider_class.instances.map(&:name)).to match_array(['snmptrap', 'svchost', 'sshd'])
35
29
  end
@@ -37,24 +31,24 @@ describe 'Puppet::Type::Service::Provider::Windows',
37
31
 
38
32
  describe "#start" do
39
33
  before(:each) do
40
- provider.stubs(:status).returns(:stopped)
34
+ allow(provider).to receive(:status).and_return(:stopped)
41
35
  end
42
36
 
43
37
  it "should resume a paused service" do
44
- provider.stubs(:status).returns(:paused)
45
- service_util.expects(:resume).with(name)
38
+ allow(provider).to receive(:status).and_return(:paused)
39
+ expect(service_util).to receive(:resume).with(name)
46
40
  provider.start
47
41
  end
48
42
 
49
43
  it "should start the service" do
50
- service_util.expects(:service_start_type).with(name).returns(:SERVICE_AUTO_START)
51
- service_util.expects(:start).with(name)
44
+ expect(service_util).to receive(:service_start_type).with(name).and_return(:SERVICE_AUTO_START)
45
+ expect(service_util).to receive(:start).with(name)
52
46
  provider.start
53
47
  end
54
48
 
55
49
  context "when the service is disabled" do
56
50
  before :each do
57
- service_util.expects(:service_start_type).with(name).returns(:SERVICE_DISABLED)
51
+ expect(service_util).to receive(:service_start_type).with(name).and_return(:SERVICE_DISABLED)
58
52
  end
59
53
 
60
54
  it "should refuse to start if not managing enable" do
@@ -63,16 +57,16 @@ describe 'Puppet::Type::Service::Provider::Windows',
63
57
 
64
58
  it "should enable if managing enable and enable is true" do
65
59
  resource[:enable] = :true
66
- service_util.expects(:start).with(name)
67
- service_util.expects(:set_startup_mode).with(name, :SERVICE_AUTO_START)
60
+ expect(service_util).to receive(:start).with(name)
61
+ expect(service_util).to receive(:set_startup_mode).with(name, :SERVICE_AUTO_START)
68
62
 
69
63
  provider.start
70
64
  end
71
65
 
72
66
  it "should manual start if managing enable and enable is false" do
73
67
  resource[:enable] = :false
74
- service_util.expects(:start).with(name)
75
- service_util.expects(:set_startup_mode).with(name, :SERVICE_DEMAND_START)
68
+ expect(service_util).to receive(:start).with(name)
69
+ expect(service_util).to receive(:set_startup_mode).with(name, :SERVICE_DEMAND_START)
76
70
 
77
71
  provider.start
78
72
  end
@@ -81,7 +75,7 @@ describe 'Puppet::Type::Service::Provider::Windows',
81
75
 
82
76
  describe "#stop" do
83
77
  it "should stop a running service" do
84
- service_util.expects(:stop).with(name)
78
+ expect(service_util).to receive(:stop).with(name)
85
79
 
86
80
  provider.stop
87
81
  end
@@ -89,7 +83,7 @@ describe 'Puppet::Type::Service::Provider::Windows',
89
83
 
90
84
  describe "#status" do
91
85
  it "should report a nonexistent service as stopped" do
92
- service_util.stubs(:exists?).with(resource[:name]).returns(false)
86
+ allow(service_util).to receive(:exists?).with(resource[:name]).and_return(false)
93
87
 
94
88
  expect(provider.status).to eql(:stopped)
95
89
  end
@@ -99,7 +93,7 @@ describe 'Puppet::Type::Service::Provider::Windows',
99
93
  :SERVICE_PAUSE_PENDING
100
94
  ].each do |state|
101
95
  it "should report a #{state} service as paused" do
102
- service_util.expects(:service_state).with(name).returns(state)
96
+ expect(service_util).to receive(:service_state).with(name).and_return(state)
103
97
  expect(provider.status).to eq(:paused)
104
98
  end
105
99
  end
@@ -109,7 +103,7 @@ describe 'Puppet::Type::Service::Provider::Windows',
109
103
  :SERVICE_STOP_PENDING
110
104
  ].each do |state|
111
105
  it "should report a #{state} service as stopped" do
112
- service_util.expects(:service_state).with(name).returns(state)
106
+ expect(service_util).to receive(:service_state).with(name).and_return(state)
113
107
  expect(provider.status).to eq(:stopped)
114
108
  end
115
109
  end
@@ -120,7 +114,7 @@ describe 'Puppet::Type::Service::Provider::Windows',
120
114
  :SERVICE_START_PENDING,
121
115
  ].each do |state|
122
116
  it "should report a #{state} service as running" do
123
- service_util.expects(:service_state).with(name).returns(state)
117
+ expect(service_util).to receive(:service_state).with(name).and_return(state)
124
118
 
125
119
  expect(provider.status).to eq(:running)
126
120
  end
@@ -131,16 +125,14 @@ describe 'Puppet::Type::Service::Provider::Windows',
131
125
  it "should use the supplied restart command if specified" do
132
126
  resource[:restart] = 'c:/bin/foo'
133
127
 
134
- provider.expects(:execute).never
135
- provider.expects(:execute).with(['c:/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
128
+ expect(provider).to receive(:execute).with(['c:/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
136
129
 
137
130
  provider.restart
138
131
  end
139
132
 
140
133
  it "should restart the service" do
141
- seq = sequence("restarting")
142
- provider.expects(:stop).in_sequence(seq)
143
- provider.expects(:start).in_sequence(seq)
134
+ expect(provider).to receive(:stop).ordered
135
+ expect(provider).to receive(:start).ordered
144
136
 
145
137
  provider.restart
146
138
  end
@@ -148,18 +140,18 @@ describe 'Puppet::Type::Service::Provider::Windows',
148
140
 
149
141
  describe "#enabled?" do
150
142
  it "should report a nonexistent service as false" do
151
- service_util.stubs(:exists?).with(resource[:name]).returns(false)
143
+ allow(service_util).to receive(:exists?).with(resource[:name]).and_return(false)
152
144
 
153
145
  expect(provider.enabled?).to eql(:false)
154
146
  end
155
147
 
156
148
  it "should report a service with a startup type of manual as manual" do
157
- service_util.expects(:service_start_type).with(name).returns(:SERVICE_DEMAND_START)
149
+ expect(service_util).to receive(:service_start_type).with(name).and_return(:SERVICE_DEMAND_START)
158
150
  expect(provider.enabled?).to eq(:manual)
159
151
  end
160
152
 
161
153
  it "should report a service with a startup type of disabled as false" do
162
- service_util.expects(:service_start_type).with(name).returns(:SERVICE_DISABLED)
154
+ expect(service_util).to receive(:service_start_type).with(name).and_return(:SERVICE_DISABLED)
163
155
  expect(provider.enabled?).to eq(:false)
164
156
  end
165
157
 
@@ -172,7 +164,7 @@ describe 'Puppet::Type::Service::Provider::Windows',
172
164
  :SERVICE_SYSTEM_START
173
165
  ].each do |start_type|
174
166
  it "should report a service with a startup type of '#{start_type}' as true" do
175
- service_util.expects(:service_start_type).with(name).returns(start_type)
167
+ expect(service_util).to receive(:service_start_type).with(name).and_return(start_type)
176
168
  expect(provider.enabled?).to eq(:true)
177
169
  end
178
170
  end
@@ -181,12 +173,12 @@ describe 'Puppet::Type::Service::Provider::Windows',
181
173
 
182
174
  describe "#enable" do
183
175
  it "should set service start type to Service_Auto_Start when enabled" do
184
- service_util.expects(:set_startup_mode).with(name, :SERVICE_AUTO_START)
176
+ expect(service_util).to receive(:set_startup_mode).with(name, :SERVICE_AUTO_START)
185
177
  provider.enable
186
178
  end
187
179
 
188
180
  it "raises an error if set_startup_mode fails" do
189
- service_util.expects(:set_startup_mode).with(name, :SERVICE_AUTO_START).raises(Puppet::Error.new('foobar'))
181
+ expect(service_util).to receive(:set_startup_mode).with(name, :SERVICE_AUTO_START).and_raise(Puppet::Error.new('foobar'))
190
182
 
191
183
  expect {
192
184
  provider.enable
@@ -196,12 +188,12 @@ describe 'Puppet::Type::Service::Provider::Windows',
196
188
 
197
189
  describe "#disable" do
198
190
  it "should set service start type to Service_Disabled when disabled" do
199
- service_util.expects(:set_startup_mode).with(name, :SERVICE_DISABLED)
191
+ expect(service_util).to receive(:set_startup_mode).with(name, :SERVICE_DISABLED)
200
192
  provider.disable
201
193
  end
202
194
 
203
195
  it "raises an error if set_startup_mode fails" do
204
- service_util.expects(:set_startup_mode).with(name, :SERVICE_DISABLED).raises(Puppet::Error.new('foobar'))
196
+ expect(service_util).to receive(:set_startup_mode).with(name, :SERVICE_DISABLED).and_raise(Puppet::Error.new('foobar'))
205
197
 
206
198
  expect {
207
199
  provider.disable
@@ -211,12 +203,12 @@ describe 'Puppet::Type::Service::Provider::Windows',
211
203
 
212
204
  describe "#manual_start" do
213
205
  it "should set service start type to Service_Demand_Start (manual) when manual" do
214
- service_util.expects(:set_startup_mode).with(name, :SERVICE_DEMAND_START)
206
+ expect(service_util).to receive(:set_startup_mode).with(name, :SERVICE_DEMAND_START)
215
207
  provider.manual_start
216
208
  end
217
209
 
218
210
  it "raises an error if set_startup_mode fails" do
219
- service_util.expects(:set_startup_mode).with(name, :SERVICE_DEMAND_START).raises(Puppet::Error.new('foobar'))
211
+ expect(service_util).to receive(:set_startup_mode).with(name, :SERVICE_DEMAND_START).and_raise(Puppet::Error.new('foobar'))
220
212
 
221
213
  expect {
222
214
  provider.manual_start