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
@@ -17,7 +17,7 @@ describe Puppet::Transaction::AdditionalResourceGenerator do
17
17
  let(:loaders) { Puppet::Pops::Loaders.new(env) }
18
18
 
19
19
  before(:each) do
20
- Puppet::Parser::Compiler.any_instance.stubs(:loaders).returns(loaders)
20
+ allow_any_instance_of(Puppet::Parser::Compiler).to receive(:loaders).and_return(loaders)
21
21
  Puppet.push_context({:loaders => loaders, :current_environment => env})
22
22
  Puppet::Type.newtype(:generator) do
23
23
  include PuppetSpec::Compiler
@@ -313,12 +313,11 @@ describe Puppet::Transaction::AdditionalResourceGenerator do
313
313
  end
314
314
 
315
315
  it "sets resources_failed_to_generate to true if resource#eval_generate raises an exception" do
316
-
317
316
  catalog = compile_to_ral(<<-MANIFEST)
318
317
  notify { 'hello': }
319
318
  MANIFEST
320
319
 
321
- catalog.resource("Notify[hello]").stubs(:eval_generate).raises(RuntimeError)
320
+ allow(catalog.resource("Notify[hello]")).to receive(:eval_generate).and_raise(RuntimeError)
322
321
  relationship_graph = relationship_graph_for(catalog)
323
322
  generator = Puppet::Transaction::AdditionalResourceGenerator.new(catalog, relationship_graph, prioritizer)
324
323
  generator.eval_generate(catalog.resource("Notify[hello]"))
@@ -487,14 +486,13 @@ describe Puppet::Transaction::AdditionalResourceGenerator do
487
486
  end
488
487
 
489
488
  it "sets resources_failed_to_generate to true if resource#generate raises an exception" do
490
-
491
489
  catalog = compile_to_ral(<<-MANIFEST)
492
490
  user { 'foo':
493
491
  ensure => present,
494
492
  }
495
493
  MANIFEST
496
494
 
497
- catalog.resource("User[foo]").stubs(:generate).raises(RuntimeError)
495
+ allow(catalog.resource("User[foo]")).to receive(:generate).and_raise(RuntimeError)
498
496
  relationship_graph = relationship_graph_for(catalog)
499
497
  generator = Puppet::Transaction::AdditionalResourceGenerator.new(catalog, relationship_graph, prioritizer)
500
498
  generator.generate_additional_resources(catalog.resource("User[foo]"))
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/transaction/event_manager'
@@ -13,10 +12,10 @@ describe Puppet::Transaction::EventManager do
13
12
  end
14
13
 
15
14
  it "should delegate its relationship graph to the transaction" do
16
- transaction = stub 'transaction'
15
+ transaction = double('transaction')
17
16
  manager = Puppet::Transaction::EventManager.new(transaction)
18
17
 
19
- transaction.expects(:relationship_graph).returns "mygraph"
18
+ expect(transaction).to receive(:relationship_graph).and_return("mygraph")
20
19
 
21
20
  expect(manager.relationship_graph).to eq("mygraph")
22
21
  end
@@ -27,8 +26,8 @@ describe Puppet::Transaction::EventManager do
27
26
 
28
27
  @resource = Puppet::Type.type(:file).new :path => make_absolute("/my/file")
29
28
 
30
- @graph = stub 'graph', :matching_edges => [], :resource => @resource
31
- @manager.stubs(:relationship_graph).returns @graph
29
+ @graph = double('graph', :matching_edges => [], :resource => @resource)
30
+ allow(@manager).to receive(:relationship_graph).and_return(@graph)
32
31
 
33
32
  @event = Puppet::Transaction::Event.new(:name => :foo, :resource => @resource)
34
33
  end
@@ -42,63 +41,63 @@ describe Puppet::Transaction::EventManager do
42
41
  end
43
42
 
44
43
  it "should queue events for the target and callback of any matching edges" do
45
- edge1 = stub("edge1", :callback => :c1, :source => stub("s1"), :target => stub("t1", :c1 => nil))
46
- edge2 = stub("edge2", :callback => :c2, :source => stub("s2"), :target => stub("t2", :c2 => nil))
44
+ edge1 = double("edge1", :callback => :c1, :source => double("s1"), :target => double("t1", :c1 => nil))
45
+ edge2 = double("edge2", :callback => :c2, :source => double("s2"), :target => double("t2", :c2 => nil))
47
46
 
48
- @graph.expects(:matching_edges).with { |event, resource| event == @event }.returns [edge1, edge2]
47
+ expect(@graph).to receive(:matching_edges).with(@event, anything).and_return([edge1, edge2])
49
48
 
50
- @manager.expects(:queue_events_for_resource).with(@resource, edge1.target, edge1.callback, [@event])
51
- @manager.expects(:queue_events_for_resource).with(@resource, edge2.target, edge2.callback, [@event])
49
+ expect(@manager).to receive(:queue_events_for_resource).with(@resource, edge1.target, edge1.callback, [@event])
50
+ expect(@manager).to receive(:queue_events_for_resource).with(@resource, edge2.target, edge2.callback, [@event])
52
51
 
53
52
  @manager.queue_events(@resource, [@event])
54
53
  end
55
54
 
56
55
  it "should queue events for the changed resource if the resource is self-refreshing and not being deleted" do
57
- @graph.stubs(:matching_edges).returns []
56
+ allow(@graph).to receive(:matching_edges).and_return([])
58
57
 
59
- @resource.expects(:self_refresh?).returns true
60
- @resource.expects(:deleting?).returns false
61
- @manager.expects(:queue_events_for_resource).with(@resource, @resource, :refresh, [@event])
58
+ expect(@resource).to receive(:self_refresh?).and_return(true)
59
+ expect(@resource).to receive(:deleting?).and_return(false)
60
+ expect(@manager).to receive(:queue_events_for_resource).with(@resource, @resource, :refresh, [@event])
62
61
 
63
62
  @manager.queue_events(@resource, [@event])
64
63
  end
65
64
 
66
65
  it "should not queue events for the changed resource if the resource is not self-refreshing" do
67
- @graph.stubs(:matching_edges).returns []
66
+ allow(@graph).to receive(:matching_edges).and_return([])
68
67
 
69
- @resource.expects(:self_refresh?).returns false
70
- @resource.stubs(:deleting?).returns false
71
- @manager.expects(:queue_events_for_resource).never
68
+ expect(@resource).to receive(:self_refresh?).and_return(false)
69
+ allow(@resource).to receive(:deleting?).and_return(false)
70
+ expect(@manager).not_to receive(:queue_events_for_resource)
72
71
 
73
72
  @manager.queue_events(@resource, [@event])
74
73
  end
75
74
 
76
75
  it "should not queue events for the changed resource if the resource is being deleted" do
77
- @graph.stubs(:matching_edges).returns []
76
+ allow(@graph).to receive(:matching_edges).and_return([])
78
77
 
79
- @resource.expects(:self_refresh?).returns true
80
- @resource.expects(:deleting?).returns true
81
- @manager.expects(:queue_events_for_resource).never
78
+ expect(@resource).to receive(:self_refresh?).and_return(true)
79
+ expect(@resource).to receive(:deleting?).and_return(true)
80
+ expect(@manager).not_to receive(:queue_events_for_resource)
82
81
 
83
82
  @manager.queue_events(@resource, [@event])
84
83
  end
85
84
 
86
85
  it "should ignore edges that don't have a callback" do
87
- edge1 = stub("edge1", :callback => :nil, :source => stub("s1"), :target => stub("t1", :c1 => nil))
86
+ edge1 = double("edge1", :callback => :nil, :source => double("s1"), :target => double("t1", :c1 => nil))
88
87
 
89
- @graph.expects(:matching_edges).returns [edge1]
88
+ expect(@graph).to receive(:matching_edges).and_return([edge1])
90
89
 
91
- @manager.expects(:queue_events_for_resource).never
90
+ expect(@manager).not_to receive(:queue_events_for_resource)
92
91
 
93
92
  @manager.queue_events(@resource, [@event])
94
93
  end
95
94
 
96
95
  it "should ignore targets that don't respond to the callback" do
97
- edge1 = stub("edge1", :callback => :c1, :source => stub("s1"), :target => stub("t1"))
96
+ edge1 = double("edge1", :callback => :c1, :source => double("s1"), :target => double("t1"))
98
97
 
99
- @graph.expects(:matching_edges).returns [edge1]
98
+ expect(@graph).to receive(:matching_edges).and_return([edge1])
100
99
 
101
- @manager.expects(:queue_events_for_resource).never
100
+ expect(@manager).not_to receive(:queue_events_for_resource)
102
101
 
103
102
  @manager.queue_events(@resource, [@event])
104
103
  end
@@ -106,9 +105,9 @@ describe Puppet::Transaction::EventManager do
106
105
  it "should dequeue events for the changed resource if an event with invalidate_refreshes is processed" do
107
106
  @event2 = Puppet::Transaction::Event.new(:name => :foo, :resource => @resource, :invalidate_refreshes => true)
108
107
 
109
- @graph.stubs(:matching_edges).returns []
108
+ allow(@graph).to receive(:matching_edges).and_return([])
110
109
 
111
- @manager.expects(:dequeue_events_for_resource).with(@resource, :refresh)
110
+ expect(@manager).to receive(:dequeue_events_for_resource).with(@resource, :refresh)
112
111
 
113
112
  @manager.queue_events(@resource, [@event, @event2])
114
113
  end
@@ -116,28 +115,28 @@ describe Puppet::Transaction::EventManager do
116
115
 
117
116
  describe "when queueing events for a resource" do
118
117
  before do
119
- @transaction = stub 'transaction'
118
+ @transaction = double('transaction')
120
119
  @manager = Puppet::Transaction::EventManager.new(@transaction)
121
120
  end
122
121
 
123
122
  it "should do nothing if no events are queued" do
124
- @manager.queued_events(stub("target")) { |callback, events| raise "should never reach this" }
123
+ @manager.queued_events(double("target")) { |callback, events| raise "should never reach this" }
125
124
  end
126
125
 
127
126
  it "should yield the callback and events for each callback" do
128
- target = stub("target")
127
+ target = double("target")
129
128
 
130
129
  2.times do |i|
131
- @manager.queue_events_for_resource(stub("source", :info => nil), target, "callback#{i}", ["event#{i}"])
130
+ @manager.queue_events_for_resource(double("source", :info => nil), target, "callback#{i}", ["event#{i}"])
132
131
  end
133
132
 
134
133
  @manager.queued_events(target) { |callback, events| }
135
134
  end
136
135
 
137
136
  it "should use the source to log that it's scheduling a refresh of the target" do
138
- target = stub("target")
139
- source = stub 'source'
140
- source.expects(:info)
137
+ target = double("target")
138
+ source = double('source')
139
+ expect(source).to receive(:info)
141
140
 
142
141
  @manager.queue_events_for_resource(source, target, "callback", ["event"])
143
142
 
@@ -149,25 +148,25 @@ describe Puppet::Transaction::EventManager do
149
148
  before do
150
149
  @transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new, nil, nil)
151
150
  @manager = Puppet::Transaction::EventManager.new(@transaction)
152
- @manager.stubs(:queue_events)
151
+ allow(@manager).to receive(:queue_events)
153
152
 
154
153
  @resource = Puppet::Type.type(:file).new :path => make_absolute("/my/file")
155
154
  @event = Puppet::Transaction::Event.new(:name => :event, :resource => @resource)
156
155
  end
157
156
 
158
157
  it "should call the required callback once for each set of associated events" do
159
- @manager.expects(:queued_events).with(@resource).multiple_yields([:callback1, [@event]], [:callback2, [@event]])
158
+ expect(@manager).to receive(:queued_events).with(@resource).and_yield(:callback1, [@event]).and_yield(:callback2, [@event])
160
159
 
161
- @resource.expects(:callback1)
162
- @resource.expects(:callback2)
160
+ expect(@resource).to receive(:callback1)
161
+ expect(@resource).to receive(:callback2)
163
162
 
164
163
  @manager.process_events(@resource)
165
164
  end
166
165
 
167
166
  it "should set the 'restarted' state on the resource status" do
168
- @manager.expects(:queued_events).with(@resource).yields(:callback1, [@event])
167
+ expect(@manager).to receive(:queued_events).with(@resource).and_yield(:callback1, [@event])
169
168
 
170
- @resource.stubs(:callback1)
169
+ allow(@resource).to receive(:callback1)
171
170
 
172
171
  @manager.process_events(@resource)
173
172
 
@@ -175,9 +174,9 @@ describe Puppet::Transaction::EventManager do
175
174
  end
176
175
 
177
176
  it "should have an event on the resource status" do
178
- @manager.expects(:queued_events).with(@resource).yields(:callback1, [@event])
177
+ expect(@manager).to receive(:queued_events).with(@resource).and_yield(:callback1, [@event])
179
178
 
180
- @resource.stubs(:callback1)
179
+ allow(@resource).to receive(:callback1)
181
180
 
182
181
  @manager.process_events(@resource) #x
183
182
 
@@ -185,37 +184,37 @@ describe Puppet::Transaction::EventManager do
185
184
  end
186
185
 
187
186
  it "should queue a 'restarted' event generated by the resource" do
188
- @manager.expects(:queued_events).with(@resource).yields(:callback1, [@event])
187
+ expect(@manager).to receive(:queued_events).with(@resource).and_yield(:callback1, [@event])
189
188
 
190
- @resource.stubs(:callback1)
189
+ allow(@resource).to receive(:callback1)
191
190
 
192
- @resource.expects(:event).with(:message => "Triggered 'callback1' from 1 event", :status => 'success', :name => 'callback1')
193
- @resource.expects(:event).with(:name => :restarted, :status => "success").returns "myevent"
194
- @manager.expects(:queue_events).with(@resource, ["myevent"])
191
+ expect(@resource).to receive(:event).with(:message => "Triggered 'callback1' from 1 event", :status => 'success', :name => 'callback1')
192
+ expect(@resource).to receive(:event).with(:name => :restarted, :status => "success").and_return("myevent")
193
+ expect(@manager).to receive(:queue_events).with(@resource, ["myevent"])
195
194
 
196
195
  @manager.process_events(@resource)
197
196
  end
198
197
 
199
198
  it "should log that it restarted" do
200
- @manager.expects(:queued_events).with(@resource).yields(:callback1, [@event])
199
+ expect(@manager).to receive(:queued_events).with(@resource).and_yield(:callback1, [@event])
201
200
 
202
- @resource.stubs(:callback1)
201
+ allow(@resource).to receive(:callback1)
203
202
 
204
- @resource.expects(:notice).with { |msg| msg.include?("Triggered 'callback1'") }
203
+ expect(@resource).to receive(:notice).with(/Triggered 'callback1'/)
205
204
 
206
205
  @manager.process_events(@resource)
207
206
  end
208
207
 
209
208
  describe "and the events include a noop event and at least one non-noop event" do
210
209
  before do
211
- @event.stubs(:status).returns "noop"
210
+ allow(@event).to receive(:status).and_return("noop")
212
211
  @event2 = Puppet::Transaction::Event.new(:name => :event, :resource => @resource)
213
212
  @event2.status = "success"
214
- @manager.expects(:queued_events).with(@resource).yields(:callback1, [@event, @event2])
213
+ expect(@manager).to receive(:queued_events).with(@resource).and_yield(:callback1, [@event, @event2])
215
214
  end
216
215
 
217
216
  it "should call the callback" do
218
- @resource.expects(:callback1)
217
+ expect(@resource).to receive(:callback1)
219
218
 
220
219
  @manager.process_events(@resource)
221
220
  end
@@ -223,27 +222,27 @@ describe Puppet::Transaction::EventManager do
223
222
 
224
223
  describe "and the events are all noop events" do
225
224
  before do
226
- @event.stubs(:status).returns "noop"
227
- @resource.stubs(:event).returns(Puppet::Transaction::Event.new)
228
- @manager.expects(:queued_events).with(@resource).yields(:callback1, [@event])
225
+ allow(@event).to receive(:status).and_return("noop")
226
+ allow(@resource).to receive(:event).and_return(Puppet::Transaction::Event.new)
227
+ expect(@manager).to receive(:queued_events).with(@resource).and_yield(:callback1, [@event])
229
228
  end
230
229
 
231
230
  it "should log" do
232
- @resource.expects(:notice).with { |msg| msg.include?("Would have triggered 'callback1'") }
231
+ expect(@resource).to receive(:notice).with(/Would have triggered 'callback1'/)
233
232
 
234
233
  @manager.process_events(@resource)
235
234
  end
236
235
 
237
236
  it "should not call the callback" do
238
- @resource.expects(:callback1).never
237
+ expect(@resource).not_to receive(:callback1)
239
238
 
240
239
  @manager.process_events(@resource)
241
240
  end
242
241
 
243
242
  it "should queue a new noop event generated from the resource" do
244
243
  event = Puppet::Transaction::Event.new
245
- @resource.expects(:event).with(:status => "noop", :name => :noop_restart).returns event
246
- @manager.expects(:queue_events).with(@resource, [event])
244
+ expect(@resource).to receive(:event).with(:status => "noop", :name => :noop_restart).and_return(event)
245
+ expect(@manager).to receive(:queue_events).with(@resource, [event])
247
246
 
248
247
  @manager.process_events(@resource)
249
248
  end
@@ -251,46 +250,46 @@ describe Puppet::Transaction::EventManager do
251
250
 
252
251
  describe "and the resource has noop set to true" do
253
252
  before do
254
- @event.stubs(:status).returns "success"
255
- @resource.stubs(:event).returns(Puppet::Transaction::Event.new)
256
- @resource.stubs(:noop?).returns(true)
257
- @manager.expects(:queued_events).with(@resource).yields(:callback1, [@event])
253
+ allow(@event).to receive(:status).and_return("success")
254
+ allow(@resource).to receive(:event).and_return(Puppet::Transaction::Event.new)
255
+ allow(@resource).to receive(:noop?).and_return(true)
256
+ expect(@manager).to receive(:queued_events).with(@resource).and_yield(:callback1, [@event])
258
257
  end
259
258
 
260
259
  it "should log" do
261
- @resource.expects(:notice).with { |msg| msg.include?("Would have triggered 'callback1'") }
260
+ expect(@resource).to receive(:notice).with(/Would have triggered 'callback1'/)
262
261
 
263
262
  @manager.process_events(@resource)
264
263
  end
265
264
 
266
265
  it "should not call the callback" do
267
- @resource.expects(:callback1).never
266
+ expect(@resource).not_to receive(:callback1)
268
267
 
269
268
  @manager.process_events(@resource)
270
269
  end
271
270
 
272
271
  it "should queue a new noop event generated from the resource" do
273
272
  event = Puppet::Transaction::Event.new
274
- @resource.expects(:event).with(:status => "noop", :name => :noop_restart).returns event
275
- @manager.expects(:queue_events).with(@resource, [event])
273
+ expect(@resource).to receive(:event).with(:status => "noop", :name => :noop_restart).and_return(event)
274
+ expect(@manager).to receive(:queue_events).with(@resource, [event])
276
275
 
277
276
  @manager.process_events(@resource)
278
277
  end
279
278
  end
280
279
 
281
-
282
280
  describe "and the callback fails" do
283
281
  before do
284
- @resource.expects(:callback1).raises "a failure"
285
- @resource.stubs(:err)
282
+ expect(@resource).to receive(:callback1).and_raise("a failure")
286
283
 
287
- @manager.expects(:queued_events).yields(:callback1, [@event])
284
+ expect(@manager).to receive(:queued_events).and_yield(:callback1, [@event])
288
285
  end
289
286
 
290
- it "should log but not fail" do
291
- @resource.expects(:err)
287
+ it "should emit an error and log but not fail" do
288
+ expect(@resource).to receive(:err).with('Failed to call callback1: a failure').and_call_original
289
+
290
+ @manager.process_events(@resource)
292
291
 
293
- expect { @manager.process_events(@resource) }.not_to raise_error
292
+ expect(@logs).to include(an_object_having_attributes(level: :err, message: 'a failure'))
294
293
  end
295
294
 
296
295
  it "should set the 'failed_restarts' state on the resource status" do
@@ -306,12 +305,12 @@ describe Puppet::Transaction::EventManager do
306
305
  it "should record a failed event on the resource status" do
307
306
  @manager.process_events(@resource)
308
307
 
309
- expect(@transaction.resource_status(@resource).events.length).to eq(2)
308
+ expect(@transaction.resource_status(@resource).events.length).to eq(1)
310
309
  expect(@transaction.resource_status(@resource).events[0].status).to eq('failure')
311
310
  end
312
311
 
313
312
  it "should not queue a 'restarted' event" do
314
- @manager.expects(:queue_events).never
313
+ expect(@manager).not_to receive(:queue_events)
315
314
  @manager.process_events(@resource)
316
315
  end
317
316
 
@@ -330,10 +329,10 @@ describe Puppet::Transaction::EventManager do
330
329
  @resource = Puppet::Type.type(:file).new :path => make_absolute("/my/file")
331
330
  @target = Puppet::Type.type(:file).new :path => make_absolute("/your/file")
332
331
 
333
- @graph = stub 'graph'
334
- @graph.stubs(:matching_edges).returns []
335
- @graph.stubs(:matching_edges).with(anything, @resource).returns [stub('edge', :target => @target, :callback => :refresh)]
336
- @manager.stubs(:relationship_graph).returns @graph
332
+ @graph = allow('graph')
333
+ allow(@graph).to receive(:matching_edges).and_return([])
334
+ allow(@graph).to receive(:matching_edges).with(anything, @resource).and_return([double('edge', :target => @target, :callback => :refresh)])
335
+ allow(@manager).to receive(:relationship_graph).and_return(@graph)
337
336
 
338
337
  @event = Puppet::Transaction::Event.new(:name => :notify, :resource => @target)
339
338
  @event2 = Puppet::Transaction::Event.new(:name => :service_start, :resource => @target, :invalidate_refreshes => true)
@@ -345,13 +344,13 @@ describe Puppet::Transaction::EventManager do
345
344
 
346
345
  describe "and the events were dequeued/invalidated" do
347
346
  before do
348
- @resource.expects(:info).with { |msg| msg.include?("Scheduling refresh") }
349
- @target.expects(:info).with { |msg| msg.include?("Unscheduling") }
347
+ expect(@resource).to receive(:info).with(/Scheduling refresh/)
348
+ expect(@target).to receive(:info).with(/Unscheduling/)
350
349
  end
351
350
 
352
351
  it "should not run an event or log" do
353
- @target.expects(:notice).with { |msg| msg.include?("Would have triggered 'refresh'") }.never
354
- @target.expects(:refresh).never
352
+ expect(@target).not_to receive(:notice).with(/Would have triggered 'refresh'/)
353
+ expect(@target).not_to receive(:refresh)
355
354
 
356
355
  @manager.queue_events(@resource, [@event])
357
356
  @manager.queue_events(@target, [@event2])
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/transaction/event'
@@ -31,7 +30,7 @@ describe Puppet::Transaction::Event do
31
30
 
32
31
  it "should produce the message when converted to a string" do
33
32
  event = Puppet::Transaction::Event.new
34
- event.expects(:message).returns "my message"
33
+ expect(event).to receive(:message).and_return("my message")
35
34
  expect(event.to_s).to eq("my message")
36
35
  end
37
36
 
@@ -62,60 +61,62 @@ describe Puppet::Transaction::Event do
62
61
 
63
62
  describe "when sending logs" do
64
63
  before do
65
- Puppet::Util::Log.stubs(:new)
64
+ allow(Puppet::Util::Log).to receive(:new)
66
65
  end
67
66
 
68
67
  it "should set the level to the resources's log level if the event status is 'success' and a resource is available" do
69
- resource = stub 'resource'
70
- resource.expects(:[]).with(:loglevel).returns :myloglevel
71
- Puppet::Util::Log.expects(:create).with { |args| args[:level] == :myloglevel }
68
+ resource = double('resource')
69
+ expect(resource).to receive(:[]).with(:loglevel).and_return(:myloglevel)
70
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(level: :myloglevel))
72
71
  Puppet::Transaction::Event.new(:status => "success", :resource => resource).send_log
73
72
  end
74
73
 
75
74
  it "should set the level to 'notice' if the event status is 'success' and no resource is available" do
76
- Puppet::Util::Log.expects(:new).with { |args| args[:level] == :notice }
75
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(level: :notice))
77
76
  Puppet::Transaction::Event.new(:status => "success").send_log
78
77
  end
79
78
 
80
79
  it "should set the level to 'notice' if the event status is 'noop'" do
81
- Puppet::Util::Log.expects(:new).with { |args| args[:level] == :notice }
80
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(level: :notice))
82
81
  Puppet::Transaction::Event.new(:status => "noop").send_log
83
82
  end
84
83
 
85
84
  it "should set the level to 'err' if the event status is 'failure'" do
86
- Puppet::Util::Log.expects(:new).with { |args| args[:level] == :err }
85
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(level: :err))
87
86
  Puppet::Transaction::Event.new(:status => "failure").send_log
88
87
  end
89
88
 
90
89
  it "should set the 'message' to the event log" do
91
- Puppet::Util::Log.expects(:new).with { |args| args[:message] == "my message" }
90
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(message: "my message"))
92
91
  Puppet::Transaction::Event.new(:message => "my message").send_log
93
92
  end
94
93
 
95
94
  it "should set the tags to the event tags" do
96
- Puppet::Util::Log.expects(:new).with { |args| expect(args[:tags].to_a).to match_array(%w{one two}) }
95
+ expect(Puppet::Util::Log).to receive(:new) do |args|
96
+ expect(args[:tags].to_a).to match_array(%w{one two})
97
+ end
97
98
  Puppet::Transaction::Event.new(:tags => %w{one two}).send_log
98
99
  end
99
100
 
100
101
  [:file, :line].each do |attr|
101
102
  it "should pass the #{attr}" do
102
- Puppet::Util::Log.expects(:new).with { |args| args[attr] == "my val" }
103
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(attr => "my val"))
103
104
  Puppet::Transaction::Event.new(attr => "my val").send_log
104
105
  end
105
106
  end
106
107
 
107
108
  it "should use the source description as the source if one is set" do
108
- Puppet::Util::Log.expects(:new).with { |args| args[:source] == "/my/param" }
109
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(source: "/my/param"))
109
110
  Puppet::Transaction::Event.new(:source_description => "/my/param", :resource => TestResource.new, :property => "foo").send_log
110
111
  end
111
112
 
112
113
  it "should use the property as the source if one is available and no source description is set" do
113
- Puppet::Util::Log.expects(:new).with { |args| args[:source] == "foo" }
114
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(source: "foo"))
114
115
  Puppet::Transaction::Event.new(:resource => TestResource.new, :property => "foo").send_log
115
116
  end
116
117
 
117
118
  it "should use the property as the source if one is available and no property or source description is set" do
118
- Puppet::Util::Log.expects(:new).with { |args| args[:source] == "Foo[bar]" }
119
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(source: "Foo[bar]"))
119
120
  Puppet::Transaction::Event.new(:resource => TestResource.new).send_log
120
121
  end
121
122
  end