puppet 5.5.12-universal-darwin → 5.5.13-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 (733) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -5
  3. data/Gemfile.lock +11 -11
  4. data/lib/puppet/application/filebucket.rb +4 -0
  5. data/lib/puppet/configurer.rb +9 -3
  6. data/lib/puppet/indirector/request.rb +26 -15
  7. data/lib/puppet/indirector/rest.rb +16 -7
  8. data/lib/puppet/network/http/connection.rb +15 -7
  9. data/lib/puppet/transaction/event_manager.rb +1 -5
  10. data/lib/puppet/type/file/source.rb +0 -1
  11. data/lib/puppet/util/http_proxy.rb +3 -2
  12. data/lib/puppet/version.rb +1 -1
  13. data/locales/puppet.pot +108 -36
  14. data/man/man5/puppet.conf.5 +2 -2
  15. data/man/man8/puppet-agent.8 +1 -1
  16. data/man/man8/puppet-apply.8 +1 -1
  17. data/man/man8/puppet-ca.8 +1 -1
  18. data/man/man8/puppet-catalog.8 +1 -1
  19. data/man/man8/puppet-cert.8 +1 -1
  20. data/man/man8/puppet-certificate.8 +1 -1
  21. data/man/man8/puppet-certificate_request.8 +1 -1
  22. data/man/man8/puppet-certificate_revocation_list.8 +1 -1
  23. data/man/man8/puppet-config.8 +1 -1
  24. data/man/man8/puppet-describe.8 +1 -1
  25. data/man/man8/puppet-device.8 +1 -1
  26. data/man/man8/puppet-doc.8 +1 -1
  27. data/man/man8/puppet-epp.8 +1 -1
  28. data/man/man8/puppet-facts.8 +1 -1
  29. data/man/man8/puppet-filebucket.8 +1 -1
  30. data/man/man8/puppet-generate.8 +1 -1
  31. data/man/man8/puppet-help.8 +1 -1
  32. data/man/man8/puppet-key.8 +1 -1
  33. data/man/man8/puppet-lookup.8 +1 -1
  34. data/man/man8/puppet-man.8 +1 -1
  35. data/man/man8/puppet-master.8 +1 -1
  36. data/man/man8/puppet-module.8 +1 -1
  37. data/man/man8/puppet-node.8 +1 -1
  38. data/man/man8/puppet-parser.8 +1 -1
  39. data/man/man8/puppet-plugin.8 +1 -1
  40. data/man/man8/puppet-report.8 +1 -1
  41. data/man/man8/puppet-resource.8 +1 -1
  42. data/man/man8/puppet-script.8 +1 -1
  43. data/man/man8/puppet-status.8 +1 -1
  44. data/man/man8/puppet.8 +2 -2
  45. data/spec/integration/agent/logging_spec.rb +5 -7
  46. data/spec/integration/application/apply_spec.rb +28 -26
  47. data/spec/integration/application/doc_spec.rb +1 -2
  48. data/spec/integration/application/lookup_spec.rb +5 -5
  49. data/spec/integration/configurer_spec.rb +5 -6
  50. data/spec/integration/defaults_spec.rb +5 -6
  51. data/spec/integration/directory_environments_spec.rb +1 -1
  52. data/spec/integration/faces/ca_spec.rb +2 -3
  53. data/spec/integration/faces/config_spec.rb +3 -4
  54. data/spec/integration/faces/documentation_spec.rb +0 -1
  55. data/spec/integration/faces/plugin_spec.rb +1 -1
  56. data/spec/integration/file_bucket/file_spec.rb +3 -5
  57. data/spec/integration/file_serving/content_spec.rb +0 -1
  58. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  59. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  60. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  61. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  62. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  63. data/spec/integration/indirector/facts/facter_spec.rb +5 -5
  64. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  65. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  66. data/spec/integration/indirector/node/ldap_spec.rb +2 -3
  67. data/spec/integration/network/authconfig_spec.rb +23 -24
  68. data/spec/integration/network/formats_spec.rb +0 -1
  69. data/spec/integration/network/http/api/indirected_routes_spec.rb +0 -1
  70. data/spec/integration/node/environment_spec.rb +0 -1
  71. data/spec/integration/node/facts_spec.rb +9 -10
  72. data/spec/integration/node_spec.rb +6 -7
  73. data/spec/integration/parser/catalog_spec.rb +4 -2
  74. data/spec/integration/parser/collection_spec.rb +1 -2
  75. data/spec/integration/parser/compiler_spec.rb +6 -6
  76. data/spec/integration/parser/scope_spec.rb +1 -1
  77. data/spec/integration/parser/undef_param_spec.rb +1 -1
  78. data/spec/integration/provider/cron/crontab_spec.rb +8 -10
  79. data/spec/integration/provider/mailalias/aliases_spec.rb +0 -1
  80. data/spec/integration/provider/mount_spec.rb +9 -9
  81. data/spec/integration/provider/service/init_spec.rb +4 -5
  82. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  83. data/spec/integration/provider/service/windows_spec.rb +1 -2
  84. data/spec/integration/provider/ssh_authorized_key_spec.rb +6 -8
  85. data/spec/integration/provider/sshkey_spec.rb +6 -12
  86. data/spec/integration/provider/yumrepo_spec.rb +8 -12
  87. data/spec/integration/reference/providers_spec.rb +0 -1
  88. data/spec/integration/reports_spec.rb +1 -2
  89. data/spec/integration/resource/catalog_spec.rb +14 -17
  90. data/spec/integration/resource/type_collection_spec.rb +4 -5
  91. data/spec/integration/ssl/certificate_authority_spec.rb +0 -1
  92. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  93. data/spec/integration/ssl/certificate_revocation_list_spec.rb +0 -1
  94. data/spec/integration/ssl/host_spec.rb +0 -1
  95. data/spec/integration/ssl/key_spec.rb +0 -1
  96. data/spec/integration/test/test_helper_spec.rb +1 -2
  97. data/spec/integration/transaction/report_spec.rb +6 -11
  98. data/spec/integration/transaction_spec.rb +18 -19
  99. data/spec/integration/type/exec_spec.rb +0 -1
  100. data/spec/integration/type/file_spec.rb +13 -14
  101. data/spec/integration/type/nagios_spec.rb +3 -5
  102. data/spec/integration/type/package_spec.rb +19 -23
  103. data/spec/integration/type/tidy_spec.rb +1 -2
  104. data/spec/integration/type/user_spec.rb +0 -1
  105. data/spec/integration/type_spec.rb +0 -1
  106. data/spec/integration/util/autoload_spec.rb +1 -2
  107. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  108. data/spec/integration/util/settings_spec.rb +0 -1
  109. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  110. data/spec/integration/util/windows/principal_spec.rb +0 -1
  111. data/spec/integration/util/windows/process_spec.rb +4 -6
  112. data/spec/integration/util/windows/registry_spec.rb +41 -51
  113. data/spec/integration/util/windows/security_spec.rb +2 -4
  114. data/spec/integration/util/windows/user_spec.rb +18 -20
  115. data/spec/integration/util_spec.rb +4 -7
  116. data/spec/lib/puppet_spec/compiler.rb +1 -1
  117. data/spec/lib/puppet_spec/files.rb +0 -1
  118. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  119. data/spec/lib/puppet_spec/scope.rb +1 -2
  120. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  121. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  122. data/spec/shared_behaviours/file_serving.rb +6 -8
  123. data/spec/shared_behaviours/file_serving_model.rb +4 -6
  124. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  125. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  126. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  127. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  128. data/spec/spec_helper.rb +11 -2
  129. data/spec/unit/agent/disabler_spec.rb +4 -5
  130. data/spec/unit/agent/locker_spec.rb +12 -13
  131. data/spec/unit/agent_spec.rb +80 -85
  132. data/spec/unit/application/agent_spec.rb +88 -93
  133. data/spec/unit/application/apply_spec.rb +78 -79
  134. data/spec/unit/application/cert_spec.rb +42 -49
  135. data/spec/unit/application/certificate_spec.rb +2 -3
  136. data/spec/unit/application/config_spec.rb +0 -1
  137. data/spec/unit/application/describe_spec.rb +6 -7
  138. data/spec/unit/application/device_spec.rb +175 -184
  139. data/spec/unit/application/doc_spec.rb +44 -46
  140. data/spec/unit/application/face_base_spec.rb +61 -62
  141. data/spec/unit/application/facts_spec.rb +3 -4
  142. data/spec/unit/application/filebucket_spec.rb +66 -74
  143. data/spec/unit/application/indirection_base_spec.rb +8 -6
  144. data/spec/unit/application/lookup_spec.rb +26 -26
  145. data/spec/unit/application/master_spec.rb +95 -95
  146. data/spec/unit/application/resource_spec.rb +42 -48
  147. data/spec/unit/application_spec.rb +74 -84
  148. data/spec/unit/capability_spec.rb +9 -6
  149. data/spec/unit/configurer/downloader_spec.rb +20 -21
  150. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  151. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  152. data/spec/unit/configurer_spec.rb +190 -193
  153. data/spec/unit/confine/exists_spec.rb +17 -15
  154. data/spec/unit/confine/false_spec.rb +5 -6
  155. data/spec/unit/confine/feature_spec.rb +7 -5
  156. data/spec/unit/confine/true_spec.rb +5 -6
  157. data/spec/unit/confine/variable_spec.rb +14 -15
  158. data/spec/unit/confine_collection_spec.rb +28 -29
  159. data/spec/unit/confine_spec.rb +13 -14
  160. data/spec/unit/confiner_spec.rb +10 -11
  161. data/spec/unit/context/trusted_information_spec.rb +1 -1
  162. data/spec/unit/daemon_spec.rb +34 -35
  163. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  164. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  165. data/spec/unit/datatypes_spec.rb +3 -4
  166. data/spec/unit/defaults_spec.rb +17 -12
  167. data/spec/unit/environments_spec.rb +7 -7
  168. data/spec/unit/etc_spec.rb +30 -32
  169. data/spec/unit/external/pson_spec.rb +0 -1
  170. data/spec/unit/face/ca_spec.rb +0 -1
  171. data/spec/unit/face/catalog_spec.rb +0 -1
  172. data/spec/unit/face/certificate_request_spec.rb +0 -1
  173. data/spec/unit/face/certificate_revocation_list_spec.rb +0 -1
  174. data/spec/unit/face/certificate_spec.rb +7 -10
  175. data/spec/unit/face/config_spec.rb +31 -35
  176. data/spec/unit/face/epp_face_spec.rb +3 -4
  177. data/spec/unit/face/facts_spec.rb +5 -6
  178. data/spec/unit/face/generate_spec.rb +4 -5
  179. data/spec/unit/face/help_spec.rb +7 -8
  180. data/spec/unit/face/key_spec.rb +0 -1
  181. data/spec/unit/face/man_spec.rb +1 -2
  182. data/spec/unit/face/module/build_spec.rb +17 -17
  183. data/spec/unit/face/module/install_spec.rb +3 -5
  184. data/spec/unit/face/module/list_spec.rb +2 -12
  185. data/spec/unit/face/module/search_spec.rb +11 -9
  186. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  187. data/spec/unit/face/node_spec.rb +33 -34
  188. data/spec/unit/face/parser_spec.rb +3 -3
  189. data/spec/unit/face/plugin_spec.rb +36 -9
  190. data/spec/unit/face/status_spec.rb +0 -1
  191. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  192. data/spec/unit/file_bucket/file_spec.rb +0 -2
  193. data/spec/unit/file_serving/base_spec.rb +16 -17
  194. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  195. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  196. data/spec/unit/file_serving/content_spec.rb +10 -11
  197. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  198. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  199. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  200. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  201. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  202. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  203. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  204. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  205. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  206. data/spec/unit/file_serving/mount_spec.rb +0 -1
  207. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  208. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  209. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  210. data/spec/unit/file_system_spec.rb +2 -2
  211. data/spec/unit/forge/errors_spec.rb +1 -1
  212. data/spec/unit/forge/forge_spec.rb +13 -14
  213. data/spec/unit/forge/module_release_spec.rb +18 -18
  214. data/spec/unit/forge/repository_spec.rb +29 -30
  215. data/spec/unit/forge_spec.rb +15 -11
  216. data/spec/unit/functions/binary_file_spec.rb +3 -3
  217. data/spec/unit/functions/contain_spec.rb +0 -2
  218. data/spec/unit/functions/defined_spec.rb +0 -1
  219. data/spec/unit/functions/epp_spec.rb +2 -2
  220. data/spec/unit/functions/find_file_spec.rb +7 -7
  221. data/spec/unit/functions/include_spec.rb +0 -4
  222. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  223. data/spec/unit/functions/lookup_spec.rb +1 -2
  224. data/spec/unit/functions/module_directory_spec.rb +12 -12
  225. data/spec/unit/functions/require_spec.rb +0 -3
  226. data/spec/unit/functions/shared.rb +5 -8
  227. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  228. data/spec/unit/functions4_spec.rb +7 -8
  229. data/spec/unit/gettext/config_spec.rb +4 -4
  230. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  231. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  232. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  233. data/spec/unit/graph/simple_graph_spec.rb +8 -9
  234. data/spec/unit/hiera_puppet_spec.rb +20 -20
  235. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  236. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  237. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  238. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  239. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  240. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  241. data/spec/unit/indirector/certificate/ca_spec.rb +2 -4
  242. data/spec/unit/indirector/certificate/disabled_ca_spec.rb +1 -2
  243. data/spec/unit/indirector/certificate/file_spec.rb +2 -3
  244. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  245. data/spec/unit/indirector/certificate_request/ca_spec.rb +0 -1
  246. data/spec/unit/indirector/certificate_request/disabled_ca_spec.rb +1 -2
  247. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  248. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  249. data/spec/unit/indirector/certificate_revocation_list/ca_spec.rb +1 -2
  250. data/spec/unit/indirector/certificate_revocation_list/disabled_ca_spec.rb +1 -2
  251. data/spec/unit/indirector/certificate_revocation_list/file_spec.rb +1 -2
  252. data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +2 -3
  253. data/spec/unit/indirector/certificate_status/file_spec.rb +2 -3
  254. data/spec/unit/indirector/certificate_status/rest_spec.rb +0 -1
  255. data/spec/unit/indirector/code_spec.rb +5 -6
  256. data/spec/unit/indirector/direct_file_server_spec.rb +33 -27
  257. data/spec/unit/indirector/envelope_spec.rb +1 -2
  258. data/spec/unit/indirector/exec_spec.rb +15 -14
  259. data/spec/unit/indirector/face_spec.rb +9 -9
  260. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  261. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  262. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  263. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  264. data/spec/unit/indirector/facts/yaml_spec.rb +2 -4
  265. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  266. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  267. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  268. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  269. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  270. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  271. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  272. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  273. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  274. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  275. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  276. data/spec/unit/indirector/file_server_spec.rb +99 -93
  277. data/spec/unit/indirector/indirection_spec.rb +242 -226
  278. data/spec/unit/indirector/json_spec.rb +7 -9
  279. data/spec/unit/indirector/key/ca_spec.rb +2 -3
  280. data/spec/unit/indirector/key/disabled_ca_spec.rb +1 -2
  281. data/spec/unit/indirector/key/file_spec.rb +25 -26
  282. data/spec/unit/indirector/ldap_spec.rb +34 -41
  283. data/spec/unit/indirector/memory_spec.rb +6 -7
  284. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  285. data/spec/unit/indirector/node/exec_spec.rb +6 -6
  286. data/spec/unit/indirector/node/ldap_spec.rb +74 -76
  287. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  288. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  289. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  290. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  291. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  292. data/spec/unit/indirector/node/write_only_yaml_spec.rb +1 -2
  293. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  294. data/spec/unit/indirector/none_spec.rb +5 -5
  295. data/spec/unit/indirector/plain_spec.rb +7 -8
  296. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  297. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  298. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  299. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  300. data/spec/unit/indirector/request_spec.rb +11 -12
  301. data/spec/unit/indirector/resource/ral_spec.rb +47 -54
  302. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  303. data/spec/unit/indirector/rest_spec.rb +113 -110
  304. data/spec/unit/indirector/ssl_file_spec.rb +74 -77
  305. data/spec/unit/indirector/status/local_spec.rb +0 -1
  306. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  307. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  308. data/spec/unit/indirector/terminus_spec.rb +31 -29
  309. data/spec/unit/indirector/yaml_spec.rb +33 -32
  310. data/spec/unit/indirector_spec.rb +1 -2
  311. data/spec/unit/info_service_spec.rb +3 -1
  312. data/spec/unit/interface/action_builder_spec.rb +0 -1
  313. data/spec/unit/interface/action_manager_spec.rb +0 -1
  314. data/spec/unit/interface/action_spec.rb +2 -3
  315. data/spec/unit/interface/documentation_spec.rb +0 -1
  316. data/spec/unit/interface/face_collection_spec.rb +19 -12
  317. data/spec/unit/interface_spec.rb +3 -3
  318. data/spec/unit/man_spec.rb +3 -4
  319. data/spec/unit/module_spec.rb +46 -51
  320. data/spec/unit/module_tool/applications/builder_spec.rb +5 -5
  321. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  322. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  323. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  324. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  325. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  326. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  327. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  328. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  329. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  330. data/spec/unit/module_tool/tar_spec.rb +12 -13
  331. data/spec/unit/module_tool_spec.rb +7 -12
  332. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  333. data/spec/unit/network/authconfig_spec.rb +17 -18
  334. data/spec/unit/network/authorization_spec.rb +4 -5
  335. data/spec/unit/network/authstore_spec.rb +0 -1
  336. data/spec/unit/network/format_handler_spec.rb +0 -1
  337. data/spec/unit/network/format_spec.rb +9 -10
  338. data/spec/unit/network/format_support_spec.rb +28 -29
  339. data/spec/unit/network/formats_spec.rb +4 -5
  340. data/spec/unit/network/http/api/ca/v1_spec.rb +1 -1
  341. data/spec/unit/network/http/api/indirected_routes_spec.rb +22 -29
  342. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  343. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  344. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  345. data/spec/unit/network/http/api_spec.rb +1 -3
  346. data/spec/unit/network/http/compression_spec.rb +21 -22
  347. data/spec/unit/network/http/connection_spec.rb +39 -36
  348. data/spec/unit/network/http/factory_spec.rb +5 -6
  349. data/spec/unit/network/http/handler_spec.rb +9 -18
  350. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  351. data/spec/unit/network/http/pool_spec.rb +28 -29
  352. data/spec/unit/network/http/rack/rest_spec.rb +24 -27
  353. data/spec/unit/network/http/rack_spec.rb +5 -6
  354. data/spec/unit/network/http/request_spec.rb +0 -2
  355. data/spec/unit/network/http/response_spec.rb +11 -13
  356. data/spec/unit/network/http/route_spec.rb +0 -1
  357. data/spec/unit/network/http/session_spec.rb +1 -2
  358. data/spec/unit/network/http/site_spec.rb +0 -1
  359. data/spec/unit/network/http/webrick/rest_spec.rb +40 -41
  360. data/spec/unit/network/http/webrick_spec.rb +49 -52
  361. data/spec/unit/network/http_pool_spec.rb +18 -9
  362. data/spec/unit/network/http_spec.rb +0 -1
  363. data/spec/unit/network/resolver_spec.rb +16 -17
  364. data/spec/unit/network/rights_spec.rb +52 -53
  365. data/spec/unit/network/server_spec.rb +12 -13
  366. data/spec/unit/node/environment_spec.rb +16 -14
  367. data/spec/unit/node/facts_spec.rb +5 -7
  368. data/spec/unit/node_spec.rb +4 -10
  369. data/spec/unit/other/selinux_spec.rb +2 -3
  370. data/spec/unit/parameter/boolean_spec.rb +1 -2
  371. data/spec/unit/parameter/package_options_spec.rb +1 -2
  372. data/spec/unit/parameter/path_spec.rb +0 -1
  373. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  374. data/spec/unit/parameter/value_spec.rb +0 -1
  375. data/spec/unit/parameter_spec.rb +9 -9
  376. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  377. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  378. data/spec/unit/parser/compiler_spec.rb +84 -96
  379. data/spec/unit/parser/environment_compiler_spec.rb +11 -9
  380. data/spec/unit/parser/files_spec.rb +0 -1
  381. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  382. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  383. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  384. data/spec/unit/parser/functions/file_spec.rb +13 -14
  385. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  386. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  387. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  388. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  389. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  390. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  391. data/spec/unit/parser/functions/split_spec.rb +0 -1
  392. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  393. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  394. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  395. data/spec/unit/parser/functions/template_spec.rb +13 -13
  396. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  397. data/spec/unit/parser/functions_spec.rb +3 -4
  398. data/spec/unit/parser/relationship_spec.rb +0 -1
  399. data/spec/unit/parser/resource_spec.rb +42 -42
  400. data/spec/unit/parser/scope_spec.rb +39 -35
  401. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  402. data/spec/unit/parser/type_loader_spec.rb +17 -19
  403. data/spec/unit/pops/adaptable_spec.rb +0 -1
  404. data/spec/unit/pops/benchmark_spec.rb +0 -1
  405. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  406. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  407. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  408. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  409. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  410. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  411. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +6 -6
  412. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  413. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  414. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  415. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  416. data/spec/unit/pops/factory_spec.rb +3 -4
  417. data/spec/unit/pops/issues_spec.rb +19 -20
  418. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  419. data/spec/unit/pops/loaders/loaders_spec.rb +30 -27
  420. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  421. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  422. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  423. data/spec/unit/pops/migration_spec.rb +3 -5
  424. data/spec/unit/pops/model/model_spec.rb +0 -1
  425. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  426. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  427. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  428. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  429. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  430. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  431. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  432. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  433. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  434. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  435. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  436. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  437. data/spec/unit/pops/pn_spec.rb +0 -1
  438. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  439. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  440. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  441. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  442. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  443. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  444. data/spec/unit/pops/types/type_calculator_spec.rb +36 -36
  445. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  446. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  447. data/spec/unit/pops/visitor_spec.rb +0 -1
  448. data/spec/unit/property/boolean_spec.rb +1 -1
  449. data/spec/unit/property/ensure_spec.rb +0 -1
  450. data/spec/unit/property/keyvalue_spec.rb +32 -34
  451. data/spec/unit/property/list_spec.rb +26 -27
  452. data/spec/unit/property/ordered_list_spec.rb +10 -14
  453. data/spec/unit/property_spec.rb +42 -43
  454. data/spec/unit/provider/aix_object_spec.rb +47 -45
  455. data/spec/unit/provider/augeas/augeas_spec.rb +192 -192
  456. data/spec/unit/provider/cisco_spec.rb +1 -2
  457. data/spec/unit/provider/command_spec.rb +9 -9
  458. data/spec/unit/provider/cron/crontab_spec.rb +10 -11
  459. data/spec/unit/provider/cron/parsed_spec.rb +22 -24
  460. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  461. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  462. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  463. data/spec/unit/provider/exec_spec.rb +0 -1
  464. data/spec/unit/provider/file/posix_spec.rb +22 -24
  465. data/spec/unit/provider/file/windows_spec.rb +15 -17
  466. data/spec/unit/provider/group/aix_spec.rb +3 -2
  467. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  468. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  469. data/spec/unit/provider/group/pw_spec.rb +11 -11
  470. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  471. data/spec/unit/provider/host/parsed_spec.rb +6 -6
  472. data/spec/unit/provider/interface/cisco_spec.rb +20 -24
  473. data/spec/unit/provider/ldap_spec.rb +61 -62
  474. data/spec/unit/provider/macauthorization_spec.rb +26 -47
  475. data/spec/unit/provider/mcx/mcxcontent_spec.rb +45 -47
  476. data/spec/unit/provider/mount/parsed_spec.rb +18 -24
  477. data/spec/unit/provider/mount_spec.rb +57 -66
  478. data/spec/unit/provider/naginator_spec.rb +13 -14
  479. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  480. data/spec/unit/provider/nameservice_spec.rb +38 -40
  481. data/spec/unit/provider/network_device_spec.rb +28 -28
  482. data/spec/unit/provider/package/aix_spec.rb +15 -15
  483. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  484. data/spec/unit/provider/package/apt_spec.rb +44 -27
  485. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  486. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  487. data/spec/unit/provider/package/base_spec.rb +4 -4
  488. data/spec/unit/provider/package/dnf_spec.rb +14 -16
  489. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  490. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  491. data/spec/unit/provider/package/gem_spec.rb +51 -43
  492. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  493. data/spec/unit/provider/package/macports_spec.rb +46 -42
  494. data/spec/unit/provider/package/nim_spec.rb +30 -39
  495. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  496. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  497. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  498. data/spec/unit/provider/package/pip_spec.rb +69 -71
  499. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  500. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  501. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  502. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  503. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  504. data/spec/unit/provider/package/portage_spec.rb +70 -74
  505. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  506. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  507. data/spec/unit/provider/package/sun_spec.rb +16 -18
  508. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  509. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  510. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  511. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  512. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  513. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  514. data/spec/unit/provider/package/windows_spec.rb +36 -32
  515. data/spec/unit/provider/package/yum_spec.rb +4 -4
  516. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  517. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  518. data/spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb +120 -130
  519. data/spec/unit/provider/selboolean_spec.rb +9 -11
  520. data/spec/unit/provider/selmodule_spec.rb +20 -22
  521. data/spec/unit/provider/service/base_spec.rb +4 -5
  522. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  523. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  524. data/spec/unit/provider/service/debian_spec.rb +37 -37
  525. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  526. data/spec/unit/provider/service/gentoo_spec.rb +50 -56
  527. data/spec/unit/provider/service/init_spec.rb +55 -55
  528. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  529. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  530. data/spec/unit/provider/service/openrc_spec.rb +43 -46
  531. data/spec/unit/provider/service/openwrt_spec.rb +26 -32
  532. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  533. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  534. data/spec/unit/provider/service/runit_spec.rb +29 -27
  535. data/spec/unit/provider/service/smf_spec.rb +74 -66
  536. data/spec/unit/provider/service/src_spec.rb +46 -47
  537. data/spec/unit/provider/service/systemd_spec.rb +93 -98
  538. data/spec/unit/provider/service/upstart_spec.rb +74 -72
  539. data/spec/unit/provider/service/windows_spec.rb +33 -41
  540. data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +54 -68
  541. data/spec/unit/provider/sshkey/parsed_spec.rb +7 -8
  542. data/spec/unit/provider/user/aix_spec.rb +31 -31
  543. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  544. data/spec/unit/provider/user/hpux_spec.rb +15 -15
  545. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  546. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  547. data/spec/unit/provider/user/pw_spec.rb +37 -35
  548. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  549. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  550. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  551. data/spec/unit/provider/vlan/cisco_spec.rb +10 -12
  552. data/spec/unit/provider/yumrepo/inifile_spec.rb +75 -80
  553. data/spec/unit/provider/zfs/zfs_spec.rb +26 -21
  554. data/spec/unit/provider/zone/solaris_spec.rb +56 -42
  555. data/spec/unit/provider/zpool/zpool_spec.rb +19 -20
  556. data/spec/unit/provider_spec.rb +29 -29
  557. data/spec/unit/puppet_pal_2pec.rb +4 -5
  558. data/spec/unit/puppet_pal_spec.rb +0 -1
  559. data/spec/unit/puppet_spec.rb +7 -8
  560. data/spec/unit/relationship_spec.rb +0 -1
  561. data/spec/unit/reports/http_spec.rb +21 -23
  562. data/spec/unit/reports/store_spec.rb +3 -4
  563. data/spec/unit/reports_spec.rb +12 -14
  564. data/spec/unit/resource/capability_finder_spec.rb +18 -16
  565. data/spec/unit/resource/catalog_spec.rb +72 -68
  566. data/spec/unit/resource/status_spec.rb +6 -8
  567. data/spec/unit/resource/type_collection_spec.rb +17 -18
  568. data/spec/unit/resource/type_spec.rb +34 -35
  569. data/spec/unit/resource_spec.rb +36 -32
  570. data/spec/unit/scheduler/job_spec.rb +0 -1
  571. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  572. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  573. data/spec/unit/settings/array_setting_spec.rb +1 -1
  574. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  575. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  576. data/spec/unit/settings/config_file_spec.rb +0 -1
  577. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  578. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  579. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  580. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  581. data/spec/unit/settings/file_setting_spec.rb +44 -46
  582. data/spec/unit/settings/path_setting_spec.rb +1 -2
  583. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  584. data/spec/unit/settings/string_setting_spec.rb +14 -15
  585. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  586. data/spec/unit/settings/value_translator_spec.rb +0 -1
  587. data/spec/unit/settings_spec.rb +226 -233
  588. data/spec/unit/ssl/base_spec.rb +14 -15
  589. data/spec/unit/ssl/certificate_authority/autosign_command_spec.rb +6 -7
  590. data/spec/unit/ssl/certificate_authority/interface_spec.rb +116 -113
  591. data/spec/unit/ssl/certificate_authority_spec.rb +258 -268
  592. data/spec/unit/ssl/certificate_factory_spec.rb +3 -5
  593. data/spec/unit/ssl/certificate_request_attributes_spec.rb +2 -3
  594. data/spec/unit/ssl/certificate_request_spec.rb +66 -67
  595. data/spec/unit/ssl/certificate_revocation_list_spec.rb +3 -4
  596. data/spec/unit/ssl/certificate_spec.rb +23 -25
  597. data/spec/unit/ssl/configuration_spec.rb +1 -4
  598. data/spec/unit/ssl/digest_spec.rb +0 -1
  599. data/spec/unit/ssl/host_spec.rb +217 -188
  600. data/spec/unit/ssl/inventory_spec.rb +25 -21
  601. data/spec/unit/ssl/key_spec.rb +30 -31
  602. data/spec/unit/ssl/validator_spec.rb +40 -40
  603. data/spec/unit/task_spec.rb +6 -7
  604. data/spec/unit/transaction/additional_resource_generator_spec.rb +6 -5
  605. data/spec/unit/transaction/event_manager_spec.rb +88 -88
  606. data/spec/unit/transaction/event_spec.rb +16 -15
  607. data/spec/unit/transaction/persistence_spec.rb +16 -17
  608. data/spec/unit/transaction/report_spec.rb +11 -12
  609. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  610. data/spec/unit/transaction_spec.rb +98 -100
  611. data/spec/unit/type/augeas_spec.rb +11 -10
  612. data/spec/unit/type/component_spec.rb +0 -1
  613. data/spec/unit/type/computer_spec.rb +7 -10
  614. data/spec/unit/type/cron_spec.rb +3 -7
  615. data/spec/unit/type/exec_spec.rb +60 -56
  616. data/spec/unit/type/file/checksum_spec.rb +9 -10
  617. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  618. data/spec/unit/type/file/content_spec.rb +58 -61
  619. data/spec/unit/type/file/ctime_spec.rb +0 -1
  620. data/spec/unit/type/file/ensure_spec.rb +12 -13
  621. data/spec/unit/type/file/group_spec.rb +5 -7
  622. data/spec/unit/type/file/mode_spec.rb +4 -6
  623. data/spec/unit/type/file/mtime_spec.rb +0 -1
  624. data/spec/unit/type/file/owner_spec.rb +6 -8
  625. data/spec/unit/type/file/selinux_spec.rb +17 -19
  626. data/spec/unit/type/file/source_spec.rb +104 -101
  627. data/spec/unit/type/file/type_spec.rb +0 -1
  628. data/spec/unit/type/file_spec.rb +195 -185
  629. data/spec/unit/type/filebucket_spec.rb +4 -5
  630. data/spec/unit/type/group_spec.rb +6 -8
  631. data/spec/unit/type/host_spec.rb +2 -3
  632. data/spec/unit/type/interface_spec.rb +2 -3
  633. data/spec/unit/type/k5login_spec.rb +3 -4
  634. data/spec/unit/type/macauthorization_spec.rb +6 -8
  635. data/spec/unit/type/mailalias_spec.rb +2 -3
  636. data/spec/unit/type/maillist_spec.rb +6 -9
  637. data/spec/unit/type/mcx_spec.rb +4 -8
  638. data/spec/unit/type/mount_spec.rb +26 -38
  639. data/spec/unit/type/nagios_spec.rb +0 -1
  640. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  641. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  642. data/spec/unit/type/package_spec.rb +53 -54
  643. data/spec/unit/type/resources_spec.rb +86 -88
  644. data/spec/unit/type/schedule_spec.rb +24 -26
  645. data/spec/unit/type/scheduled_task_spec.rb +1 -2
  646. data/spec/unit/type/selboolean_spec.rb +5 -6
  647. data/spec/unit/type/selmodule_spec.rb +0 -1
  648. data/spec/unit/type/service_spec.rb +47 -47
  649. data/spec/unit/type/ssh_authorized_key_spec.rb +5 -35
  650. data/spec/unit/type/sshkey_spec.rb +0 -2
  651. data/spec/unit/type/stage_spec.rb +0 -1
  652. data/spec/unit/type/tidy_spec.rb +61 -62
  653. data/spec/unit/type/user_spec.rb +41 -27
  654. data/spec/unit/type/vlan_spec.rb +2 -4
  655. data/spec/unit/type/whit_spec.rb +0 -1
  656. data/spec/unit/type/zfs_spec.rb +6 -7
  657. data/spec/unit/type/zone_spec.rb +14 -4
  658. data/spec/unit/type/zpool_spec.rb +4 -5
  659. data/spec/unit/type_spec.rb +54 -53
  660. data/spec/unit/util/at_fork_spec.rb +18 -19
  661. data/spec/unit/util/autoload_spec.rb +53 -54
  662. data/spec/unit/util/backups_spec.rb +34 -35
  663. data/spec/unit/util/character_encoding_spec.rb +8 -8
  664. data/spec/unit/util/checksums_spec.rb +38 -39
  665. data/spec/unit/util/colors_spec.rb +1 -2
  666. data/spec/unit/util/command_line_spec.rb +24 -25
  667. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  668. data/spec/unit/util/diff_spec.rb +7 -8
  669. data/spec/unit/util/errors_spec.rb +0 -1
  670. data/spec/unit/util/execution_spec.rb +187 -162
  671. data/spec/unit/util/execution_stub_spec.rb +0 -1
  672. data/spec/unit/util/feature_spec.rb +13 -13
  673. data/spec/unit/util/filetype_spec.rb +49 -49
  674. data/spec/unit/util/http_proxy_spec.rb +12 -12
  675. data/spec/unit/util/inifile_spec.rb +26 -31
  676. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  677. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  678. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  679. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  680. data/spec/unit/util/lockfile_spec.rb +0 -1
  681. data/spec/unit/util/log/destinations_spec.rb +30 -33
  682. data/spec/unit/util/log_spec.rb +35 -36
  683. data/spec/unit/util/logging_spec.rb +58 -66
  684. data/spec/unit/util/metric_spec.rb +0 -1
  685. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  686. data/spec/unit/util/multi_match_spec.rb +0 -1
  687. data/spec/unit/util/nagios_maker_spec.rb +35 -36
  688. data/spec/unit/util/network_device/cisco/device_spec.rb +59 -50
  689. data/spec/unit/util/network_device/cisco/facts_spec.rb +4 -5
  690. data/spec/unit/util/network_device/cisco/interface_spec.rb +29 -20
  691. data/spec/unit/util/network_device/config_spec.rb +0 -1
  692. data/spec/unit/util/network_device/ipcalc_spec.rb +0 -1
  693. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  694. data/spec/unit/util/network_device/transport/ssh_spec.rb +94 -60
  695. data/spec/unit/util/network_device/transport/telnet_spec.rb +18 -14
  696. data/spec/unit/util/network_device_spec.rb +7 -9
  697. data/spec/unit/util/package_spec.rb +0 -1
  698. data/spec/unit/util/pidlock_spec.rb +13 -14
  699. data/spec/unit/util/plist_spec.rb +40 -33
  700. data/spec/unit/util/posix_spec.rb +54 -51
  701. data/spec/unit/util/rdoc_spec.rb +9 -10
  702. data/spec/unit/util/reference_spec.rb +0 -1
  703. data/spec/unit/util/resource_template_spec.rb +20 -20
  704. data/spec/unit/util/retry_action_spec.rb +7 -8
  705. data/spec/unit/util/rubygems_spec.rb +14 -14
  706. data/spec/unit/util/run_mode_spec.rb +3 -4
  707. data/spec/unit/util/selinux_spec.rb +79 -72
  708. data/spec/unit/util/splayer_spec.rb +8 -9
  709. data/spec/unit/util/ssl_spec.rb +0 -1
  710. data/spec/unit/util/storage_spec.rb +3 -4
  711. data/spec/unit/util/suidmanager_spec.rb +45 -54
  712. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  713. data/spec/unit/util/tag_set_spec.rb +0 -1
  714. data/spec/unit/util/tagging_spec.rb +0 -1
  715. data/spec/unit/util/terminal_spec.rb +9 -10
  716. data/spec/unit/util/user_attr_spec.rb +1 -2
  717. data/spec/unit/util/warnings_spec.rb +3 -4
  718. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  719. data/spec/unit/util/watcher_spec.rb +51 -21
  720. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  721. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  722. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  723. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  724. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  725. data/spec/unit/util/windows/file_spec.rb +0 -1
  726. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  727. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  728. data/spec/unit/util/windows/service_spec.rb +66 -68
  729. data/spec/unit/util/windows/sid_spec.rb +11 -13
  730. data/spec/unit/util/windows/string_spec.rb +0 -1
  731. data/spec/unit/util_spec.rb +55 -59
  732. data/spec/unit/version_spec.rb +6 -6
  733. 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.features.expects(:microsoft_windows?).returns(false)
345
+ expect(Puppet.features).to receive(:microsoft_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'
@@ -19,29 +18,29 @@ describe Puppet::Util::Logging do
19
18
  end
20
19
 
21
20
  it "should have a method for sending a log with a specified log level" do
22
- @logger.expects(:to_s).returns "I'm a string!"
23
- Puppet::Util::Log.expects(:create).with { |args| args[:source] == "I'm a string!" and args[:level] == "loglevel" and args[:message] == "mymessage" }
21
+ expect(@logger).to receive(:to_s).and_return("I'm a string!")
22
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(source: "I'm a string!", level: "loglevel", message: "mymessage"))
24
23
 
25
24
  @logger.send_log "loglevel", "mymessage"
26
25
  end
27
26
 
28
27
  describe "when sending a log" do
29
28
  it "should use the Log's 'create' entrance method" do
30
- Puppet::Util::Log.expects(:create)
29
+ expect(Puppet::Util::Log).to receive(:create)
31
30
 
32
31
  @logger.notice "foo"
33
32
  end
34
33
 
35
34
  it "should send itself converted to a string as the log source" do
36
- @logger.expects(:to_s).returns "I'm a string!"
37
- Puppet::Util::Log.expects(:create).with { |args| args[:source] == "I'm a string!" }
35
+ expect(@logger).to receive(:to_s).and_return("I'm a string!")
36
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(source: "I'm a string!"))
38
37
 
39
38
  @logger.notice "foo"
40
39
  end
41
40
 
42
41
  it "should queue logs sent without a specified destination" do
43
42
  Puppet::Util::Log.close_all
44
- Puppet::Util::Log.expects(:queuemessage)
43
+ expect(Puppet::Util::Log).to receive(:queuemessage)
45
44
 
46
45
  @logger.notice "foo"
47
46
  end
@@ -49,9 +48,9 @@ describe Puppet::Util::Logging do
49
48
  it "should use the path of any provided resource type" do
50
49
  resource = Puppet::Type.type(:host).new :name => "foo"
51
50
 
52
- resource.expects(:path).returns "/path/to/host".to_sym
51
+ expect(resource).to receive(:path).and_return("/path/to/host".to_sym)
53
52
 
54
- Puppet::Util::Log.expects(:create).with { |args| args[:source] == "/path/to/host" }
53
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(source: "/path/to/host"))
55
54
 
56
55
  resource.notice "foo"
57
56
  end
@@ -61,21 +60,21 @@ describe Puppet::Util::Logging do
61
60
 
62
61
  param = resource.parameter(:name)
63
62
 
64
- param.expects(:path).returns "/path/to/param".to_sym
63
+ expect(param).to receive(:path).and_return("/path/to/param".to_sym)
65
64
 
66
- Puppet::Util::Log.expects(:create).with { |args| args[:source] == "/path/to/param" }
65
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(source: "/path/to/param"))
67
66
 
68
67
  param.notice "foo"
69
68
  end
70
69
 
71
70
  it "should send the provided argument as the log message" do
72
- Puppet::Util::Log.expects(:create).with { |args| args[:message] == "foo" }
71
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(message: "foo"))
73
72
 
74
73
  @logger.notice "foo"
75
74
  end
76
75
 
77
76
  it "should join any provided arguments into a single string for the message" do
78
- Puppet::Util::Log.expects(:create).with { |args| args[:message] == "foo bar baz" }
77
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(message: "foo bar baz"))
79
78
 
80
79
  @logger.notice ["foo", "bar", "baz"]
81
80
  end
@@ -86,7 +85,7 @@ describe Puppet::Util::Logging do
86
85
 
87
86
  @logger.send(attr.to_s + "=", "myval")
88
87
 
89
- Puppet::Util::Log.expects(:create).with { |args| args[attr] == "myval" }
88
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(attr => "myval"))
90
89
  @logger.notice "foo"
91
90
  end
92
91
  end
@@ -94,47 +93,41 @@ describe Puppet::Util::Logging do
94
93
 
95
94
  describe "when sending a deprecation warning" do
96
95
  it "does not log a message when deprecation warnings are disabled" do
97
- Puppet.expects(:[]).with(:disable_warnings).returns %w[deprecations]
98
- @logger.expects(:warning).never
96
+ expect(Puppet).to receive(:[]).with(:disable_warnings).and_return(%w[deprecations])
97
+ expect(@logger).not_to receive(:warning)
99
98
  @logger.deprecation_warning 'foo'
100
99
  end
101
100
 
102
101
  it "logs the message with warn" do
103
- @logger.expects(:warning).with do |msg|
104
- msg =~ /^foo\n/
105
- end
102
+ expect(@logger).to receive(:warning).with(/^foo\n/)
106
103
  @logger.deprecation_warning 'foo'
107
104
  end
108
105
 
109
106
  it "only logs each offending line once" do
110
- @logger.expects(:warning).with do |msg|
111
- msg =~ /^foo\n/
112
- end .once
107
+ expect(@logger).to receive(:warning).with(/^foo\n/).once
113
108
  5.times { @logger.deprecation_warning 'foo' }
114
109
  end
115
110
 
116
111
  it "ensures that deprecations from same origin are logged if their keys differ" do
117
- @logger.expects(:warning).with(regexp_matches(/deprecated foo/)).times(5)
112
+ expect(@logger).to receive(:warning).with(/deprecated foo/).exactly(5).times()
118
113
  5.times { |i| @logger.deprecation_warning('deprecated foo', :key => "foo#{i}") }
119
114
  end
120
115
 
121
116
  it "does not duplicate deprecations for a given key" do
122
- @logger.expects(:warning).with(regexp_matches(/deprecated foo/)).once
117
+ expect(@logger).to receive(:warning).with(/deprecated foo/).once
123
118
  5.times { @logger.deprecation_warning('deprecated foo', :key => 'foo-msg') }
124
119
  end
125
120
 
126
121
  it "only logs the first 100 messages" do
127
122
  (1..100).each { |i|
128
- @logger.expects(:warning).with do |msg|
129
- msg =~ /^#{i}\n/
130
- end .once
123
+ expect(@logger).to receive(:warning).with(/^#{i}\n/).once
131
124
  # since the deprecation warning will only log each offending line once, we have to do some tomfoolery
132
125
  # here in order to make it think each of these calls is coming from a unique call stack; we're basically
133
126
  # mocking the method that it would normally use to find the call stack.
134
- @logger.expects(:get_deprecation_offender).returns(["deprecation log count test ##{i}"])
127
+ expect(@logger).to receive(:get_deprecation_offender).and_return(["deprecation log count test ##{i}"])
135
128
  @logger.deprecation_warning i
136
129
  }
137
- @logger.expects(:warning).with(101).never
130
+ expect(@logger).not_to receive(:warning).with(101)
138
131
  @logger.deprecation_warning 101
139
132
  end
140
133
  end
@@ -154,25 +147,25 @@ describe Puppet::Util::Logging do
154
147
  end
155
148
 
156
149
  it "warns with file and line" do
157
- @logger.expects(:warning).with(regexp_matches(/deprecated foo.*\(file: afile, line: 5\)/m))
150
+ expect(@logger).to receive(:warning).with(/deprecated foo.*\(file: afile, line: 5\)/m)
158
151
  @logger.puppet_deprecation_warning("deprecated foo", :file => 'afile', :line => 5)
159
152
  end
160
153
 
161
154
  it "warns keyed from file and line" do
162
- @logger.expects(:warning).with(regexp_matches(/deprecated foo.*\(file: afile, line: 5\)/m)).once
155
+ expect(@logger).to receive(:warning).with(/deprecated foo.*\(file: afile, line: 5\)/m).once
163
156
  5.times do
164
157
  @logger.puppet_deprecation_warning("deprecated foo", :file => 'afile', :line => 5)
165
158
  end
166
159
  end
167
160
 
168
161
  it "warns with separate key only once regardless of file and line" do
169
- @logger.expects(:warning).with(regexp_matches(/deprecated foo.*\(file: afile, line: 5\)/m)).once
162
+ expect(@logger).to receive(:warning).with(/deprecated foo.*\(file: afile, line: 5\)/m).once
170
163
  @logger.puppet_deprecation_warning("deprecated foo", :key => 'some_key', :file => 'afile', :line => 5)
171
164
  @logger.puppet_deprecation_warning("deprecated foo", :key => 'some_key', :file => 'bfile', :line => 3)
172
165
  end
173
166
 
174
167
  it "warns with key but no file and line" do
175
- @logger.expects(:warning).with(regexp_matches(/deprecated foo.*\(file: unknown, line: unknown\)/m))
168
+ expect(@logger).to receive(:warning).with(/deprecated foo.*\(file: unknown, line: unknown\)/m)
176
169
  @logger.puppet_deprecation_warning("deprecated foo", :key => 'some_key')
177
170
  end
178
171
  end
@@ -181,29 +174,24 @@ describe Puppet::Util::Logging do
181
174
  before(:each) {
182
175
  @logger.clear_deprecation_warnings
183
176
  }
184
- after(:each) {
185
- # this is required because of bugs in Mocha whe tearing down expectations for each test
186
- # why it works elsewhere is a mystery.
187
- @logger.unstub(:send_log)
188
- }
189
177
 
190
178
  it "warns with file when only file is given" do
191
- @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*\(file: aFile\)/m))
179
+ expect(@logger).to receive(:send_log).with(:warning, /wet paint.*\(file: aFile\)/m)
192
180
  @logger.warn_once('kind', 'wp', "wet paint", 'aFile')
193
181
  end
194
182
 
195
183
  it "warns with unknown file and line when only line is given" do
196
- @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*\(line: 5\)/m))
184
+ expect(@logger).to receive(:send_log).with(:warning, /wet paint.*\(line: 5\)/m)
197
185
  @logger.warn_once('kind', 'wp', "wet paint", nil, 5)
198
186
  end
199
187
 
200
188
  it "warns with file and line when both are given" do
201
- @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*\(file: aFile, line: 5\)/m))
189
+ expect(@logger).to receive(:send_log).with(:warning, /wet paint.*\(file: aFile, line: 5\)/m)
202
190
  @logger.warn_once('kind', 'wp', "wet paint",'aFile', 5)
203
191
  end
204
192
 
205
193
  it "warns once per key" do
206
- @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*/m)).once
194
+ expect(@logger).to receive(:send_log).with(:warning, /wet paint.*/m).once
207
195
  5.times do
208
196
  @logger.warn_once('kind', 'wp', "wet paint")
209
197
  end
@@ -211,7 +199,7 @@ describe Puppet::Util::Logging do
211
199
 
212
200
  Puppet::Util::Log.eachlevel do |level|
213
201
  it "can use log level #{level}" do
214
- @logger.expects(:send_log).with(level, regexp_matches(/wet paint.*/m)).once
202
+ expect(@logger).to receive(:send_log).with(level, /wet paint.*/m).once
215
203
  5.times do
216
204
  @logger.warn_once('kind', 'wp', "wet paint", nil, nil, level)
217
205
  end
@@ -222,17 +210,21 @@ describe Puppet::Util::Logging do
222
210
  describe "does not warn about undefined variables when disabled_warnings says so" do
223
211
  let(:logger) { LoggingTester.new }
224
212
 
225
- around(:each) do |example|
213
+ before(:each) do
226
214
  Puppet.settings.initialize_global_settings
227
215
  logger.clear_deprecation_warnings
228
216
  Puppet[:disable_warnings] = ['undefined_variables']
229
- example.run
217
+ end
218
+
219
+ after(:each) do
230
220
  Puppet[:disable_warnings] = []
231
- logger.unstub(:send_log)
221
+ allow(Facter).to receive(:respond_to?).and_call_original()
222
+ allow(Facter).to receive(:debugging).and_call_original()
223
+ allow(logger).to receive(:send_log).and_call_original()
232
224
  end
233
225
 
234
226
  it "does not produce warning if kind is disabled" do
235
- logger.expects(:send_log).never
227
+ expect(logger).not_to receive(:send_log)
236
228
  logger.warn_once('undefined_variables', 'wp', "wet paint")
237
229
  end
238
230
  end
@@ -240,17 +232,21 @@ describe Puppet::Util::Logging do
240
232
  describe "warns about undefined variables when deprecations are in disabled_warnings" do
241
233
  let(:logger) { LoggingTester.new }
242
234
 
243
- around(:each) do |example|
235
+ before(:each) do
244
236
  Puppet.settings.initialize_global_settings
245
237
  logger.clear_deprecation_warnings
246
238
  Puppet[:disable_warnings] = ['deprecations']
247
- example.run
239
+ end
240
+
241
+ after(:each) do
248
242
  Puppet[:disable_warnings] = []
249
- logger.unstub(:send_log)
243
+ allow(Facter).to receive(:respond_to?).and_call_original()
244
+ allow(Facter).to receive(:debugging).and_call_original()
245
+ allow(logger).to receive(:send_log).and_call_original()
250
246
  end
251
247
 
252
248
  it "produces warning even if deprecation warnings are disabled " do
253
- logger.expects(:send_log).with(:warning, regexp_matches(/wet paint/)).once
249
+ expect(logger).to receive(:send_log).with(:warning, /wet paint/).once
254
250
  logger.warn_once('undefined_variables', 'wp', "wet paint")
255
251
  end
256
252
  end
@@ -285,49 +281,49 @@ original
285
281
  after :each do
286
282
  # Unstub these calls as there is global code run after
287
283
  # each spec that may reset the log level to debug
288
- Facter.unstub(:respond_to?)
289
- Facter.unstub(:debugging)
284
+ allow(Facter).to receive(:respond_to?).and_call_original()
285
+ allow(Facter).to receive(:debugging).and_call_original()
290
286
  end
291
287
 
292
288
  describe 'does support debugging' do
293
289
  before :each do
294
- Facter.stubs(:respond_to?).with(:debugging).returns true
290
+ allow(Facter).to receive(:respond_to?).with(:debugging).and_return(true)
295
291
  end
296
292
 
297
293
  it 'enables Facter debugging when debug level' do
298
- Facter.stubs(:debugging).with(true)
294
+ allow(Facter).to receive(:debugging).with(true)
299
295
  Puppet::Util::Log.level = :debug
300
296
  end
301
297
 
302
298
  it 'disables Facter debugging when not debug level' do
303
- Facter.stubs(:debugging).with(false)
299
+ allow(Facter).to receive(:debugging).with(false)
304
300
  Puppet::Util::Log.level = :info
305
301
  end
306
302
  end
307
303
 
308
304
  describe 'does support trace' do
309
305
  before :each do
310
- Facter.stubs(:respond_to?).with(:trace).returns true
306
+ allow(Facter).to receive(:respond_to?).with(:trace).and_return(true)
311
307
  end
312
308
 
313
309
  it 'enables Facter trace when enabled' do
314
- Facter.stubs(:trace).with(true)
310
+ allow(Facter).to receive(:trace).with(true)
315
311
  Puppet[:trace] = true
316
312
  end
317
313
 
318
314
  it 'disables Facter trace when disabled' do
319
- Facter.stubs(:trace).with(false)
315
+ allow(Facter).to receive(:trace).with(false)
320
316
  Puppet[:trace] = false
321
317
  end
322
318
  end
323
319
 
324
320
  describe 'does support on_message' do
325
321
  before :each do
326
- Facter.stubs(:respond_to?).with(:on_message).returns true
322
+ allow(Facter).to receive(:respond_to?).with(:on_message).and_return(true)
327
323
  end
328
324
 
329
325
  def setup(level, message)
330
- Facter.stubs(:on_message).yields level, message
326
+ allow(Facter).to receive(:on_message).and_yield(level, message)
331
327
 
332
328
  # Transform from Facter level to Puppet level
333
329
  case level
@@ -341,11 +337,7 @@ original
341
337
  level = :crit
342
338
  end
343
339
 
344
- Puppet::Util::Log.stubs(:create).with do |options|
345
- expect(options[:level]).to eq(level)
346
- expect(options[:message]).to eq(message)
347
- expect(options[:source]).to eq('Facter')
348
- end.once
340
+ allow(Puppet::Util::Log).to receive(:create).with(hash_including(level: level, message: message, source: 'Facter')).once
349
341
  end
350
342
 
351
343
  [:trace, :debug, :info, :warn, :error, :fatal].each do |level|