puppet 6.0.7-universal-darwin → 6.0.8-universal-darwin

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
  require 'puppet_spec/files'
4
3
 
@@ -31,60 +30,60 @@ describe Puppet::Provider::ParsedFile do
31
30
 
32
31
  describe "when generating a list of instances" do
33
32
  it "should return an instance for each record parsed from all of the registered targets" do
34
- provider.expects(:targets).returns %w{/one /two}
35
- provider.stubs(:skip_record?).returns false
33
+ expect(provider).to receive(:targets).and_return(%w{/one /two})
34
+ allow(provider).to receive(:skip_record?).and_return(false)
36
35
  one = [:uno1, :uno2]
37
36
  two = [:dos1, :dos2]
38
- provider.expects(:prefetch_target).with("/one").returns one
39
- provider.expects(:prefetch_target).with("/two").returns two
37
+ expect(provider).to receive(:prefetch_target).with("/one").and_return(one)
38
+ expect(provider).to receive(:prefetch_target).with("/two").and_return(two)
40
39
 
41
40
  results = []
42
41
  (one + two).each do |inst|
43
42
  results << inst.to_s + "_instance"
44
- provider.expects(:new).with(inst).returns(results[-1])
43
+ expect(provider).to receive(:new).with(inst).and_return(results[-1])
45
44
  end
46
45
 
47
46
  expect(provider.instances).to eq(results)
48
47
  end
49
48
 
50
49
  it "should ignore target when retrieve fails" do
51
- provider.expects(:targets).returns %w{/one /two /three}
52
- provider.stubs(:skip_record?).returns false
53
- provider.expects(:retrieve).with("/one").returns [
50
+ expect(provider).to receive(:targets).and_return(%w{/one /two /three})
51
+ allow(provider).to receive(:skip_record?).and_return(false)
52
+ expect(provider).to receive(:retrieve).with("/one").and_return([
54
53
  {:name => 'target1_record1'},
55
54
  {:name => 'target1_record2'}
56
- ]
57
- provider.expects(:retrieve).with("/two").raises Puppet::Util::FileType::FileReadError, "some error"
58
- provider.expects(:retrieve).with("/three").returns [
55
+ ])
56
+ expect(provider).to receive(:retrieve).with("/two").and_raise(Puppet::Util::FileType::FileReadError, "some error")
57
+ expect(provider).to receive(:retrieve).with("/three").and_return([
59
58
  {:name => 'target3_record1'},
60
59
  {:name => 'target3_record2'}
61
- ]
62
- Puppet.expects(:err).with('Could not prefetch parsedfile_type provider \'parsedfile_provider\' target \'/two\': some error. Treating as empty')
63
- provider.expects(:new).with(:name => 'target1_record1', :on_disk => true, :target => '/one', :ensure => :present).returns 'r1'
64
- provider.expects(:new).with(:name => 'target1_record2', :on_disk => true, :target => '/one', :ensure => :present).returns 'r2'
65
- provider.expects(:new).with(:name => 'target3_record1', :on_disk => true, :target => '/three', :ensure => :present).returns 'r3'
66
- provider.expects(:new).with(:name => 'target3_record2', :on_disk => true, :target => '/three', :ensure => :present).returns 'r4'
60
+ ])
61
+ expect(Puppet).to receive(:err).with('Could not prefetch parsedfile_type provider \'parsedfile_provider\' target \'/two\': some error. Treating as empty')
62
+ expect(provider).to receive(:new).with(:name => 'target1_record1', :on_disk => true, :target => '/one', :ensure => :present).and_return('r1')
63
+ expect(provider).to receive(:new).with(:name => 'target1_record2', :on_disk => true, :target => '/one', :ensure => :present).and_return('r2')
64
+ expect(provider).to receive(:new).with(:name => 'target3_record1', :on_disk => true, :target => '/three', :ensure => :present).and_return('r3')
65
+ expect(provider).to receive(:new).with(:name => 'target3_record2', :on_disk => true, :target => '/three', :ensure => :present).and_return('r4')
67
66
 
68
67
  expect(provider.instances).to eq(%w{r1 r2 r3 r4})
69
68
  end
70
69
 
71
70
  it "should skip specified records" do
72
- provider.expects(:targets).returns %w{/one}
73
- provider.expects(:skip_record?).with(:uno).returns false
74
- provider.expects(:skip_record?).with(:dos).returns true
71
+ expect(provider).to receive(:targets).and_return(%w{/one})
72
+ expect(provider).to receive(:skip_record?).with(:uno).and_return(false)
73
+ expect(provider).to receive(:skip_record?).with(:dos).and_return(true)
75
74
  one = [:uno, :dos]
76
- provider.expects(:prefetch_target).returns one
75
+ expect(provider).to receive(:prefetch_target).and_return(one)
77
76
 
78
- provider.expects(:new).with(:uno).returns "eh"
79
- provider.expects(:new).with(:dos).never
77
+ expect(provider).to receive(:new).with(:uno).and_return("eh")
78
+ expect(provider).not_to receive(:new).with(:dos)
80
79
 
81
80
  provider.instances
82
81
  end
83
82
  end
84
83
 
85
84
  describe "when matching resources to existing records" do
86
- let(:first_resource) { stub(:one, :name => :one) }
87
- let(:second_resource) { stub(:two, :name => :two) }
85
+ let(:first_resource) { double(:one, :name => :one) }
86
+ let(:second_resource) { double(:two, :name => :two) }
88
87
 
89
88
  let(:resources) {{:one => first_resource, :two => second_resource}}
90
89
 
@@ -102,41 +101,41 @@ describe Puppet::Provider::ParsedFile do
102
101
  describe "when flushing a file's records to disk" do
103
102
  before do
104
103
  # This way we start with some @records, like we would in real life.
105
- provider.stubs(:retrieve).returns []
104
+ allow(provider).to receive(:retrieve).and_return([])
106
105
  provider.default_target = "/foo/bar"
107
106
  provider.initvars
108
107
  provider.prefetch
109
108
 
110
109
  @filetype = Puppet::Util::FileType.filetype(:flat).new("/my/file")
111
- Puppet::Util::FileType.filetype(:flat).stubs(:new).with("/my/file",nil).returns @filetype
110
+ allow(Puppet::Util::FileType.filetype(:flat)).to receive(:new).with("/my/file").and_return(@filetype)
112
111
 
113
- @filetype.stubs(:write)
112
+ allow(@filetype).to receive(:write)
114
113
  end
115
114
 
116
115
  it "should back up the file being written if the filetype can be backed up" do
117
- @filetype.expects(:backup)
116
+ expect(@filetype).to receive(:backup)
118
117
 
119
118
  provider.flush_target("/my/file")
120
119
  end
121
120
 
122
121
  it "should not try to back up the file if the filetype cannot be backed up" do
123
122
  @filetype = Puppet::Util::FileType.filetype(:ram).new("/my/file")
124
- Puppet::Util::FileType.filetype(:flat).expects(:new).returns @filetype
123
+ expect(Puppet::Util::FileType.filetype(:flat)).to receive(:new).and_return(@filetype)
125
124
 
126
- @filetype.stubs(:write)
125
+ allow(@filetype).to receive(:write)
127
126
 
128
127
  provider.flush_target("/my/file")
129
128
  end
130
129
 
131
130
  it "should not back up the file more than once between calls to 'prefetch'" do
132
- @filetype.expects(:backup).once
131
+ expect(@filetype).to receive(:backup).once
133
132
 
134
133
  provider.flush_target("/my/file")
135
134
  provider.flush_target("/my/file")
136
135
  end
137
136
 
138
137
  it "should back the file up again once the file has been reread" do
139
- @filetype.expects(:backup).times(2)
138
+ expect(@filetype).to receive(:backup).twice
140
139
 
141
140
  provider.flush_target("/my/file")
142
141
  provider.prefetch
@@ -147,19 +146,19 @@ describe Puppet::Provider::ParsedFile do
147
146
  describe "when flushing multiple files" do
148
147
  describe "and an error is encountered" do
149
148
  it "the other file does not fail" do
150
- provider.stubs(:backup_target)
149
+ allow(provider).to receive(:backup_target)
151
150
 
152
151
  bad_file = 'broken'
153
152
  good_file = 'writable'
154
153
 
155
- bad_writer = mock 'bad'
156
- bad_writer.expects(:write).raises(Exception, "Failed to write to bad file")
154
+ bad_writer = double('bad')
155
+ expect(bad_writer).to receive(:write).and_raise(Exception, "Failed to write to bad file")
157
156
 
158
- good_writer = mock 'good'
159
- good_writer.expects(:write).returns(nil)
157
+ good_writer = double('good')
158
+ expect(good_writer).to receive(:write).and_return(nil)
160
159
 
161
- provider.stubs(:target_object).with(bad_file).returns(bad_writer)
162
- provider.stubs(:target_object).with(good_file).returns(good_writer)
160
+ allow(provider).to receive(:target_object).with(bad_file).and_return(bad_writer)
161
+ allow(provider).to receive(:target_object).with(good_file).and_return(good_writer)
163
162
 
164
163
  bad_resource = parsed_type.new(:name => 'one', :target => bad_file)
165
164
  good_resource = parsed_type.new(:name => 'two', :target => good_file)
@@ -190,8 +189,8 @@ describe "A very basic provider based on ParsedFile" do
190
189
  example_provider_class.initvars
191
190
  example_provider_class.prefetch
192
191
  # evade a race between multiple invocations of the header method
193
- example_provider_class.stubs(:header).
194
- returns("# HEADER As added by puppet.\n")
192
+ allow(example_provider_class).to receive(:header).
193
+ and_return("# HEADER As added by puppet.\n")
195
194
  example_provider_class
196
195
  end
197
196
 
@@ -208,7 +207,7 @@ describe "A very basic provider based on ParsedFile" do
208
207
  let(:input_records) { provider.parse(input_text) }
209
208
 
210
209
  before :each do
211
- provider.stubs(:native_header_regex).returns(regex)
210
+ allow(provider).to receive(:native_header_regex).and_return(regex)
212
211
  end
213
212
 
214
213
  it "should move the native header to the top" do
@@ -217,7 +216,7 @@ describe "A very basic provider based on ParsedFile" do
217
216
 
218
217
  context "and dropping native headers found in input" do
219
218
  before :each do
220
- provider.stubs(:drop_native_header).returns(true)
219
+ allow(provider).to receive(:drop_native_header).and_return(true)
221
220
  end
222
221
 
223
222
  it "should not include the native header in the output" do
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'rbconfig'
4
3
  require 'fileutils'
@@ -41,7 +40,7 @@ describe "base service provider" do
41
40
  return 'started'
42
41
  when status_command
43
42
  expect(options[:failonfail]).to eq(false)
44
- $CHILD_STATUS.expects(:exitstatus).at_least(1).returns(@running ? 0 : 1)
43
+ allow($CHILD_STATUS).to receive(:exitstatus) {@running ? 0 : 1}
45
44
  return @running ? 'running' : 'not running'
46
45
  when stop_command
47
46
  expect(options[:failonfail]).to eq(true)
@@ -55,7 +54,7 @@ describe "base service provider" do
55
54
 
56
55
  before :each do
57
56
  @running = false
58
- executor.expects(:execute).at_least(1).with { |command, options| execute_command(command, options) }
57
+ expect(executor).to receive(:execute).at_least(:once) { |command, options| execute_command(command, options) }
59
58
  end
60
59
 
61
60
  it "should invoke the start command if not running" do
@@ -101,10 +100,10 @@ describe "base service provider" do
101
100
  end
102
101
 
103
102
  it "retrieves a PID from the process table" do
104
- Facter.stubs(:value).with(:operatingsystem).returns("CentOS")
103
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return("CentOS")
105
104
  ps_output = File.binread(my_fixture("ps_ef.mixed_encoding")).force_encoding(Encoding::UTF_8)
106
105
 
107
- executor.expects(:execute).with("ps -ef").returns(ps_output)
106
+ expect(executor).to receive(:execute).with("ps -ef").and_return(ps_output)
108
107
 
109
108
  expect(subject.status).to eq(:running)
110
109
  end
@@ -5,12 +5,12 @@ describe 'Puppet::Type::Service::Provider::Bsd',
5
5
  let(:provider_class) { Puppet::Type.type(:service).provider(:bsd) }
6
6
 
7
7
  before :each do
8
- Puppet::Type.type(:service).stubs(:defaultprovider).returns provider_class
9
- Facter.stubs(:value).with(:operatingsystem).returns :netbsd
10
- Facter.stubs(:value).with(:osfamily).returns 'NetBSD'
11
- provider_class.stubs(:defpath).returns('/etc/rc.conf.d')
8
+ allow(Puppet::Type.type(:service)).to receive(:defaultprovider).and_return(provider_class)
9
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:netbsd)
10
+ allow(Facter).to receive(:value).with(:osfamily).and_return('NetBSD')
11
+ allow(provider_class).to receive(:defpath).and_return('/etc/rc.conf.d')
12
12
  @provider = provider_class.new
13
- @provider.stubs(:initscript)
13
+ allow(@provider).to receive(:initscript)
14
14
  end
15
15
 
16
16
  context "#instances" do
@@ -30,16 +30,16 @@ describe 'Puppet::Type::Service::Provider::Bsd',
30
30
 
31
31
  it "should remove a service file to disable" do
32
32
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
33
- Puppet::FileSystem.stubs(:exist?).with('/etc/rc.conf.d/sshd').returns(true)
34
- Puppet::FileSystem.expects(:exist?).with('/etc/rc.conf.d/sshd').returns(true)
35
- File.stubs(:delete).with('/etc/rc.conf.d/sshd')
33
+ allow(Puppet::FileSystem).to receive(:exist?).with('/etc/rc.conf.d/sshd').and_return(true)
34
+ expect(Puppet::FileSystem).to receive(:exist?).with('/etc/rc.conf.d/sshd').and_return(true)
35
+ allow(File).to receive(:delete).with('/etc/rc.conf.d/sshd')
36
36
  provider.disable
37
37
  end
38
38
 
39
39
  it "should not remove a service file if it doesn't exist" do
40
40
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
41
- File.stubs(:exist?).with('/etc/rc.conf.d/sshd').returns(false)
42
- Puppet::FileSystem.expects(:exist?).with('/etc/rc.conf.d/sshd').returns(false)
41
+ allow(File).to receive(:exist?).with('/etc/rc.conf.d/sshd').and_return(false)
42
+ expect(Puppet::FileSystem).to receive(:exist?).with('/etc/rc.conf.d/sshd').and_return(false)
43
43
  provider.disable
44
44
  end
45
45
  end
@@ -51,20 +51,20 @@ describe 'Puppet::Type::Service::Provider::Bsd',
51
51
 
52
52
  it "should set the proper contents to enable" do
53
53
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
54
- Dir.stubs(:mkdir).with('/etc/rc.conf.d')
55
- fh = stub 'fh'
56
- File.stubs(:open).with('/etc/rc.conf.d/sshd', File::WRONLY | File::APPEND | File::CREAT, 0644).yields(fh)
57
- fh.expects(:<<).with("sshd_enable=\"YES\"\n")
54
+ allow(Dir).to receive(:mkdir).with('/etc/rc.conf.d')
55
+ fh = double('fh')
56
+ allow(File).to receive(:open).with('/etc/rc.conf.d/sshd', File::WRONLY | File::APPEND | File::CREAT, 0644).and_yield(fh)
57
+ expect(fh).to receive(:<<).with("sshd_enable=\"YES\"\n")
58
58
  provider.enable
59
59
  end
60
60
 
61
61
  it "should set the proper contents to enable when disabled" do
62
62
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
63
- Dir.stubs(:mkdir).with('/etc/rc.conf.d')
64
- File.stubs(:read).with('/etc/rc.conf.d/sshd').returns("sshd_enable=\"NO\"\n")
65
- fh = stub 'fh'
66
- File.stubs(:open).with('/etc/rc.conf.d/sshd', File::WRONLY | File::APPEND | File::CREAT, 0644).yields(fh)
67
- fh.expects(:<<).with("sshd_enable=\"YES\"\n")
63
+ allow(Dir).to receive(:mkdir).with('/etc/rc.conf.d')
64
+ allow(File).to receive(:read).with('/etc/rc.conf.d/sshd').and_return("sshd_enable=\"NO\"\n")
65
+ fh = double('fh')
66
+ allow(File).to receive(:open).with('/etc/rc.conf.d/sshd', File::WRONLY | File::APPEND | File::CREAT, 0644).and_yield(fh)
67
+ expect(fh).to receive(:<<).with("sshd_enable=\"YES\"\n")
68
68
  provider.enable
69
69
  end
70
70
  end
@@ -76,15 +76,13 @@ describe 'Puppet::Type::Service::Provider::Bsd',
76
76
 
77
77
  it "should return false if the service file does not exist" do
78
78
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
79
- Puppet::FileSystem.stubs(:exist?).with('/etc/rc.conf.d/sshd').returns(false)
80
- # File.stubs(:read).with('/etc/rc.conf.d/sshd').returns("sshd_enable=\"NO\"\n")
79
+ allow(Puppet::FileSystem).to receive(:exist?).with('/etc/rc.conf.d/sshd').and_return(false)
81
80
  expect(provider.enabled?).to eq(:false)
82
81
  end
83
82
 
84
83
  it "should return true if the service file exists" do
85
84
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
86
- Puppet::FileSystem.stubs(:exist?).with('/etc/rc.conf.d/sshd').returns(true)
87
- # File.stubs(:read).with('/etc/rc.conf.d/sshd').returns("sshd_enable=\"YES\"\n")
85
+ allow(Puppet::FileSystem).to receive(:exist?).with('/etc/rc.conf.d/sshd').and_return(true)
88
86
  expect(provider.enabled?).to eq(:true)
89
87
  end
90
88
  end
@@ -96,14 +94,14 @@ describe 'Puppet::Type::Service::Provider::Bsd',
96
94
 
97
95
  it "should use the supplied start command if specified" do
98
96
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :start => '/bin/foo'))
99
- provider.expects(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
97
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
100
98
  provider.start
101
99
  end
102
100
 
103
101
  it "should start the serviced directly otherwise" do
104
102
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
105
- provider.expects(:execute).with(['/etc/rc.d/sshd', :onestart], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
106
- provider.expects(:search).with('sshd').returns('/etc/rc.d/sshd')
103
+ expect(provider).to receive(:execute).with(['/etc/rc.d/sshd', :onestart], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
104
+ expect(provider).to receive(:search).with('sshd').and_return('/etc/rc.d/sshd')
107
105
  provider.start
108
106
  end
109
107
  end
@@ -115,14 +113,14 @@ describe 'Puppet::Type::Service::Provider::Bsd',
115
113
 
116
114
  it "should use the supplied stop command if specified" do
117
115
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :stop => '/bin/foo'))
118
- provider.expects(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
116
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
119
117
  provider.stop
120
118
  end
121
119
 
122
120
  it "should stop the serviced directly otherwise" do
123
121
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
124
- provider.expects(:execute).with(['/etc/rc.d/sshd', :onestop], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
125
- provider.expects(:search).with('sshd').returns('/etc/rc.d/sshd')
122
+ expect(provider).to receive(:execute).with(['/etc/rc.d/sshd', :onestop], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
123
+ expect(provider).to receive(:search).with('sshd').and_return('/etc/rc.d/sshd')
126
124
  provider.stop
127
125
  end
128
126
  end
@@ -6,7 +6,7 @@ describe 'Puppet::Type::Service::Provider::Daemontools',
6
6
 
7
7
  before(:each) do
8
8
  # Create a mock resource
9
- @resource = stub 'resource'
9
+ @resource = double('resource')
10
10
 
11
11
  @provider = provider_class.new
12
12
  @servicedir = "/etc/service"
@@ -15,22 +15,22 @@ describe 'Puppet::Type::Service::Provider::Daemontools',
15
15
  @provider.class.defpath=@daemondir
16
16
 
17
17
  # A catch all; no parameters set
18
- @resource.stubs(:[]).returns(nil)
18
+ allow(@resource).to receive(:[]).and_return(nil)
19
19
 
20
20
  # But set name, source and path (because we won't run
21
21
  # the thing that will fetch the resource path from the provider)
22
- @resource.stubs(:[]).with(:name).returns "myservice"
23
- @resource.stubs(:[]).with(:ensure).returns :enabled
24
- @resource.stubs(:[]).with(:path).returns @daemondir
25
- @resource.stubs(:ref).returns "Service[myservice]"
22
+ allow(@resource).to receive(:[]).with(:name).and_return("myservice")
23
+ allow(@resource).to receive(:[]).with(:ensure).and_return(:enabled)
24
+ allow(@resource).to receive(:[]).with(:path).and_return(@daemondir)
25
+ allow(@resource).to receive(:ref).and_return("Service[myservice]")
26
26
 
27
27
  @provider.resource = @resource
28
28
 
29
- @provider.stubs(:command).with(:svc).returns "svc"
30
- @provider.stubs(:command).with(:svstat).returns "svstat"
29
+ allow(@provider).to receive(:command).with(:svc).and_return("svc")
30
+ allow(@provider).to receive(:command).with(:svstat).and_return("svstat")
31
31
 
32
- @provider.stubs(:svc)
33
- @provider.stubs(:svstat)
32
+ allow(@provider).to receive(:svc)
33
+ allow(@provider).to receive(:svstat)
34
34
  end
35
35
 
36
36
  it "should have a restart method" do
@@ -59,17 +59,17 @@ describe 'Puppet::Type::Service::Provider::Daemontools',
59
59
 
60
60
  context "when starting" do
61
61
  it "should use 'svc' to start the service" do
62
- @provider.stubs(:enabled?).returns :true
63
- @provider.expects(:svc).with("-u", "/etc/service/myservice")
62
+ allow(@provider).to receive(:enabled?).and_return(:true)
63
+ expect(@provider).to receive(:svc).with("-u", "/etc/service/myservice")
64
64
 
65
65
  @provider.start
66
66
  end
67
67
 
68
68
  it "should enable the service if it is not enabled" do
69
- @provider.stubs(:svc)
69
+ allow(@provider).to receive(:svc)
70
70
 
71
- @provider.expects(:enabled?).returns :false
72
- @provider.expects(:enable)
71
+ expect(@provider).to receive(:enabled?).and_return(:false)
72
+ expect(@provider).to receive(:enable)
73
73
 
74
74
  @provider.start
75
75
  end
@@ -77,8 +77,8 @@ describe 'Puppet::Type::Service::Provider::Daemontools',
77
77
 
78
78
  context "when stopping" do
79
79
  it "should use 'svc' to stop the service" do
80
- @provider.stubs(:disable)
81
- @provider.expects(:svc).with("-d", "/etc/service/myservice")
80
+ allow(@provider).to receive(:disable)
81
+ expect(@provider).to receive(:svc).with("-d", "/etc/service/myservice")
82
82
 
83
83
  @provider.stop
84
84
  end
@@ -86,7 +86,7 @@ describe 'Puppet::Type::Service::Provider::Daemontools',
86
86
 
87
87
  context "when restarting" do
88
88
  it "should use 'svc' to restart the service" do
89
- @provider.expects(:svc).with("-t", "/etc/service/myservice")
89
+ expect(@provider).to receive(:svc).with("-t", "/etc/service/myservice")
90
90
 
91
91
  @provider.restart
92
92
  end
@@ -96,8 +96,8 @@ describe 'Puppet::Type::Service::Provider::Daemontools',
96
96
  it "should create a symlink between daemon dir and service dir", :if => Puppet.features.manages_symlinks? do
97
97
  daemon_path = File.join(@daemondir, "myservice")
98
98
  service_path = File.join(@servicedir, "myservice")
99
- Puppet::FileSystem.expects(:symlink?).with(service_path).returns(false)
100
- Puppet::FileSystem.expects(:symlink).with(daemon_path, service_path).returns(0)
99
+ expect(Puppet::FileSystem).to receive(:symlink?).with(service_path).and_return(false)
100
+ expect(Puppet::FileSystem).to receive(:symlink).with(daemon_path, service_path).and_return(0)
101
101
 
102
102
  @provider.enable
103
103
  end
@@ -105,35 +105,35 @@ describe 'Puppet::Type::Service::Provider::Daemontools',
105
105
 
106
106
  context "when disabling" do
107
107
  it "should remove the symlink between daemon dir and service dir" do
108
- FileTest.stubs(:directory?).returns(false)
108
+ allow(FileTest).to receive(:directory?).and_return(false)
109
109
  path = File.join(@servicedir,"myservice")
110
- Puppet::FileSystem.expects(:symlink?).with(path).returns(true)
111
- Puppet::FileSystem.expects(:unlink).with(path)
112
- @provider.stubs(:texecute).returns("")
110
+ expect(Puppet::FileSystem).to receive(:symlink?).with(path).and_return(true)
111
+ expect(Puppet::FileSystem).to receive(:unlink).with(path)
112
+ allow(@provider).to receive(:texecute).and_return("")
113
113
  @provider.disable
114
114
  end
115
115
 
116
116
  it "should stop the service" do
117
- FileTest.stubs(:directory?).returns(false)
118
- Puppet::FileSystem.expects(:symlink?).returns(true)
119
- Puppet::FileSystem.stubs(:unlink)
120
- @provider.expects(:stop)
117
+ allow(FileTest).to receive(:directory?).and_return(false)
118
+ expect(Puppet::FileSystem).to receive(:symlink?).and_return(true)
119
+ allow(Puppet::FileSystem).to receive(:unlink)
120
+ expect(@provider).to receive(:stop)
121
121
  @provider.disable
122
122
  end
123
123
  end
124
124
 
125
125
  context "when checking if the service is enabled?" do
126
126
  it "should return true if it is running" do
127
- @provider.stubs(:status).returns(:running)
127
+ allow(@provider).to receive(:status).and_return(:running)
128
128
 
129
129
  expect(@provider.enabled?).to eq(:true)
130
130
  end
131
131
 
132
132
  [true, false].each do |t|
133
133
  it "should return #{t} if the symlink exists" do
134
- @provider.stubs(:status).returns(:stopped)
134
+ allow(@provider).to receive(:status).and_return(:stopped)
135
135
  path = File.join(@servicedir,"myservice")
136
- Puppet::FileSystem.expects(:symlink?).with(path).returns(t)
136
+ expect(Puppet::FileSystem).to receive(:symlink?).with(path).and_return(t)
137
137
 
138
138
  expect(@provider.enabled?).to eq("#{t}".to_sym)
139
139
  end
@@ -142,24 +142,24 @@ describe 'Puppet::Type::Service::Provider::Daemontools',
142
142
 
143
143
  context "when checking status" do
144
144
  it "should call the external command 'svstat /etc/service/myservice'" do
145
- @provider.expects(:svstat).with(File.join(@servicedir,"myservice"))
145
+ expect(@provider).to receive(:svstat).with(File.join(@servicedir,"myservice"))
146
146
  @provider.status
147
147
  end
148
148
  end
149
149
 
150
150
  context "when checking status" do
151
151
  it "and svstat fails, properly raise a Puppet::Error" do
152
- @provider.expects(:svstat).with(File.join(@servicedir,"myservice")).raises(Puppet::ExecutionFailure, "failure")
152
+ expect(@provider).to receive(:svstat).with(File.join(@servicedir,"myservice")).and_raise(Puppet::ExecutionFailure, "failure")
153
153
  expect { @provider.status }.to raise_error(Puppet::Error, 'Could not get status for service Service[myservice]: failure')
154
154
  end
155
155
 
156
156
  it "and svstat returns up, then return :running" do
157
- @provider.expects(:svstat).with(File.join(@servicedir,"myservice")).returns("/etc/service/myservice: up (pid 454) 954326 seconds")
157
+ expect(@provider).to receive(:svstat).with(File.join(@servicedir,"myservice")).and_return("/etc/service/myservice: up (pid 454) 954326 seconds")
158
158
  expect(@provider.status).to eq(:running)
159
159
  end
160
160
 
161
161
  it "and svstat returns not running, then return :stopped" do
162
- @provider.expects(:svstat).with(File.join(@servicedir,"myservice")).returns("/etc/service/myservice: supervise not running")
162
+ expect(@provider).to receive(:svstat).with(File.join(@servicedir,"myservice")).and_return("/etc/service/myservice: supervise not running")
163
163
  expect(@provider.status).to eq(:stopped)
164
164
  end
165
165
  end