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/transaction/event'
@@ -31,7 +30,7 @@ describe Puppet::Transaction::Event do
31
30
 
32
31
  it "should produce the message when converted to a string" do
33
32
  event = Puppet::Transaction::Event.new
34
- event.expects(:message).returns "my message"
33
+ expect(event).to receive(:message).and_return("my message")
35
34
  expect(event.to_s).to eq("my message")
36
35
  end
37
36
 
@@ -62,60 +61,62 @@ describe Puppet::Transaction::Event do
62
61
 
63
62
  describe "when sending logs" do
64
63
  before do
65
- Puppet::Util::Log.stubs(:new)
64
+ allow(Puppet::Util::Log).to receive(:new)
66
65
  end
67
66
 
68
67
  it "should set the level to the resources's log level if the event status is 'success' and a resource is available" do
69
- resource = stub 'resource'
70
- resource.expects(:[]).with(:loglevel).returns :myloglevel
71
- Puppet::Util::Log.expects(:create).with { |args| args[:level] == :myloglevel }
68
+ resource = double('resource')
69
+ expect(resource).to receive(:[]).with(:loglevel).and_return(:myloglevel)
70
+ expect(Puppet::Util::Log).to receive(:create).with(hash_including(level: :myloglevel))
72
71
  Puppet::Transaction::Event.new(:status => "success", :resource => resource).send_log
73
72
  end
74
73
 
75
74
  it "should set the level to 'notice' if the event status is 'success' and no resource is available" do
76
- Puppet::Util::Log.expects(:new).with { |args| args[:level] == :notice }
75
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(level: :notice))
77
76
  Puppet::Transaction::Event.new(:status => "success").send_log
78
77
  end
79
78
 
80
79
  it "should set the level to 'notice' if the event status is 'noop'" do
81
- Puppet::Util::Log.expects(:new).with { |args| args[:level] == :notice }
80
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(level: :notice))
82
81
  Puppet::Transaction::Event.new(:status => "noop").send_log
83
82
  end
84
83
 
85
84
  it "should set the level to 'err' if the event status is 'failure'" do
86
- Puppet::Util::Log.expects(:new).with { |args| args[:level] == :err }
85
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(level: :err))
87
86
  Puppet::Transaction::Event.new(:status => "failure").send_log
88
87
  end
89
88
 
90
89
  it "should set the 'message' to the event log" do
91
- Puppet::Util::Log.expects(:new).with { |args| args[:message] == "my message" }
90
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(message: "my message"))
92
91
  Puppet::Transaction::Event.new(:message => "my message").send_log
93
92
  end
94
93
 
95
94
  it "should set the tags to the event tags" do
96
- Puppet::Util::Log.expects(:new).with { |args| expect(args[:tags].to_a).to match_array(%w{one two}) }
95
+ expect(Puppet::Util::Log).to receive(:new) do |args|
96
+ expect(args[:tags].to_a).to match_array(%w{one two})
97
+ end
97
98
  Puppet::Transaction::Event.new(:tags => %w{one two}).send_log
98
99
  end
99
100
 
100
101
  [:file, :line].each do |attr|
101
102
  it "should pass the #{attr}" do
102
- Puppet::Util::Log.expects(:new).with { |args| args[attr] == "my val" }
103
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(attr => "my val"))
103
104
  Puppet::Transaction::Event.new(attr => "my val").send_log
104
105
  end
105
106
  end
106
107
 
107
108
  it "should use the source description as the source if one is set" do
108
- Puppet::Util::Log.expects(:new).with { |args| args[:source] == "/my/param" }
109
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(source: "/my/param"))
109
110
  Puppet::Transaction::Event.new(:source_description => "/my/param", :resource => TestResource.new, :property => "foo").send_log
110
111
  end
111
112
 
112
113
  it "should use the property as the source if one is available and no source description is set" do
113
- Puppet::Util::Log.expects(:new).with { |args| args[:source] == "foo" }
114
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(source: "foo"))
114
115
  Puppet::Transaction::Event.new(:resource => TestResource.new, :property => "foo").send_log
115
116
  end
116
117
 
117
118
  it "should use the property as the source if one is available and no property or source description is set" do
118
- Puppet::Util::Log.expects(:new).with { |args| args[:source] == "Foo[bar]" }
119
+ expect(Puppet::Util::Log).to receive(:new).with(hash_including(source: "Foo[bar]"))
119
120
  Puppet::Transaction::Event.new(:resource => TestResource.new).send_log
120
121
  end
121
122
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'yaml'
@@ -14,7 +13,7 @@ describe Puppet::Transaction::Persistence do
14
13
 
15
14
  describe "when loading from file" do
16
15
  before do
17
- Puppet.settings.stubs(:use).returns(true)
16
+ allow(Puppet.settings).to receive(:use).and_return(true)
18
17
  end
19
18
 
20
19
  describe "when the file/directory does not exist" do
@@ -48,7 +47,7 @@ describe Puppet::Transaction::Persistence do
48
47
  property = "my"
49
48
  value = "something"
50
49
 
51
- Puppet.expects(:err).never
50
+ expect(Puppet).not_to receive(:err)
52
51
 
53
52
  persistence = Puppet::Transaction::Persistence.new
54
53
  persistence.set_system_value(resource, property, value)
@@ -62,7 +61,7 @@ describe Puppet::Transaction::Persistence do
62
61
  test_yaml = {"resources"=>{"a"=>"b"}}
63
62
  write_state_file(test_yaml.to_yaml)
64
63
 
65
- Puppet.expects(:err).never
64
+ expect(Puppet).not_to receive(:err)
66
65
 
67
66
  persistence = Puppet::Transaction::Persistence.new
68
67
  persistence.load
@@ -73,7 +72,7 @@ describe Puppet::Transaction::Persistence do
73
72
  it "should initialize with a clear internal state if the file does not contain valid YAML" do
74
73
  write_state_file('{ invalid')
75
74
 
76
- Puppet.expects(:err).with(regexp_matches(/Transaction store file .* is corrupt/))
75
+ expect(Puppet).to receive(:err).with(/Transaction store file .* is corrupt/)
77
76
 
78
77
  persistence = Puppet::Transaction::Persistence.new
79
78
  persistence.load
@@ -84,7 +83,7 @@ describe Puppet::Transaction::Persistence do
84
83
  it "should initialize with a clear internal state if the file does not contain a hash of data" do
85
84
  write_state_file("not_a_hash")
86
85
 
87
- Puppet.expects(:err).with(regexp_matches(/Transaction store file .* is valid YAML but not returning a hash/))
86
+ expect(Puppet).to receive(:err).with(/Transaction store file .* is valid YAML but not returning a hash/)
88
87
 
89
88
  persistence = Puppet::Transaction::Persistence.new
90
89
  persistence.load
@@ -95,10 +94,10 @@ describe Puppet::Transaction::Persistence do
95
94
  it "should raise an error if the file does not contain valid YAML and cannot be renamed" do
96
95
  write_state_file('{ invalid')
97
96
 
98
- File.expects(:rename).raises(SystemCallError)
97
+ expect(File).to receive(:rename).and_raise(SystemCallError)
99
98
 
100
- Puppet.expects(:err).with(regexp_matches(/Transaction store file .* is corrupt/))
101
- Puppet.expects(:err).with(regexp_matches(/Unable to rename/))
99
+ expect(Puppet).to receive(:err).with(/Transaction store file .* is corrupt/)
100
+ expect(Puppet).to receive(:err).with(/Unable to rename/)
102
101
 
103
102
  persistence = Puppet::Transaction::Persistence.new
104
103
  expect { persistence.load }.to raise_error(Puppet::Error, /Could not rename/)
@@ -107,9 +106,9 @@ describe Puppet::Transaction::Persistence do
107
106
  it "should attempt to rename the file if the file is corrupted" do
108
107
  write_state_file('{ invalid')
109
108
 
110
- File.expects(:rename).at_least_once
109
+ expect(File).to receive(:rename).at_least(:once)
111
110
 
112
- Puppet.expects(:err).with(regexp_matches(/Transaction store file .* is corrupt/))
111
+ expect(Puppet).to receive(:err).with(/Transaction store file .* is corrupt/)
113
112
 
114
113
  persistence = Puppet::Transaction::Persistence.new
115
114
  persistence.load
@@ -119,7 +118,7 @@ describe Puppet::Transaction::Persistence do
119
118
  FileUtils.rm_f(@tmpfile)
120
119
  Dir.mkdir(@tmpfile)
121
120
 
122
- Puppet.expects(:warning).with(regexp_matches(/Transaction store file .* is not a file/))
121
+ expect(Puppet).to receive(:warning).with(/Transaction store file .* is not a file/)
123
122
 
124
123
  persistence = Puppet::Transaction::Persistence.new
125
124
  persistence.load
@@ -178,7 +177,7 @@ describe Puppet::Transaction::Persistence do
178
177
 
179
178
  describe "when checking if persistence is enabled" do
180
179
  let(:mock_catalog) do
181
- mock
180
+ double()
182
181
  end
183
182
 
184
183
  let (:persistence) do
@@ -195,25 +194,25 @@ describe Puppet::Transaction::Persistence do
195
194
 
196
195
  it "should not be enabled when not running in agent mode" do
197
196
  Puppet.settings.preferred_run_mode = :user
198
- mock_catalog.stubs(:host_config?).returns(true)
197
+ allow(mock_catalog).to receive(:host_config?).and_return(true)
199
198
  expect(persistence.enabled?(mock_catalog)).to be false
200
199
  end
201
200
 
202
201
  it "should not be enabled when the catalog is not the host catalog" do
203
202
  Puppet.settings.preferred_run_mode = :agent
204
- mock_catalog.stubs(:host_config?).returns(false)
203
+ allow(mock_catalog).to receive(:host_config?).and_return(false)
205
204
  expect(persistence.enabled?(mock_catalog)).to be false
206
205
  end
207
206
 
208
207
  it "should not be enabled outside of agent mode and the catalog is not the host catalog" do
209
208
  Puppet.settings.preferred_run_mode = :user
210
- mock_catalog.stubs(:host_config?).returns(false)
209
+ allow(mock_catalog).to receive(:host_config?).and_return(false)
211
210
  expect(persistence.enabled?(mock_catalog)).to be false
212
211
  end
213
212
 
214
213
  it "should be enabled in agent mode and when the catalog is the host catalog" do
215
214
  Puppet.settings.preferred_run_mode = :agent
216
- mock_catalog.stubs(:host_config?).returns(true)
215
+ allow(mock_catalog).to receive(:host_config?).and_return(true)
217
216
  expect(persistence.enabled?(mock_catalog)).to be true
218
217
  end
219
218
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet'
@@ -10,7 +9,7 @@ describe Puppet::Transaction::Report do
10
9
  include PuppetSpec::Files
11
10
 
12
11
  before do
13
- Puppet::Util::Storage.stubs(:store)
12
+ allow(Puppet::Util::Storage).to receive(:store)
14
13
  end
15
14
 
16
15
  it "should set its host name to the node_name_value" do
@@ -24,7 +23,7 @@ describe Puppet::Transaction::Report do
24
23
  end
25
24
 
26
25
  it "should create an initialization timestamp" do
27
- Time.expects(:now).returns "mytime"
26
+ expect(Time).to receive(:now).and_return("mytime")
28
27
  expect(Puppet::Transaction::Report.new.time).to eq("mytime")
29
28
  end
30
29
 
@@ -116,7 +115,7 @@ describe Puppet::Transaction::Report do
116
115
  end
117
116
 
118
117
  it "should not include whits" do
119
- Puppet::FileBucket::File.indirection.stubs(:save)
118
+ allow(Puppet::FileBucket::File.indirection).to receive(:save)
120
119
 
121
120
  filename = tmpfile('whit_test')
122
121
  file = Puppet::Type.type(:file).new(:path => filename)
@@ -167,7 +166,7 @@ describe Puppet::Transaction::Report do
167
166
  end
168
167
 
169
168
  it "should add each status to its status list" do
170
- status = stub 'status', :resource => "foo"
169
+ status = double('status', :resource => "foo")
171
170
  @report.add_resource_status status
172
171
  expect(@report.resource_statuses["foo"]).to equal(status)
173
172
  end
@@ -175,11 +174,11 @@ describe Puppet::Transaction::Report do
175
174
 
176
175
  describe "when using the indirector" do
177
176
  it "should redirect :save to the indirection" do
178
- Facter.stubs(:value).returns("eh")
179
- @indirection = stub 'indirection', :name => :report
180
- Puppet::Transaction::Report.stubs(:indirection).returns(@indirection)
177
+ allow(Facter).to receive(:value).and_return("eh")
178
+ @indirection = double('indirection', :name => :report)
179
+ allow(Puppet::Transaction::Report).to receive(:indirection).and_return(@indirection)
181
180
  report = Puppet::Transaction::Report.new
182
- @indirection.expects(:save)
181
+ expect(@indirection).to receive(:save)
183
182
  Puppet::Transaction::Report.indirection.save(report)
184
183
  end
185
184
 
@@ -189,7 +188,7 @@ describe Puppet::Transaction::Report do
189
188
 
190
189
  it "should delegate its name attribute to its host method" do
191
190
  report = Puppet::Transaction::Report.new
192
- report.expects(:host).returns "me"
191
+ expect(report).to receive(:host).and_return("me")
193
192
  expect(report.name).to eq("me")
194
193
  end
195
194
  end
@@ -455,7 +454,7 @@ describe Puppet::Transaction::Report do
455
454
 
456
455
  describe "when producing a summary" do
457
456
  before do
458
- Benchmark.stubs(:realtime).returns(5.05683418)
457
+ allow(Benchmark).to receive(:realtime).and_return(5.05683418)
459
458
  resource = Puppet::Type.type(:notify).new(:name => "testing")
460
459
  catalog = Puppet::Resource::Catalog.new
461
460
  catalog.add_resource resource
@@ -474,7 +473,7 @@ describe Puppet::Transaction::Report do
474
473
  end
475
474
 
476
475
  it "should include the last run time in the raw summary hash" do
477
- Time.stubs(:now).returns(Time.utc(2010,11,10,12,0,24))
476
+ allow(Time).to receive(:now).and_return(Time.utc(2010,11,10,12,0,24))
478
477
  expect(@report.raw_summary["time"]["last_run"]).to eq(1289390424)
479
478
  end
480
479
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/transaction/resource_harness'
@@ -15,7 +14,7 @@ describe Puppet::Transaction::ResourceHarness do
15
14
  @resource = Puppet::Type.type(:file).new :path => path
16
15
  @harness = Puppet::Transaction::ResourceHarness.new(@transaction)
17
16
  @current_state = Puppet::Resource.new(:file, path)
18
- @resource.stubs(:retrieve).returns @current_state
17
+ allow(@resource).to receive(:retrieve).and_return(@current_state)
19
18
  end
20
19
 
21
20
  it "should accept a transaction at initialization" do
@@ -24,7 +23,7 @@ describe Puppet::Transaction::ResourceHarness do
24
23
  end
25
24
 
26
25
  it "should delegate to the transaction for its relationship graph" do
27
- @transaction.expects(:relationship_graph).returns "relgraph"
26
+ expect(@transaction).to receive(:relationship_graph).and_return("relgraph")
28
27
  expect(Puppet::Transaction::ResourceHarness.new(@transaction).relationship_graph).to eq("relgraph")
29
28
  end
30
29
 
@@ -38,14 +37,14 @@ describe Puppet::Transaction::ResourceHarness do
38
37
  end
39
38
 
40
39
  it "retrieves the current state of the resource" do
41
- @resource.expects(:retrieve).returns @current_state
40
+ expect(@resource).to receive(:retrieve).and_return(@current_state)
42
41
 
43
42
  @harness.evaluate(@resource)
44
43
  end
45
44
 
46
45
  it "produces a failure status for the resource when an error occurs" do
47
46
  the_message = "retrieve failed in testing"
48
- @resource.expects(:retrieve).raises(ArgumentError.new(the_message))
47
+ expect(@resource).to receive(:retrieve).and_raise(ArgumentError.new(the_message))
49
48
 
50
49
  status = @harness.evaluate(@resource)
51
50
 
@@ -290,7 +289,7 @@ describe Puppet::Transaction::ResourceHarness do
290
289
  before :each do
291
290
  stub_provider = make_stub_provider
292
291
  resource = stub_provider.new :name => 'name', :foo => 1, :bar => 2
293
- resource.expects(:err).never
292
+ expect(resource).not_to receive(:err)
294
293
  @status = @harness.evaluate(resource)
295
294
  end
296
295
 
@@ -309,7 +308,7 @@ describe Puppet::Transaction::ResourceHarness do
309
308
  before :each do
310
309
  stub_provider = make_stub_provider
311
310
  @resource = stub_provider.new :name => 'name', :baz => 1
312
- @resource.expects(:err).never
311
+ expect(@resource).not_to receive(:err)
313
312
  end
314
313
 
315
314
  it "should log and pass the exception through" do
@@ -323,7 +322,7 @@ describe Puppet::Transaction::ResourceHarness do
323
322
  before :each do
324
323
  stub_provider = make_stub_provider
325
324
  @resource = stub_provider.new :name => 'name', :brillig => 1
326
- @resource.expects(:err).never
325
+ expect(@resource).not_to receive(:err)
327
326
  end
328
327
 
329
328
  it "should record a failure event" do
@@ -338,7 +337,7 @@ describe Puppet::Transaction::ResourceHarness do
338
337
  before :each do
339
338
  stub_provider = make_stub_provider
340
339
  @resource = stub_provider.new :name => 'name', :slithy => 1
341
- @resource.expects(:err).never
340
+ expect(@resource).not_to receive(:err)
342
341
  end
343
342
 
344
343
  it "should log and pass the exception through" do
@@ -352,7 +351,7 @@ describe Puppet::Transaction::ResourceHarness do
352
351
  it "should not call insync? on parameters that are merely audited" do
353
352
  stub_provider = make_stub_provider
354
353
  resource = stub_provider.new :name => 'name', :audit => ['foo']
355
- resource.property(:foo).expects(:insync?).never
354
+ expect(resource.property(:foo)).not_to receive(:insync?)
356
355
  status = @harness.evaluate(resource)
357
356
 
358
357
  expect(status.events).to be_empty
@@ -362,7 +361,7 @@ describe Puppet::Transaction::ResourceHarness do
362
361
  test_file = tmpfile('foo')
363
362
  File.open(test_file, 'w').close
364
363
  resource = Puppet::Type.type(:file).new :path => test_file, :audit => ['group'], :backup => false
365
- resource.expects(:err).never # make sure no exceptions get swallowed
364
+ expect(resource).not_to receive(:err) # make sure no exceptions get swallowed
366
365
 
367
366
  status = @harness.evaluate(resource)
368
367
 
@@ -388,11 +387,9 @@ describe Puppet::Transaction::ResourceHarness do
388
387
  # set up the sequence of stubs; yeah, this is pretty
389
388
  # brittle, so this might need to be adjusted if the
390
389
  # resource_harness logic changes
391
- resource.expects(:retrieve).returns(current_from_filesystem)
392
- Puppet::Util::Storage.stubs(:cache).with(resource).
393
- returns(historical_from_state_yaml).then.
394
- returns(current_from_filesystem).then.
395
- returns(current_from_filesystem)
390
+ expect(resource).to receive(:retrieve).and_return(current_from_filesystem)
391
+ allow(Puppet::Util::Storage).to receive(:cache).with(resource).
392
+ and_return(historical_from_state_yaml, current_from_filesystem, current_from_filesystem)
396
393
 
397
394
  # there should be an audit change recorded, since the two
398
395
  # timestamps differ by at least 1 microsecond
@@ -421,11 +418,9 @@ describe Puppet::Transaction::ResourceHarness do
421
418
  # set up the sequence of stubs; yeah, this is pretty
422
419
  # brittle, so this might need to be adjusted if the
423
420
  # resource_harness logic changes
424
- resource.expects(:retrieve).returns(current_from_filesystem)
425
- Puppet::Util::Storage.stubs(:cache).with(resource).
426
- returns(historical_from_state_yaml).then.
427
- returns(current_from_filesystem).then.
428
- returns(current_from_filesystem)
421
+ expect(resource).to receive(:retrieve).and_return(current_from_filesystem)
422
+ allow(Puppet::Util::Storage).to receive(:cache).with(resource).
423
+ and_return(historical_from_state_yaml, current_from_filesystem, current_from_filesystem)
429
424
 
430
425
  # there should be no audit change recorded, despite the
431
426
  # slight difference in the two timestamps
@@ -476,19 +471,19 @@ describe Puppet::Transaction::ResourceHarness do
476
471
  end
477
472
 
478
473
  it "redacts notices when a parameter is newly audited" do
479
- resource.property(:content).expects(:notice).with("audit change: newly-recorded value [redacted]")
474
+ expect(resource.property(:content)).to receive(:notice).with("audit change: newly-recorded value [redacted]")
480
475
  @harness.evaluate(resource)
481
476
  end
482
477
 
483
478
  it "redacts event messages for sensitive properties" do
484
- Puppet::Util::Storage.stubs(:cache).with(resource).returns({:content => "historical world"})
479
+ allow(Puppet::Util::Storage).to receive(:cache).with(resource).and_return({:content => "historical world"})
485
480
  status = @harness.evaluate(resource)
486
481
  sync_event = status.events[0]
487
482
  expect(sync_event.message).to eq 'changed [redacted] to [redacted] (previously recorded value was [redacted])'
488
483
  end
489
484
 
490
485
  it "redacts audit event messages for sensitive properties when simulating noop changes" do
491
- Puppet::Util::Storage.stubs(:cache).with(resource).returns({:content => "historical world"})
486
+ allow(Puppet::Util::Storage).to receive(:cache).with(resource).and_return({:content => "historical world"})
492
487
  resource[:noop] = true
493
488
  status = @harness.evaluate(resource)
494
489
  sync_event = status.events[0]
@@ -496,7 +491,7 @@ describe Puppet::Transaction::ResourceHarness do
496
491
  end
497
492
 
498
493
  it "redacts event contents for sensitive properties" do
499
- Puppet::Util::Storage.stubs(:cache).with(resource).returns({:content => "historical world"})
494
+ allow(Puppet::Util::Storage).to receive(:cache).with(resource).and_return({:content => "historical world"})
500
495
  status = @harness.evaluate(resource)
501
496
  sync_event = status.events[0]
502
497
  expect(sync_event.historical_value).to eq '[redacted]'
@@ -535,7 +530,7 @@ describe Puppet::Transaction::ResourceHarness do
535
530
 
536
531
  it "should warn and return nil if the resource has no catalog" do
537
532
  @resource.catalog = nil
538
- @resource.expects(:warning)
533
+ expect(@resource).to receive(:warning)
539
534
 
540
535
  expect(@harness.schedule(@resource)).to be_nil
541
536
  end
@@ -546,7 +541,7 @@ describe Puppet::Transaction::ResourceHarness do
546
541
 
547
542
  it "should fail if the named schedule cannot be found" do
548
543
  @resource[:schedule] = "whatever"
549
- @resource.expects(:fail)
544
+ expect(@resource).to receive(:fail)
550
545
  @harness.schedule(@resource)
551
546
  end
552
547
 
@@ -576,13 +571,13 @@ describe Puppet::Transaction::ResourceHarness do
576
571
 
577
572
  it "should return the result of matching the schedule with the cached 'checked' time if a schedule is set" do
578
573
  t = Time.now
579
- @harness.expects(:cached).with(@resource, :checked).returns(t)
574
+ expect(@harness).to receive(:cached).with(@resource, :checked).and_return(t)
580
575
 
581
576
  sched = Puppet::Type.type(:schedule).new(:name => "sched")
582
577
  @catalog.add_resource(sched)
583
578
  @resource[:schedule] = "sched"
584
579
 
585
- sched.expects(:match?).with(t.to_i).returns "feh"
580
+ expect(sched).to receive(:match?).with(t.to_i).and_return("feh")
586
581
 
587
582
  expect(@harness.scheduled?(@resource)).to eq("feh")
588
583
  end
@@ -590,7 +585,7 @@ describe Puppet::Transaction::ResourceHarness do
590
585
 
591
586
  it "should be able to cache data in the Storage module" do
592
587
  data = {}
593
- Puppet::Util::Storage.expects(:cache).with(@resource).returns data
588
+ expect(Puppet::Util::Storage).to receive(:cache).with(@resource).and_return(data)
594
589
  @harness.cache(@resource, :foo, "something")
595
590
 
596
591
  expect(data[:foo]).to eq("something")
@@ -598,7 +593,7 @@ describe Puppet::Transaction::ResourceHarness do
598
593
 
599
594
  it "should be able to retrieve data from the cache" do
600
595
  data = {:foo => "other"}
601
- Puppet::Util::Storage.expects(:cache).with(@resource).returns data
596
+ expect(Puppet::Util::Storage).to receive(:cache).with(@resource).and_return(data)
602
597
  expect(@harness.cached(@resource, :foo)).to eq("other")
603
598
  end
604
599
 
@@ -614,14 +609,14 @@ describe Puppet::Transaction::ResourceHarness do
614
609
  end
615
610
 
616
611
  it "contains (corrective) when corrective change" do
617
- Puppet::Transaction::Event.any_instance.stubs(:corrective_change).returns(true)
612
+ allow_any_instance_of(Puppet::Transaction::Event).to receive(:corrective_change).and_return(true)
618
613
  status = @harness.evaluate(resource)
619
614
  sync_event = status.events[0]
620
615
  expect(sync_event.message).to match(/content changed '{md5}[0-9a-f]+' to '{md5}[0-9a-f]+' \(corrective\)/)
621
616
  end
622
617
 
623
618
  it "contains no modifier when intentional change" do
624
- Puppet::Transaction::Event.any_instance.stubs(:corrective_change).returns(false)
619
+ allow_any_instance_of(Puppet::Transaction::Event).to receive(:corrective_change).and_return(false)
625
620
  status = @harness.evaluate(resource)
626
621
  sync_event = status.events[0]
627
622
  expect(sync_event.message).to match(/content changed '{md5}[0-9a-f]+' to '{md5}[0-9a-f]+'$/)