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
 
4
3
  require 'puppet/util/lockfile'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/util/json'
4
3
 
@@ -14,16 +13,15 @@ describe Puppet::Util::Log.desttypes[:report] do
14
13
  end
15
14
 
16
15
  it "should send new messages to the report" do
17
- report = mock 'report'
16
+ report = double('report')
18
17
  dest = @dest.new(report)
19
18
 
20
- report.expects(:<<).with("my log")
19
+ expect(report).to receive(:<<).with("my log")
21
20
 
22
21
  dest.handle "my log"
23
22
  end
24
23
  end
25
24
 
26
-
27
25
  describe Puppet::Util::Log.desttypes[:file] do
28
26
  include PuppetSpec::Files
29
27
 
@@ -54,26 +52,26 @@ describe Puppet::Util::Log.desttypes[:file] do
54
52
  it_behaves_like "file destination"
55
53
 
56
54
  it "logs an error if it can't chown the file owner & group" do
57
- File.expects(:exists?).with(abspath).returns(false)
58
- FileUtils.expects(:chown).with(Puppet[:user], Puppet[:group], abspath).raises(Errno::EPERM)
59
- Puppet.features.expects(:root?).returns(true)
60
- Puppet.expects(:err).with("Unable to set ownership to #{Puppet[:user]}:#{Puppet[:group]} for log file: #{abspath}")
55
+ expect(File).to receive(:exists?).with(abspath).and_return(false)
56
+ expect(FileUtils).to receive(:chown).with(Puppet[:user], Puppet[:group], abspath).and_raise(Errno::EPERM)
57
+ expect(Puppet.features).to receive(:root?).and_return(true)
58
+ expect(Puppet).to receive(:err).with("Unable to set ownership to #{Puppet[:user]}:#{Puppet[:group]} for log file: #{abspath}")
61
59
 
62
60
  @class.new(abspath)
63
61
  end
64
62
 
65
63
  it "doesn't attempt to chown when running as non-root" do
66
- File.expects(:exists?).with(abspath).returns(false)
67
- FileUtils.expects(:chown).with(Puppet[:user], Puppet[:group], abspath).never
68
- Puppet.features.expects(:root?).returns(false)
64
+ expect(File).to receive(:exists?).with(abspath).and_return(false)
65
+ expect(FileUtils).not_to receive(:chown).with(Puppet[:user], Puppet[:group], abspath)
66
+ expect(Puppet.features).to receive(:root?).and_return(false)
69
67
 
70
68
  @class.new(abspath)
71
69
  end
72
70
 
73
71
  it "doesn't attempt to chown when file already exists" do
74
- File.expects(:exists?).with(abspath).returns(true)
75
- FileUtils.expects(:chown).with(Puppet[:user], Puppet[:group], abspath).never
76
- Puppet.features.expects(:root?).returns(true)
72
+ expect(File).to receive(:exists?).with(abspath).and_return(true)
73
+ expect(FileUtils).not_to receive(:chown).with(Puppet[:user], Puppet[:group], abspath)
74
+ expect(Puppet.features).to receive(:root?).and_return(true)
77
75
 
78
76
  @class.new(abspath)
79
77
  end
@@ -110,28 +108,28 @@ describe Puppet::Util::Log.desttypes[:syslog] do
110
108
  # we can't stub the top-level Syslog module
111
109
  describe "when syslog is available", :if => Puppet.features.syslog? do
112
110
  before :each do
113
- Syslog.stubs(:opened?).returns(false)
114
- Syslog.stubs(:const_get).returns("LOG_KERN").returns(0)
115
- Syslog.stubs(:open)
111
+ allow(Syslog).to receive(:opened?).and_return(false)
112
+ allow(Syslog).to receive(:const_get).and_return("LOG_KERN", 0)
113
+ allow(Syslog).to receive(:open)
116
114
  end
117
115
 
118
116
  it "should open syslog" do
119
- Syslog.expects(:open)
117
+ expect(Syslog).to receive(:open)
120
118
 
121
119
  klass.new
122
120
  end
123
121
 
124
122
  it "should close syslog" do
125
- Syslog.expects(:close)
123
+ expect(Syslog).to receive(:close)
126
124
 
127
125
  dest = klass.new
128
126
  dest.close
129
127
  end
130
128
 
131
129
  it "should send messages to syslog" do
132
- syslog = mock 'syslog'
133
- syslog.expects(:info).with("don't panic")
134
- Syslog.stubs(:open).returns(syslog)
130
+ syslog = double('syslog')
131
+ expect(syslog).to receive(:info).with("don't panic")
132
+ allow(Syslog).to receive(:open).and_return(syslog)
135
133
 
136
134
  msg = Puppet::Util::Log.new(:level => :info, :message => "don't panic")
137
135
  dest = klass.new
@@ -141,7 +139,7 @@ describe Puppet::Util::Log.desttypes[:syslog] do
141
139
 
142
140
  describe "when syslog is unavailable" do
143
141
  it "should not be a suitable log destination" do
144
- Puppet.features.stubs(:syslog?).returns(false)
142
+ allow(Puppet.features).to receive(:syslog?).and_return(false)
145
143
 
146
144
  expect(klass.suitable?(:syslog)).to be_falsey
147
145
  end
@@ -149,7 +147,6 @@ describe Puppet::Util::Log.desttypes[:syslog] do
149
147
  end
150
148
 
151
149
  describe Puppet::Util::Log.desttypes[:logstash_event] do
152
-
153
150
  describe "when using structured log format with logstash_event schema" do
154
151
  before :each do
155
152
  @msg = Puppet::Util::Log.new(:level => :info, :message => "So long, and thanks for all the fish.", :source => "a dolphin")
@@ -173,7 +170,7 @@ describe Puppet::Util::Log.desttypes[:logstash_event] do
173
170
  end
174
171
 
175
172
  it "handle should send the output to stdout" do
176
- $stdout.expects(:puts).once
173
+ expect($stdout).to receive(:puts).once
177
174
  dest = described_class.new
178
175
  dest.handle(@msg)
179
176
  end
@@ -207,7 +204,7 @@ describe Puppet::Util::Log.desttypes[:console] do
207
204
 
208
205
  it "should include the log message's source/context in the output when available" do
209
206
  Puppet[:color] = false
210
- $stdout.expects(:puts).with("Info: a hitchhiker: don't panic")
207
+ expect($stdout).to receive(:puts).with("Info: a hitchhiker: don't panic")
211
208
 
212
209
  msg = Puppet::Util::Log.new(:level => :info, :message => "don't panic", :source => "a hitchhiker")
213
210
  dest = klass.new
@@ -220,9 +217,9 @@ describe ":eventlog", :if => Puppet::Util::Platform.windows? do
220
217
  let(:klass) { Puppet::Util::Log.desttypes[:eventlog] }
221
218
 
222
219
  def expects_message_with_type(klass, level, eventlog_type, eventlog_id)
223
- eventlog = stub('eventlog')
224
- eventlog.expects(:report_event).with(has_entries(:event_type => eventlog_type, :event_id => eventlog_id, :data => "a hitchhiker: don't panic"))
225
- Puppet::Util::Windows::EventLog.stubs(:open).returns(eventlog)
220
+ eventlog = double('eventlog')
221
+ expect(eventlog).to receive(:report_event).with(hash_including(:event_type => eventlog_type, :event_id => eventlog_id, :data => "a hitchhiker: don't panic"))
222
+ allow(Puppet::Util::Windows::EventLog).to receive(:open).and_return(eventlog)
226
223
 
227
224
  msg = Puppet::Util::Log.new(:level => level, :message => "don't panic", :source => "a hitchhiker")
228
225
  dest = klass.new
@@ -238,17 +235,17 @@ describe ":eventlog", :if => Puppet::Util::Platform.windows? do
238
235
  expected_truncated_msg = "#{'x' * 31785}...Message exceeds character length limit, truncating."
239
236
  expected_data = "a vogon ship: " + expected_truncated_msg
240
237
 
241
- eventlog = stub('eventlog')
242
- eventlog.expects(:report_event).with(has_entries(:event_type => 2, :event_id => 2, :data => expected_data))
238
+ eventlog = double('eventlog')
239
+ expect(eventlog).to receive(:report_event).with(hash_including(:event_type => 2, :event_id => 2, :data => expected_data))
243
240
  msg = Puppet::Util::Log.new(:level => :warning, :message => long_msg, :source => "a vogon ship")
244
- Puppet::Util::Windows::EventLog.stubs(:open).returns(eventlog)
241
+ allow(Puppet::Util::Windows::EventLog).to receive(:open).and_return(eventlog)
245
242
 
246
243
  dest = klass.new
247
244
  dest.handle(msg)
248
245
  end
249
246
 
250
247
  it "logs to the Puppet Application event log" do
251
- Puppet::Util::Windows::EventLog.expects(:open).with('Puppet').returns(stub('eventlog'))
248
+ expect(Puppet::Util::Windows::EventLog).to receive(:open).with('Puppet').and_return(double('eventlog'))
252
249
 
253
250
  klass.new
254
251
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  # coding: utf-8
3
2
  require 'spec_helper'
4
3
 
@@ -64,7 +63,7 @@ describe Puppet::Util::Log do
64
63
  win_31j_msg = [130, 187].pack('C*').force_encoding(Encoding::Windows_31J)
65
64
  utf_8_msg = "\u305d"
66
65
 
67
- $stdout.expects(:puts).with("\e[mNotice: #{mixed_utf8}: #{utf_8_msg}\e[0m")
66
+ expect($stdout).to receive(:puts).with("\e[mNotice: #{mixed_utf8}: #{utf_8_msg}\e[0m")
68
67
 
69
68
  # most handlers do special things with a :source => 'Puppet', so use something else
70
69
  Puppet::Util::Log.new(:level => :notice, :message => win_31j_msg, :source => mixed_utf8)
@@ -82,7 +81,7 @@ describe Puppet::Util::Log do
82
81
  win_31j_msg = [130, 187].pack('C*').force_encoding(Encoding::Windows_31J)
83
82
  utf_8_msg = "\u305d"
84
83
 
85
- $stdout.expects(:puts).with("\e[mNotice: #{utf_8_msg}: #{mixed_utf8}\e[0m")
84
+ expect($stdout).to receive(:puts).with("\e[mNotice: #{utf_8_msg}: #{mixed_utf8}\e[0m")
86
85
 
87
86
  Puppet::Util::Log.new(:level => :notice, :message => mixed_utf8, :source => win_31j_msg)
88
87
  expect(logs.last.source).to eq(utf_8_msg)
@@ -94,10 +93,10 @@ describe Puppet::Util::Log do
94
93
  # spec_helper.rb redirects log output away from the console,
95
94
  # so we have to stop that here, or else the logic we are testing
96
95
  # will not be reached.
97
- Puppet::Util::Log.stubs(:destinations).returns({})
96
+ allow(Puppet::Util::Log).to receive(:destinations).and_return({})
98
97
 
99
98
  our_exception = Puppet::DevError.new("test exception")
100
- Puppet::FileSystem.expects(:dir).raises(our_exception)
99
+ expect(Puppet::FileSystem).to receive(:dir).and_raise(our_exception)
101
100
  bad_file = tmpfile("bad_file")
102
101
 
103
102
  expect { Puppet::Util::Log.newdestination(bad_file) }.to raise_error(Puppet::DevError)
@@ -105,24 +104,24 @@ describe Puppet::Util::Log do
105
104
 
106
105
  describe ".setup_default" do
107
106
  it "should default to :syslog" do
108
- Puppet.features.stubs(:syslog?).returns(true)
109
- Puppet::Util::Log.expects(:newdestination).with(:syslog)
107
+ allow(Puppet.features).to receive(:syslog?).and_return(true)
108
+ expect(Puppet::Util::Log).to receive(:newdestination).with(:syslog)
110
109
 
111
110
  Puppet::Util::Log.setup_default
112
111
  end
113
112
 
114
113
  it "should fall back to :eventlog" do
115
- Puppet.features.stubs(:syslog?).returns(false)
116
- Puppet.features.stubs(:eventlog?).returns(true)
117
- Puppet::Util::Log.expects(:newdestination).with(:eventlog)
114
+ allow(Puppet.features).to receive(:syslog?).and_return(false)
115
+ allow(Puppet.features).to receive(:eventlog?).and_return(true)
116
+ expect(Puppet::Util::Log).to receive(:newdestination).with(:eventlog)
118
117
 
119
118
  Puppet::Util::Log.setup_default
120
119
  end
121
120
 
122
121
  it "should fall back to :file" do
123
- Puppet.features.stubs(:syslog?).returns(false)
124
- Puppet.features.stubs(:eventlog?).returns(false)
125
- Puppet::Util::Log.expects(:newdestination).with(Puppet[:puppetdlog])
122
+ allow(Puppet.features).to receive(:syslog?).and_return(false)
123
+ allow(Puppet.features).to receive(:eventlog?).and_return(false)
124
+ expect(Puppet::Util::Log).to receive(:newdestination).with(Puppet[:puppetdlog])
126
125
 
127
126
  Puppet::Util::Log.setup_default
128
127
  end
@@ -336,28 +335,28 @@ describe Puppet::Util::Log do
336
335
 
337
336
  describe Puppet::Util::Log::DestEventlog, :if => Puppet.features.eventlog? do
338
337
  before :each do
339
- Puppet::Util::Windows::EventLog.stubs(:open).returns(stub 'mylog')
340
- Puppet::Util::Windows::EventLog.stubs(:report_event)
341
- Puppet::Util::Windows::EventLog.stubs(:close)
342
- Puppet.features.stubs(:eventlog?).returns(true)
338
+ allow(Puppet::Util::Windows::EventLog).to receive(:open).and_return(double('mylog', :close => nil))
339
+ allow(Puppet::Util::Windows::EventLog).to receive(:report_event)
340
+ allow(Puppet::Util::Windows::EventLog).to receive(:close)
341
+ allow(Puppet.features).to receive(:eventlog?).and_return(true)
343
342
  end
344
343
 
345
344
  it "should restrict its suitability to Windows" do
346
- Puppet::Util::Platform.stubs(:windows?).returns false
345
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
347
346
 
348
347
  expect(Puppet::Util::Log::DestEventlog.suitable?('whatever')).to eq(false)
349
348
  end
350
349
 
351
350
  it "should open the 'Puppet' event log" do
352
- Puppet::Util::Windows::EventLog.expects(:open).with('Puppet')
351
+ expect(Puppet::Util::Windows::EventLog).to receive(:open).with('Puppet')
353
352
 
354
353
  Puppet::Util::Log.newdestination(:eventlog)
355
354
  end
356
355
 
357
356
  it "should close the event log" do
358
- log = stub('myeventlog')
359
- log.expects(:close)
360
- Puppet::Util::Windows::EventLog.expects(:open).returns(log)
357
+ log = double('myeventlog')
358
+ expect(log).to receive(:close)
359
+ expect(Puppet::Util::Windows::EventLog).to receive(:open).and_return(log)
361
360
 
362
361
  Puppet::Util::Log.newdestination(:eventlog)
363
362
  Puppet::Util::Log.close(:eventlog)
@@ -374,7 +373,7 @@ describe Puppet::Util::Log do
374
373
 
375
374
  describe "instances" do
376
375
  before do
377
- Puppet::Util::Log.stubs(:newmessage)
376
+ allow(Puppet::Util::Log).to receive(:newmessage)
378
377
  end
379
378
 
380
379
  [:level, :message, :time, :remote].each do |attr|
@@ -409,7 +408,7 @@ describe Puppet::Util::Log do
409
408
 
410
409
  it "should flush the log queue when the first destination is specified" do
411
410
  Puppet::Util::Log.close_all
412
- Puppet::Util::Log.expects(:flushqueue)
411
+ expect(Puppet::Util::Log).to receive(:flushqueue)
413
412
  Puppet::Util::Log.newdestination(:console)
414
413
  end
415
414
 
@@ -422,13 +421,13 @@ describe Puppet::Util::Log do
422
421
  end
423
422
 
424
423
  it "should fail if the provided level is not valid" do
425
- Puppet::Util::Log.expects(:validlevel?).with(:notice).returns false
424
+ expect(Puppet::Util::Log).to receive(:validlevel?).with(:notice).and_return(false)
426
425
  expect { Puppet::Util::Log.new(:level => :notice, :message => :foo) }.to raise_error(ArgumentError)
427
426
  end
428
427
 
429
428
  it "should set its time to the initialization time" do
430
- time = mock 'time'
431
- Time.expects(:now).returns time
429
+ time = double('time')
430
+ expect(Time).to receive(:now).and_return(time)
432
431
  expect(Puppet::Util::Log.new(:level => "notice", :message => :foo).time).to equal(time)
433
432
  end
434
433
 
@@ -439,13 +438,13 @@ describe Puppet::Util::Log do
439
438
  end
440
439
 
441
440
  it "should use a passed-in source" do
442
- Puppet::Util::Log.any_instance.expects(:source=).with "foo"
441
+ expect_any_instance_of(Puppet::Util::Log).to receive(:source=).with("foo")
443
442
  Puppet::Util::Log.new(:level => "notice", :message => :foo, :source => "foo")
444
443
  end
445
444
 
446
445
  [:file, :line].each do |attr|
447
446
  it "should use #{attr} if provided" do
448
- Puppet::Util::Log.any_instance.expects(attr.to_s + "=").with "foo"
447
+ expect_any_instance_of(Puppet::Util::Log).to receive(attr.to_s + "=").with("foo")
449
448
  Puppet::Util::Log.new(:level => "notice", :message => :foo, attr => "foo")
450
449
  end
451
450
  end
@@ -455,12 +454,12 @@ describe Puppet::Util::Log do
455
454
  end
456
455
 
457
456
  it "should register itself with Log" do
458
- Puppet::Util::Log.expects(:newmessage)
457
+ expect(Puppet::Util::Log).to receive(:newmessage)
459
458
  Puppet::Util::Log.new(:level => "notice", :message => :foo)
460
459
  end
461
460
 
462
461
  it "should update Log autoflush when Puppet[:autoflush] is set" do
463
- Puppet::Util::Log.expects(:autoflush=).once.with(true)
462
+ expect(Puppet::Util::Log).to receive(:autoflush=).once.with(true)
464
463
  Puppet[:autoflush] = true
465
464
  end
466
465
 
@@ -490,10 +489,10 @@ describe Puppet::Util::Log do
490
489
  end
491
490
 
492
491
  it "should not create unsuitable log destinations" do
493
- Puppet.features.stubs(:syslog?).returns(false)
492
+ allow(Puppet.features).to receive(:syslog?).and_return(false)
494
493
 
495
- Puppet::Util::Log::DestSyslog.expects(:suitable?)
496
- Puppet::Util::Log::DestSyslog.expects(:new).never
494
+ expect(Puppet::Util::Log::DestSyslog).to receive(:suitable?)
495
+ expect(Puppet::Util::Log::DestSyslog).not_to receive(:new)
497
496
 
498
497
  Puppet::Util::Log.newdestination(:syslog)
499
498
  end
@@ -546,8 +545,8 @@ describe Puppet::Util::Log do
546
545
 
547
546
  describe "when setting the source as a non-RAL object" do
548
547
  it "should not try to copy over file, version, line, or tag information" do
549
- source = mock
550
- source.expects(:file).never
548
+ source = double('source')
549
+ expect(source).not_to receive(:file)
551
550
  Puppet::Util::Log.new(:level => "notice", :message => :foo, :source => source)
552
551
  end
553
552
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/logging'
@@ -26,29 +25,29 @@ describe Puppet::Util::Logging do
26
25
  end
27
26
 
28
27
  it "should have a method for sending a log with a specified log level" do
29
- @logger.expects(:to_s).returns "I'm a string!"
30
- Puppet::Util::Log.expects(:create).with { |args| args[:source] == "I'm a string!" and args[:level] == "loglevel" and args[:message] == "mymessage" }
28
+ expect(@logger).to receive(:to_s).and_return("I'm a string!")
29
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(source: "I'm a string!", level: "loglevel", message: "mymessage"))
31
30
 
32
31
  @logger.send_log "loglevel", "mymessage"
33
32
  end
34
33
 
35
34
  describe "when sending a log" do
36
35
  it "should use the Log's 'create' entrance method" do
37
- Puppet::Util::Log.expects(:create)
36
+ expect(Puppet::Util::Log).to receive(:create)
38
37
 
39
38
  @logger.notice "foo"
40
39
  end
41
40
 
42
41
  it "should send itself converted to a string as the log source" do
43
- @logger.expects(:to_s).returns "I'm a string!"
44
- Puppet::Util::Log.expects(:create).with { |args| args[:source] == "I'm a string!" }
42
+ expect(@logger).to receive(:to_s).and_return("I'm a string!")
43
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(source: "I'm a string!"))
45
44
 
46
45
  @logger.notice "foo"
47
46
  end
48
47
 
49
48
  it "should queue logs sent without a specified destination" do
50
49
  Puppet::Util::Log.close_all
51
- Puppet::Util::Log.expects(:queuemessage)
50
+ expect(Puppet::Util::Log).to receive(:queuemessage)
52
51
 
53
52
  @logger.notice "foo"
54
53
  end
@@ -56,9 +55,9 @@ describe Puppet::Util::Logging do
56
55
  it "should use the path of any provided resource type" do
57
56
  resource = Puppet::Type.type(:logging_test).new :name => "foo"
58
57
 
59
- resource.expects(:path).returns "/path/to/host".to_sym
58
+ expect(resource).to receive(:path).and_return("/path/to/host".to_sym)
60
59
 
61
- Puppet::Util::Log.expects(:create).with { |args| args[:source] == "/path/to/host" }
60
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(source: "/path/to/host"))
62
61
 
63
62
  resource.notice "foo"
64
63
  end
@@ -68,21 +67,21 @@ describe Puppet::Util::Logging do
68
67
 
69
68
  param = resource.parameter(:name)
70
69
 
71
- param.expects(:path).returns "/path/to/param".to_sym
70
+ expect(param).to receive(:path).and_return("/path/to/param".to_sym)
72
71
 
73
- Puppet::Util::Log.expects(:create).with { |args| args[:source] == "/path/to/param" }
72
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(source: "/path/to/param"))
74
73
 
75
74
  param.notice "foo"
76
75
  end
77
76
 
78
77
  it "should send the provided argument as the log message" do
79
- Puppet::Util::Log.expects(:create).with { |args| args[:message] == "foo" }
78
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(message: "foo"))
80
79
 
81
80
  @logger.notice "foo"
82
81
  end
83
82
 
84
83
  it "should join any provided arguments into a single string for the message" do
85
- Puppet::Util::Log.expects(:create).with { |args| args[:message] == "foo bar baz" }
84
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(message: "foo bar baz"))
86
85
 
87
86
  @logger.notice ["foo", "bar", "baz"]
88
87
  end
@@ -93,7 +92,7 @@ describe Puppet::Util::Logging do
93
92
 
94
93
  @logger.send(attr.to_s + "=", "myval")
95
94
 
96
- Puppet::Util::Log.expects(:create).with { |args| args[attr] == "myval" }
95
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(attr => "myval"))
97
96
  @logger.notice "foo"
98
97
  end
99
98
  end
@@ -102,7 +101,7 @@ describe Puppet::Util::Logging do
102
101
  describe "log_exception" do
103
102
  context "when requesting a debug level it is logged at debug" do
104
103
  it "the exception is a ParseErrorWithIssue and message is :default" do
105
- Puppet::Util::Log.expects(:create).with do |args|
104
+ expect(Puppet::Util::Log).to receive(:create) do |args|
106
105
  expect(args[:message]).to eq("Test")
107
106
  expect(args[:level]).to eq(:debug)
108
107
  end
@@ -115,7 +114,7 @@ describe Puppet::Util::Logging do
115
114
  end
116
115
 
117
116
  it "the exception is something else" do
118
- Puppet::Util::Log.expects(:create).with do |args|
117
+ expect(Puppet::Util::Log).to receive(:create) do |args|
119
118
  expect(args[:message]).to eq("Test")
120
119
  expect(args[:level]).to eq(:debug)
121
120
  end
@@ -130,7 +129,7 @@ describe Puppet::Util::Logging do
130
129
 
131
130
  context "no log level is requested it defaults to err" do
132
131
  it "the exception is a ParseErrorWithIssue and message is :default" do
133
- Puppet::Util::Log.expects(:create).with do |args|
132
+ expect(Puppet::Util::Log).to receive(:create) do |args|
134
133
  expect(args[:message]).to eq("Test")
135
134
  expect(args[:level]).to eq(:err)
136
135
  end
@@ -143,7 +142,7 @@ describe Puppet::Util::Logging do
143
142
  end
144
143
 
145
144
  it "the exception is something else" do
146
- Puppet::Util::Log.expects(:create).with do |args|
145
+ expect(Puppet::Util::Log).to receive(:create) do |args|
147
146
  expect(args[:message]).to eq("Test")
148
147
  expect(args[:level]).to eq(:err)
149
148
  end
@@ -159,47 +158,41 @@ describe Puppet::Util::Logging do
159
158
 
160
159
  describe "when sending a deprecation warning" do
161
160
  it "does not log a message when deprecation warnings are disabled" do
162
- Puppet.expects(:[]).with(:disable_warnings).returns %w[deprecations]
163
- @logger.expects(:warning).never
161
+ expect(Puppet).to receive(:[]).with(:disable_warnings).and_return(%w[deprecations])
162
+ expect(@logger).not_to receive(:warning)
164
163
  @logger.deprecation_warning 'foo'
165
164
  end
166
165
 
167
166
  it "logs the message with warn" do
168
- @logger.expects(:warning).with do |msg|
169
- msg =~ /^foo\n/
170
- end
167
+ expect(@logger).to receive(:warning).with(/^foo\n/)
171
168
  @logger.deprecation_warning 'foo'
172
169
  end
173
170
 
174
171
  it "only logs each offending line once" do
175
- @logger.expects(:warning).with do |msg|
176
- msg =~ /^foo\n/
177
- end .once
172
+ expect(@logger).to receive(:warning).with(/^foo\n/).once
178
173
  5.times { @logger.deprecation_warning 'foo' }
179
174
  end
180
175
 
181
176
  it "ensures that deprecations from same origin are logged if their keys differ" do
182
- @logger.expects(:warning).with(regexp_matches(/deprecated foo/)).times(5)
177
+ expect(@logger).to receive(:warning).with(/deprecated foo/).exactly(5).times()
183
178
  5.times { |i| @logger.deprecation_warning('deprecated foo', :key => "foo#{i}") }
184
179
  end
185
180
 
186
181
  it "does not duplicate deprecations for a given key" do
187
- @logger.expects(:warning).with(regexp_matches(/deprecated foo/)).once
182
+ expect(@logger).to receive(:warning).with(/deprecated foo/).once
188
183
  5.times { @logger.deprecation_warning('deprecated foo', :key => 'foo-msg') }
189
184
  end
190
185
 
191
186
  it "only logs the first 100 messages" do
192
187
  (1..100).each { |i|
193
- @logger.expects(:warning).with do |msg|
194
- msg =~ /^#{i}\n/
195
- end .once
188
+ expect(@logger).to receive(:warning).with(/^#{i}\n/).once
196
189
  # since the deprecation warning will only log each offending line once, we have to do some tomfoolery
197
190
  # here in order to make it think each of these calls is coming from a unique call stack; we're basically
198
191
  # mocking the method that it would normally use to find the call stack.
199
- @logger.expects(:get_deprecation_offender).returns(["deprecation log count test ##{i}"])
192
+ expect(@logger).to receive(:get_deprecation_offender).and_return(["deprecation log count test ##{i}"])
200
193
  @logger.deprecation_warning i
201
194
  }
202
- @logger.expects(:warning).with(101).never
195
+ expect(@logger).not_to receive(:warning).with(101)
203
196
  @logger.deprecation_warning 101
204
197
  end
205
198
  end
@@ -219,25 +212,25 @@ describe Puppet::Util::Logging do
219
212
  end
220
213
 
221
214
  it "warns with file and line" do
222
- @logger.expects(:warning).with(regexp_matches(/deprecated foo.*\(file: afile, line: 5\)/m))
215
+ expect(@logger).to receive(:warning).with(/deprecated foo.*\(file: afile, line: 5\)/m)
223
216
  @logger.puppet_deprecation_warning("deprecated foo", :file => 'afile', :line => 5)
224
217
  end
225
218
 
226
219
  it "warns keyed from file and line" do
227
- @logger.expects(:warning).with(regexp_matches(/deprecated foo.*\(file: afile, line: 5\)/m)).once
220
+ expect(@logger).to receive(:warning).with(/deprecated foo.*\(file: afile, line: 5\)/m).once
228
221
  5.times do
229
222
  @logger.puppet_deprecation_warning("deprecated foo", :file => 'afile', :line => 5)
230
223
  end
231
224
  end
232
225
 
233
226
  it "warns with separate key only once regardless of file and line" do
234
- @logger.expects(:warning).with(regexp_matches(/deprecated foo.*\(file: afile, line: 5\)/m)).once
227
+ expect(@logger).to receive(:warning).with(/deprecated foo.*\(file: afile, line: 5\)/m).once
235
228
  @logger.puppet_deprecation_warning("deprecated foo", :key => 'some_key', :file => 'afile', :line => 5)
236
229
  @logger.puppet_deprecation_warning("deprecated foo", :key => 'some_key', :file => 'bfile', :line => 3)
237
230
  end
238
231
 
239
232
  it "warns with key but no file and line" do
240
- @logger.expects(:warning).with(regexp_matches(/deprecated foo.*\(file: unknown, line: unknown\)/m))
233
+ expect(@logger).to receive(:warning).with(/deprecated foo.*\(file: unknown, line: unknown\)/m)
241
234
  @logger.puppet_deprecation_warning("deprecated foo", :key => 'some_key')
242
235
  end
243
236
  end
@@ -246,29 +239,24 @@ describe Puppet::Util::Logging do
246
239
  before(:each) {
247
240
  @logger.clear_deprecation_warnings
248
241
  }
249
- after(:each) {
250
- # this is required because of bugs in Mocha whe tearing down expectations for each test
251
- # why it works elsewhere is a mystery.
252
- @logger.unstub(:send_log)
253
- }
254
242
 
255
243
  it "warns with file when only file is given" do
256
- @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*\(file: aFile\)/m))
244
+ expect(@logger).to receive(:send_log).with(:warning, /wet paint.*\(file: aFile\)/m)
257
245
  @logger.warn_once('kind', 'wp', "wet paint", 'aFile')
258
246
  end
259
247
 
260
248
  it "warns with unknown file and line when only line is given" do
261
- @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*\(line: 5\)/m))
249
+ expect(@logger).to receive(:send_log).with(:warning, /wet paint.*\(line: 5\)/m)
262
250
  @logger.warn_once('kind', 'wp', "wet paint", nil, 5)
263
251
  end
264
252
 
265
253
  it "warns with file and line when both are given" do
266
- @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*\(file: aFile, line: 5\)/m))
254
+ expect(@logger).to receive(:send_log).with(:warning, /wet paint.*\(file: aFile, line: 5\)/m)
267
255
  @logger.warn_once('kind', 'wp', "wet paint",'aFile', 5)
268
256
  end
269
257
 
270
258
  it "warns once per key" do
271
- @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*/m)).once
259
+ expect(@logger).to receive(:send_log).with(:warning, /wet paint.*/m).once
272
260
  5.times do
273
261
  @logger.warn_once('kind', 'wp', "wet paint")
274
262
  end
@@ -276,7 +264,7 @@ describe Puppet::Util::Logging do
276
264
 
277
265
  Puppet::Util::Log.eachlevel do |level|
278
266
  it "can use log level #{level}" do
279
- @logger.expects(:send_log).with(level, regexp_matches(/wet paint.*/m)).once
267
+ expect(@logger).to receive(:send_log).with(level, /wet paint.*/m).once
280
268
  5.times do
281
269
  @logger.warn_once('kind', 'wp', "wet paint", nil, nil, level)
282
270
  end
@@ -287,20 +275,21 @@ describe Puppet::Util::Logging do
287
275
  describe "does not warn about undefined variables when disabled_warnings says so" do
288
276
  let(:logger) { LoggingTester.new }
289
277
 
290
- around(:each) do |example|
278
+ before(:each) do
291
279
  Puppet.settings.initialize_global_settings
292
280
  logger.clear_deprecation_warnings
293
281
  Puppet[:disable_warnings] = ['undefined_variables']
294
- example.run
295
- Puppet[:disable_warnings] = []
296
282
  end
297
283
 
298
284
  after(:each) do
299
- logger.unstub(:send_log)
285
+ Puppet[:disable_warnings] = []
286
+ allow(logger).to receive(:send_log).and_call_original()
287
+ allow(Facter).to receive(:respond_to?).and_call_original()
288
+ allow(Facter).to receive(:debugging).and_call_original()
300
289
  end
301
290
 
302
291
  it "does not produce warning if kind is disabled" do
303
- logger.expects(:send_log).never
292
+ expect(logger).not_to receive(:send_log)
304
293
  logger.warn_once('undefined_variables', 'wp', "wet paint")
305
294
  end
306
295
  end
@@ -308,20 +297,21 @@ describe Puppet::Util::Logging do
308
297
  describe "warns about undefined variables when deprecations are in disabled_warnings" do
309
298
  let(:logger) { LoggingTester.new }
310
299
 
311
- around(:each) do |example|
300
+ before(:each) do
312
301
  Puppet.settings.initialize_global_settings
313
302
  logger.clear_deprecation_warnings
314
303
  Puppet[:disable_warnings] = ['deprecations']
315
- example.run
316
- Puppet[:disable_warnings] = []
317
304
  end
318
305
 
319
306
  after(:each) do
320
- logger.unstub(:send_log)
307
+ Puppet[:disable_warnings] = []
308
+ allow(logger).to receive(:send_log).and_call_original()
309
+ allow(Facter).to receive(:respond_to?).and_call_original()
310
+ allow(Facter).to receive(:debugging).and_call_original()
321
311
  end
322
312
 
323
313
  it "produces warning even if deprecation warnings are disabled " do
324
- logger.expects(:send_log).with(:warning, regexp_matches(/wet paint/)).once
314
+ expect(logger).to receive(:send_log).with(:warning, /wet paint/).once
325
315
  logger.warn_once('undefined_variables', 'wp', "wet paint")
326
316
  end
327
317
  end
@@ -356,49 +346,49 @@ original
356
346
  after :each do
357
347
  # Unstub these calls as there is global code run after
358
348
  # each spec that may reset the log level to debug
359
- Facter.unstub(:respond_to?)
360
- Facter.unstub(:debugging)
349
+ allow(Facter).to receive(:respond_to?).and_call_original()
350
+ allow(Facter).to receive(:debugging).and_call_original()
361
351
  end
362
352
 
363
353
  describe 'does support debugging' do
364
354
  before :each do
365
- Facter.stubs(:respond_to?).with(:debugging).returns true
355
+ allow(Facter).to receive(:respond_to?).with(:debugging).and_return(true)
366
356
  end
367
357
 
368
358
  it 'enables Facter debugging when debug level' do
369
- Facter.stubs(:debugging).with(true)
359
+ allow(Facter).to receive(:debugging).with(true)
370
360
  Puppet::Util::Log.level = :debug
371
361
  end
372
362
 
373
363
  it 'disables Facter debugging when not debug level' do
374
- Facter.stubs(:debugging).with(false)
364
+ allow(Facter).to receive(:debugging).with(false)
375
365
  Puppet::Util::Log.level = :info
376
366
  end
377
367
  end
378
368
 
379
369
  describe 'does support trace' do
380
370
  before :each do
381
- Facter.stubs(:respond_to?).with(:trace).returns true
371
+ allow(Facter).to receive(:respond_to?).with(:trace).and_return(true)
382
372
  end
383
373
 
384
374
  it 'enables Facter trace when enabled' do
385
- Facter.stubs(:trace).with(true)
375
+ allow(Facter).to receive(:trace).with(true)
386
376
  Puppet[:trace] = true
387
377
  end
388
378
 
389
379
  it 'disables Facter trace when disabled' do
390
- Facter.stubs(:trace).with(false)
380
+ allow(Facter).to receive(:trace).with(false)
391
381
  Puppet[:trace] = false
392
382
  end
393
383
  end
394
384
 
395
385
  describe 'does support on_message' do
396
386
  before :each do
397
- Facter.stubs(:respond_to?).with(:on_message).returns true
387
+ allow(Facter).to receive(:respond_to?).with(:on_message).and_return(true)
398
388
  end
399
389
 
400
390
  def setup(level, message)
401
- Facter.stubs(:on_message).yields level, message
391
+ allow(Facter).to receive(:on_message).and_yield(level, message)
402
392
 
403
393
  # Transform from Facter level to Puppet level
404
394
  case level
@@ -412,11 +402,7 @@ original
412
402
  level = :crit
413
403
  end
414
404
 
415
- Puppet::Util::Log.stubs(:create).with do |options|
416
- expect(options[:level]).to eq(level)
417
- expect(options[:message]).to eq(message)
418
- expect(options[:source]).to eq('Facter')
419
- end.once
405
+ allow(Puppet::Util::Log).to receive(:create).with(hash_including(level: level, message: message, source: 'Facter')).once
420
406
  end
421
407
 
422
408
  [:trace, :debug, :info, :warn, :error, :fatal].each do |level|