puppet 6.4.0-universal-darwin → 6.4.1-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 (646) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +7 -11
  4. data/lib/puppet/application/device.rb +97 -82
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/application/ssl.rb +2 -2
  7. data/lib/puppet/configurer.rb +5 -4
  8. data/lib/puppet/defaults.rb +33 -11
  9. data/lib/puppet/indirector/request.rb +28 -15
  10. data/lib/puppet/ssl.rb +1 -1
  11. data/lib/puppet/ssl/certificate.rb +1 -1
  12. data/lib/puppet/ssl/error.rb +1 -1
  13. data/lib/puppet/ssl/host.rb +0 -47
  14. data/lib/puppet/ssl/ssl_provider.rb +2 -2
  15. data/lib/puppet/ssl/state_machine.rb +16 -17
  16. data/lib/puppet/ssl/validator/default_validator.rb +4 -4
  17. data/lib/puppet/ssl/verifier.rb +1 -1
  18. data/lib/puppet/transaction/event_manager.rb +1 -5
  19. data/lib/puppet/util/connection.rb +15 -8
  20. data/lib/puppet/util/monkey_patches.rb +20 -1
  21. data/lib/puppet/version.rb +1 -1
  22. data/locales/puppet.pot +135 -68
  23. data/man/man5/puppet.conf.5 +9 -9
  24. data/man/man8/puppet-agent.8 +1 -1
  25. data/man/man8/puppet-apply.8 +1 -1
  26. data/man/man8/puppet-catalog.8 +1 -1
  27. data/man/man8/puppet-config.8 +1 -1
  28. data/man/man8/puppet-describe.8 +1 -1
  29. data/man/man8/puppet-device.8 +1 -1
  30. data/man/man8/puppet-doc.8 +1 -1
  31. data/man/man8/puppet-epp.8 +1 -1
  32. data/man/man8/puppet-facts.8 +1 -1
  33. data/man/man8/puppet-filebucket.8 +1 -1
  34. data/man/man8/puppet-generate.8 +1 -1
  35. data/man/man8/puppet-help.8 +1 -1
  36. data/man/man8/puppet-key.8 +1 -1
  37. data/man/man8/puppet-lookup.8 +1 -1
  38. data/man/man8/puppet-man.8 +1 -1
  39. data/man/man8/puppet-module.8 +1 -1
  40. data/man/man8/puppet-node.8 +1 -1
  41. data/man/man8/puppet-parser.8 +1 -1
  42. data/man/man8/puppet-plugin.8 +1 -1
  43. data/man/man8/puppet-report.8 +1 -1
  44. data/man/man8/puppet-resource.8 +1 -1
  45. data/man/man8/puppet-script.8 +1 -1
  46. data/man/man8/puppet-ssl.8 +1 -1
  47. data/man/man8/puppet-status.8 +1 -1
  48. data/man/man8/puppet.8 +2 -2
  49. data/spec/integration/agent/logging_spec.rb +5 -7
  50. data/spec/integration/application/apply_spec.rb +18 -16
  51. data/spec/integration/application/doc_spec.rb +1 -2
  52. data/spec/integration/application/lookup_spec.rb +5 -5
  53. data/spec/integration/configurer_spec.rb +5 -6
  54. data/spec/integration/defaults_spec.rb +5 -6
  55. data/spec/integration/directory_environments_spec.rb +1 -1
  56. data/spec/integration/faces/config_spec.rb +3 -4
  57. data/spec/integration/faces/documentation_spec.rb +0 -1
  58. data/spec/integration/faces/plugin_spec.rb +1 -1
  59. data/spec/integration/file_bucket/file_spec.rb +2 -4
  60. data/spec/integration/file_serving/content_spec.rb +0 -1
  61. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  62. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  63. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  64. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  65. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  66. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  67. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  68. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  69. data/spec/integration/network/authconfig_spec.rb +23 -24
  70. data/spec/integration/network/formats_spec.rb +0 -1
  71. data/spec/integration/network/http_pool_spec.rb +3 -3
  72. data/spec/integration/node/environment_spec.rb +0 -1
  73. data/spec/integration/node/facts_spec.rb +9 -10
  74. data/spec/integration/node_spec.rb +6 -7
  75. data/spec/integration/parser/catalog_spec.rb +1 -5
  76. data/spec/integration/parser/collection_spec.rb +1 -2
  77. data/spec/integration/parser/compiler_spec.rb +6 -6
  78. data/spec/integration/parser/scope_spec.rb +1 -1
  79. data/spec/integration/parser/undef_param_spec.rb +1 -1
  80. data/spec/integration/provider/service/init_spec.rb +4 -5
  81. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  82. data/spec/integration/provider/service/windows_spec.rb +1 -2
  83. data/spec/integration/reference/providers_spec.rb +1 -2
  84. data/spec/integration/reports_spec.rb +1 -2
  85. data/spec/integration/resource/catalog_spec.rb +14 -17
  86. data/spec/integration/resource/type_collection_spec.rb +4 -5
  87. data/spec/integration/rest/client_spec.rb +1 -1
  88. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  89. data/spec/integration/ssl/host_spec.rb +1 -2
  90. data/spec/integration/ssl/key_spec.rb +0 -1
  91. data/spec/integration/test/test_helper_spec.rb +0 -1
  92. data/spec/integration/transaction/report_spec.rb +6 -11
  93. data/spec/integration/transaction_spec.rb +18 -19
  94. data/spec/integration/type/exec_spec.rb +0 -1
  95. data/spec/integration/type/file_spec.rb +13 -14
  96. data/spec/integration/type/package_spec.rb +19 -23
  97. data/spec/integration/type/tidy_spec.rb +1 -2
  98. data/spec/integration/type_spec.rb +0 -1
  99. data/spec/integration/util/autoload_spec.rb +1 -2
  100. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  101. data/spec/integration/util/settings_spec.rb +0 -1
  102. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  103. data/spec/integration/util/windows/principal_spec.rb +0 -1
  104. data/spec/integration/util/windows/process_spec.rb +4 -6
  105. data/spec/integration/util/windows/registry_spec.rb +41 -51
  106. data/spec/integration/util/windows/security_spec.rb +2 -4
  107. data/spec/integration/util/windows/user_spec.rb +18 -20
  108. data/spec/integration/util_spec.rb +4 -7
  109. data/spec/lib/puppet_spec/compiler.rb +1 -1
  110. data/spec/lib/puppet_spec/files.rb +0 -1
  111. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  112. data/spec/lib/puppet_spec/scope.rb +1 -2
  113. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  114. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  115. data/spec/shared_behaviours/file_serving.rb +6 -8
  116. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  117. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  118. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  119. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  120. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  121. data/spec/spec_helper.rb +10 -1
  122. data/spec/unit/agent/disabler_spec.rb +4 -5
  123. data/spec/unit/agent/locker_spec.rb +12 -13
  124. data/spec/unit/agent_spec.rb +80 -85
  125. data/spec/unit/application/agent_spec.rb +88 -94
  126. data/spec/unit/application/apply_spec.rb +82 -83
  127. data/spec/unit/application/config_spec.rb +0 -1
  128. data/spec/unit/application/describe_spec.rb +6 -7
  129. data/spec/unit/application/device_spec.rb +379 -384
  130. data/spec/unit/application/doc_spec.rb +44 -46
  131. data/spec/unit/application/face_base_spec.rb +61 -62
  132. data/spec/unit/application/facts_spec.rb +3 -4
  133. data/spec/unit/application/filebucket_spec.rb +66 -74
  134. data/spec/unit/application/indirection_base_spec.rb +8 -6
  135. data/spec/unit/application/lookup_spec.rb +26 -26
  136. data/spec/unit/application/resource_spec.rb +42 -48
  137. data/spec/unit/application/ssl_spec.rb +9 -9
  138. data/spec/unit/application_spec.rb +82 -92
  139. data/spec/unit/capability_spec.rb +6 -6
  140. data/spec/unit/certificate_factory_spec.rb +3 -5
  141. data/spec/unit/configurer/downloader_spec.rb +20 -21
  142. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  143. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  144. data/spec/unit/configurer_spec.rb +189 -192
  145. data/spec/unit/confine/exists_spec.rb +17 -15
  146. data/spec/unit/confine/false_spec.rb +5 -6
  147. data/spec/unit/confine/feature_spec.rb +7 -5
  148. data/spec/unit/confine/true_spec.rb +5 -6
  149. data/spec/unit/confine/variable_spec.rb +14 -15
  150. data/spec/unit/confine_collection_spec.rb +28 -29
  151. data/spec/unit/confine_spec.rb +13 -14
  152. data/spec/unit/confiner_spec.rb +10 -11
  153. data/spec/unit/context/trusted_information_spec.rb +1 -1
  154. data/spec/unit/daemon_spec.rb +35 -36
  155. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  156. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  157. data/spec/unit/datatypes_spec.rb +3 -4
  158. data/spec/unit/defaults_spec.rb +18 -13
  159. data/spec/unit/environments_spec.rb +7 -7
  160. data/spec/unit/etc_spec.rb +30 -32
  161. data/spec/unit/external/pson_spec.rb +0 -1
  162. data/spec/unit/face/catalog_spec.rb +0 -1
  163. data/spec/unit/face/config_spec.rb +31 -35
  164. data/spec/unit/face/epp_face_spec.rb +3 -4
  165. data/spec/unit/face/facts_spec.rb +5 -6
  166. data/spec/unit/face/generate_spec.rb +4 -5
  167. data/spec/unit/face/help_spec.rb +7 -8
  168. data/spec/unit/face/key_spec.rb +0 -1
  169. data/spec/unit/face/man_spec.rb +1 -2
  170. data/spec/unit/face/module/install_spec.rb +3 -5
  171. data/spec/unit/face/module/list_spec.rb +2 -12
  172. data/spec/unit/face/module/search_spec.rb +11 -9
  173. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  174. data/spec/unit/face/node_spec.rb +23 -24
  175. data/spec/unit/face/parser_spec.rb +3 -3
  176. data/spec/unit/face/plugin_spec.rb +36 -9
  177. data/spec/unit/face/status_spec.rb +0 -1
  178. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  179. data/spec/unit/file_bucket/file_spec.rb +0 -2
  180. data/spec/unit/file_serving/base_spec.rb +14 -15
  181. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  182. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  183. data/spec/unit/file_serving/content_spec.rb +10 -11
  184. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  185. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  186. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  187. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  188. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  189. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  190. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  191. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  192. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  193. data/spec/unit/file_serving/mount_spec.rb +0 -1
  194. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  195. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  196. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  197. data/spec/unit/file_system_spec.rb +4 -4
  198. data/spec/unit/forge/errors_spec.rb +1 -1
  199. data/spec/unit/forge/forge_spec.rb +13 -14
  200. data/spec/unit/forge/module_release_spec.rb +18 -18
  201. data/spec/unit/forge/repository_spec.rb +29 -30
  202. data/spec/unit/forge_spec.rb +15 -11
  203. data/spec/unit/functions/binary_file_spec.rb +3 -3
  204. data/spec/unit/functions/contain_spec.rb +0 -2
  205. data/spec/unit/functions/defined_spec.rb +0 -1
  206. data/spec/unit/functions/epp_spec.rb +2 -2
  207. data/spec/unit/functions/find_file_spec.rb +7 -7
  208. data/spec/unit/functions/include_spec.rb +0 -4
  209. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  210. data/spec/unit/functions/lookup_spec.rb +1 -2
  211. data/spec/unit/functions/module_directory_spec.rb +12 -12
  212. data/spec/unit/functions/require_spec.rb +0 -3
  213. data/spec/unit/functions/shared.rb +5 -8
  214. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  215. data/spec/unit/functions4_spec.rb +9 -10
  216. data/spec/unit/gettext/config_spec.rb +4 -4
  217. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  218. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  219. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  220. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  221. data/spec/unit/hiera_puppet_spec.rb +20 -20
  222. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  223. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  224. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  225. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  226. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  227. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  228. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  229. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  230. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  231. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  232. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  233. data/spec/unit/indirector/envelope_spec.rb +1 -2
  234. data/spec/unit/indirector/exec_spec.rb +4 -5
  235. data/spec/unit/indirector/face_spec.rb +9 -9
  236. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  237. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  238. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  239. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  240. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  241. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  242. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  243. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  244. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  245. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  246. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  247. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  248. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  249. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  250. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  251. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  252. data/spec/unit/indirector/file_server_spec.rb +87 -87
  253. data/spec/unit/indirector/indirection_spec.rb +242 -226
  254. data/spec/unit/indirector/json_spec.rb +7 -9
  255. data/spec/unit/indirector/key/file_spec.rb +21 -22
  256. data/spec/unit/indirector/memory_spec.rb +6 -7
  257. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  258. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  259. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  260. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  261. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  262. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  263. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  264. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  265. data/spec/unit/indirector/none_spec.rb +5 -5
  266. data/spec/unit/indirector/plain_spec.rb +7 -8
  267. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  268. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  269. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  270. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  271. data/spec/unit/indirector/request_spec.rb +11 -12
  272. data/spec/unit/indirector/resource/ral_spec.rb +47 -54
  273. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  274. data/spec/unit/indirector/rest_spec.rb +113 -110
  275. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  276. data/spec/unit/indirector/status/local_spec.rb +0 -1
  277. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  278. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  279. data/spec/unit/indirector/terminus_spec.rb +27 -27
  280. data/spec/unit/indirector/yaml_spec.rb +5 -6
  281. data/spec/unit/indirector_spec.rb +1 -2
  282. data/spec/unit/info_service_spec.rb +1 -1
  283. data/spec/unit/interface/action_builder_spec.rb +0 -1
  284. data/spec/unit/interface/action_manager_spec.rb +0 -1
  285. data/spec/unit/interface/action_spec.rb +2 -3
  286. data/spec/unit/interface/documentation_spec.rb +0 -1
  287. data/spec/unit/interface/face_collection_spec.rb +19 -12
  288. data/spec/unit/interface_spec.rb +3 -3
  289. data/spec/unit/man_spec.rb +3 -4
  290. data/spec/unit/module_spec.rb +46 -51
  291. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  292. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  293. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  294. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  295. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  296. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  297. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  298. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  299. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  300. data/spec/unit/module_tool/tar_spec.rb +12 -13
  301. data/spec/unit/module_tool_spec.rb +7 -12
  302. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  303. data/spec/unit/network/authconfig_spec.rb +17 -18
  304. data/spec/unit/network/authorization_spec.rb +4 -5
  305. data/spec/unit/network/authstore_spec.rb +0 -1
  306. data/spec/unit/network/format_handler_spec.rb +0 -1
  307. data/spec/unit/network/format_spec.rb +9 -10
  308. data/spec/unit/network/format_support_spec.rb +28 -29
  309. data/spec/unit/network/formats_spec.rb +4 -5
  310. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  311. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  312. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  313. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  314. data/spec/unit/network/http/api_spec.rb +0 -2
  315. data/spec/unit/network/http/compression_spec.rb +21 -22
  316. data/spec/unit/network/http/connection_spec.rb +35 -35
  317. data/spec/unit/network/http/factory_spec.rb +5 -6
  318. data/spec/unit/network/http/handler_spec.rb +9 -18
  319. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  320. data/spec/unit/network/http/pool_spec.rb +33 -34
  321. data/spec/unit/network/http/request_spec.rb +0 -2
  322. data/spec/unit/network/http/response_spec.rb +11 -13
  323. data/spec/unit/network/http/route_spec.rb +0 -1
  324. data/spec/unit/network/http/session_spec.rb +2 -3
  325. data/spec/unit/network/http/site_spec.rb +0 -1
  326. data/spec/unit/network/http_pool_spec.rb +19 -10
  327. data/spec/unit/network/http_spec.rb +0 -1
  328. data/spec/unit/network/resolver_spec.rb +25 -26
  329. data/spec/unit/network/rights_spec.rb +52 -53
  330. data/spec/unit/node/environment_spec.rb +14 -15
  331. data/spec/unit/node/facts_spec.rb +5 -7
  332. data/spec/unit/node_spec.rb +4 -10
  333. data/spec/unit/other/selinux_spec.rb +0 -1
  334. data/spec/unit/parameter/boolean_spec.rb +1 -2
  335. data/spec/unit/parameter/package_options_spec.rb +1 -2
  336. data/spec/unit/parameter/path_spec.rb +0 -1
  337. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  338. data/spec/unit/parameter/value_spec.rb +0 -1
  339. data/spec/unit/parameter_spec.rb +9 -9
  340. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  341. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  342. data/spec/unit/parser/compiler_spec.rb +84 -96
  343. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  344. data/spec/unit/parser/files_spec.rb +0 -1
  345. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  346. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  347. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  348. data/spec/unit/parser/functions/file_spec.rb +13 -14
  349. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  350. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  351. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  352. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  353. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  354. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  355. data/spec/unit/parser/functions/split_spec.rb +0 -1
  356. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  357. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  358. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  359. data/spec/unit/parser/functions/template_spec.rb +13 -13
  360. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  361. data/spec/unit/parser/functions_spec.rb +6 -7
  362. data/spec/unit/parser/relationship_spec.rb +0 -1
  363. data/spec/unit/parser/resource_spec.rb +42 -42
  364. data/spec/unit/parser/scope_spec.rb +39 -35
  365. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  366. data/spec/unit/parser/type_loader_spec.rb +17 -19
  367. data/spec/unit/pops/adaptable_spec.rb +0 -1
  368. data/spec/unit/pops/benchmark_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  371. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  372. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  373. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  374. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  375. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  376. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  377. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  378. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  379. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  380. data/spec/unit/pops/factory_spec.rb +3 -4
  381. data/spec/unit/pops/issues_spec.rb +19 -20
  382. data/spec/unit/pops/loaders/loader_spec.rb +9 -5
  383. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  384. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  385. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  386. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  387. data/spec/unit/pops/migration_spec.rb +3 -5
  388. data/spec/unit/pops/model/model_spec.rb +0 -1
  389. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  390. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  391. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  392. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  393. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  394. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  395. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  396. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  397. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  398. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  399. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  400. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  401. data/spec/unit/pops/pn_spec.rb +0 -1
  402. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  403. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  404. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  405. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  406. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  407. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  408. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  409. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  410. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  411. data/spec/unit/pops/visitor_spec.rb +0 -1
  412. data/spec/unit/property/boolean_spec.rb +1 -1
  413. data/spec/unit/property/ensure_spec.rb +0 -1
  414. data/spec/unit/property/keyvalue_spec.rb +32 -34
  415. data/spec/unit/property/list_spec.rb +26 -27
  416. data/spec/unit/property/ordered_list_spec.rb +10 -14
  417. data/spec/unit/property_spec.rb +42 -43
  418. data/spec/unit/provider/aix_object_spec.rb +47 -45
  419. data/spec/unit/provider/command_spec.rb +9 -9
  420. data/spec/unit/provider/exec/posix_spec.rb +8 -9
  421. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  422. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  423. data/spec/unit/provider/exec_spec.rb +0 -1
  424. data/spec/unit/provider/file/posix_spec.rb +22 -24
  425. data/spec/unit/provider/file/windows_spec.rb +15 -17
  426. data/spec/unit/provider/group/aix_spec.rb +3 -2
  427. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  428. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  429. data/spec/unit/provider/group/pw_spec.rb +11 -11
  430. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  431. data/spec/unit/provider/ldap_spec.rb +61 -62
  432. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  433. data/spec/unit/provider/nameservice_spec.rb +38 -40
  434. data/spec/unit/provider/package/aix_spec.rb +15 -15
  435. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  436. data/spec/unit/provider/package/apt_spec.rb +44 -27
  437. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  438. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  439. data/spec/unit/provider/package/base_spec.rb +4 -4
  440. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  441. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  442. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  443. data/spec/unit/provider/package/gem_spec.rb +51 -43
  444. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  445. data/spec/unit/provider/package/macports_spec.rb +46 -42
  446. data/spec/unit/provider/package/nim_spec.rb +30 -39
  447. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  448. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  449. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  450. data/spec/unit/provider/package/pip_spec.rb +71 -72
  451. data/spec/unit/provider/package/pkg_spec.rb +113 -114
  452. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  453. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  454. data/spec/unit/provider/package/pkgng_spec.rb +21 -22
  455. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  456. data/spec/unit/provider/package/portage_spec.rb +71 -75
  457. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  458. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  459. data/spec/unit/provider/package/sun_spec.rb +16 -18
  460. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  461. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  462. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  463. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  464. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  465. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  466. data/spec/unit/provider/package/windows_spec.rb +36 -32
  467. data/spec/unit/provider/package/yum_spec.rb +7 -7
  468. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  469. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  470. data/spec/unit/provider/service/base_spec.rb +4 -5
  471. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  472. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  473. data/spec/unit/provider/service/debian_spec.rb +38 -38
  474. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  475. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  476. data/spec/unit/provider/service/init_spec.rb +53 -52
  477. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  478. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  479. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  480. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  481. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  482. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  483. data/spec/unit/provider/service/runit_spec.rb +29 -27
  484. data/spec/unit/provider/service/smf_spec.rb +74 -66
  485. data/spec/unit/provider/service/src_spec.rb +46 -47
  486. data/spec/unit/provider/service/systemd_spec.rb +113 -122
  487. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  488. data/spec/unit/provider/service/windows_spec.rb +33 -41
  489. data/spec/unit/provider/user/aix_spec.rb +31 -31
  490. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  491. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  492. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  493. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  494. data/spec/unit/provider/user/pw_spec.rb +37 -35
  495. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  496. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  497. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  498. data/spec/unit/provider_spec.rb +35 -35
  499. data/spec/unit/puppet_pal_2pec.rb +4 -5
  500. data/spec/unit/puppet_pal_spec.rb +0 -1
  501. data/spec/unit/puppet_spec.rb +6 -7
  502. data/spec/unit/relationship_spec.rb +0 -1
  503. data/spec/unit/reports/http_spec.rb +22 -24
  504. data/spec/unit/reports/store_spec.rb +3 -4
  505. data/spec/unit/reports_spec.rb +12 -14
  506. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  507. data/spec/unit/resource/catalog_spec.rb +72 -68
  508. data/spec/unit/resource/status_spec.rb +6 -8
  509. data/spec/unit/resource/type_collection_spec.rb +17 -18
  510. data/spec/unit/resource/type_spec.rb +34 -35
  511. data/spec/unit/resource_spec.rb +36 -32
  512. data/spec/unit/rest/client_spec.rb +56 -25
  513. data/spec/unit/rest/route_spec.rb +5 -5
  514. data/spec/unit/scheduler/job_spec.rb +0 -1
  515. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  516. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  517. data/spec/unit/settings/array_setting_spec.rb +1 -1
  518. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  519. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  520. data/spec/unit/settings/config_file_spec.rb +0 -1
  521. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  522. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  523. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  524. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  525. data/spec/unit/settings/file_setting_spec.rb +44 -46
  526. data/spec/unit/settings/path_setting_spec.rb +1 -2
  527. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  528. data/spec/unit/settings/string_setting_spec.rb +14 -15
  529. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  530. data/spec/unit/settings/value_translator_spec.rb +0 -1
  531. data/spec/unit/settings_spec.rb +228 -235
  532. data/spec/unit/ssl/base_spec.rb +14 -15
  533. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  534. data/spec/unit/ssl/certificate_spec.rb +23 -25
  535. data/spec/unit/ssl/digest_spec.rb +0 -1
  536. data/spec/unit/ssl/host_spec.rb +147 -130
  537. data/spec/unit/ssl/key_spec.rb +30 -31
  538. data/spec/unit/ssl/ssl_provider_spec.rb +24 -24
  539. data/spec/unit/ssl/state_machine_spec.rb +50 -58
  540. data/spec/unit/ssl/validator_spec.rb +43 -54
  541. data/spec/unit/ssl/verifier_spec.rb +10 -10
  542. data/spec/unit/task_spec.rb +44 -45
  543. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  544. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  545. data/spec/unit/transaction/event_spec.rb +16 -15
  546. data/spec/unit/transaction/persistence_spec.rb +16 -17
  547. data/spec/unit/transaction/report_spec.rb +11 -12
  548. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  549. data/spec/unit/transaction_spec.rb +100 -101
  550. data/spec/unit/type/component_spec.rb +0 -1
  551. data/spec/unit/type/exec_spec.rb +60 -56
  552. data/spec/unit/type/file/checksum_spec.rb +9 -10
  553. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  554. data/spec/unit/type/file/content_spec.rb +58 -61
  555. data/spec/unit/type/file/ctime_spec.rb +0 -1
  556. data/spec/unit/type/file/ensure_spec.rb +12 -13
  557. data/spec/unit/type/file/group_spec.rb +5 -7
  558. data/spec/unit/type/file/mode_spec.rb +4 -6
  559. data/spec/unit/type/file/mtime_spec.rb +0 -1
  560. data/spec/unit/type/file/owner_spec.rb +6 -8
  561. data/spec/unit/type/file/selinux_spec.rb +17 -19
  562. data/spec/unit/type/file/source_spec.rb +104 -101
  563. data/spec/unit/type/file/type_spec.rb +0 -1
  564. data/spec/unit/type/file_spec.rb +195 -185
  565. data/spec/unit/type/filebucket_spec.rb +4 -5
  566. data/spec/unit/type/group_spec.rb +6 -8
  567. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  568. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  569. data/spec/unit/type/package_spec.rb +56 -57
  570. data/spec/unit/type/resources_spec.rb +72 -74
  571. data/spec/unit/type/schedule_spec.rb +24 -26
  572. data/spec/unit/type/service_spec.rb +49 -49
  573. data/spec/unit/type/stage_spec.rb +0 -1
  574. data/spec/unit/type/tidy_spec.rb +61 -62
  575. data/spec/unit/type/user_spec.rb +24 -25
  576. data/spec/unit/type/whit_spec.rb +0 -1
  577. data/spec/unit/type_spec.rb +55 -54
  578. data/spec/unit/util/at_fork_spec.rb +18 -19
  579. data/spec/unit/util/autoload_spec.rb +55 -56
  580. data/spec/unit/util/backups_spec.rb +34 -35
  581. data/spec/unit/util/character_encoding_spec.rb +5 -5
  582. data/spec/unit/util/checksums_spec.rb +38 -39
  583. data/spec/unit/util/colors_spec.rb +1 -2
  584. data/spec/unit/util/command_line_spec.rb +24 -25
  585. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  586. data/spec/unit/util/diff_spec.rb +7 -8
  587. data/spec/unit/util/errors_spec.rb +0 -1
  588. data/spec/unit/util/execution_spec.rb +185 -161
  589. data/spec/unit/util/execution_stub_spec.rb +0 -1
  590. data/spec/unit/util/feature_spec.rb +23 -14
  591. data/spec/unit/util/filetype_spec.rb +49 -49
  592. data/spec/unit/util/http_proxy_spec.rb +12 -12
  593. data/spec/unit/util/inifile_spec.rb +26 -31
  594. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  595. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  596. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  597. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  598. data/spec/unit/util/lockfile_spec.rb +0 -1
  599. data/spec/unit/util/log/destinations_spec.rb +30 -33
  600. data/spec/unit/util/log_spec.rb +35 -36
  601. data/spec/unit/util/logging_spec.rb +58 -72
  602. data/spec/unit/util/metric_spec.rb +0 -1
  603. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  604. data/spec/unit/util/multi_match_spec.rb +0 -1
  605. data/spec/unit/util/network_device/config_spec.rb +0 -1
  606. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  607. data/spec/unit/util/network_device_spec.rb +7 -9
  608. data/spec/unit/util/package_spec.rb +0 -1
  609. data/spec/unit/util/pidlock_spec.rb +21 -22
  610. data/spec/unit/util/plist_spec.rb +40 -33
  611. data/spec/unit/util/posix_spec.rb +54 -51
  612. data/spec/unit/util/rdoc_spec.rb +9 -10
  613. data/spec/unit/util/reference_spec.rb +0 -1
  614. data/spec/unit/util/resource_template_spec.rb +20 -20
  615. data/spec/unit/util/retry_action_spec.rb +7 -8
  616. data/spec/unit/util/rubygems_spec.rb +7 -8
  617. data/spec/unit/util/run_mode_spec.rb +3 -4
  618. data/spec/unit/util/selinux_spec.rb +79 -72
  619. data/spec/unit/util/splayer_spec.rb +8 -9
  620. data/spec/unit/util/ssl_spec.rb +0 -1
  621. data/spec/unit/util/storage_spec.rb +3 -4
  622. data/spec/unit/util/suidmanager_spec.rb +45 -54
  623. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  624. data/spec/unit/util/tag_set_spec.rb +0 -1
  625. data/spec/unit/util/tagging_spec.rb +0 -1
  626. data/spec/unit/util/terminal_spec.rb +9 -10
  627. data/spec/unit/util/user_attr_spec.rb +1 -2
  628. data/spec/unit/util/warnings_spec.rb +3 -4
  629. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  630. data/spec/unit/util/watcher_spec.rb +51 -21
  631. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  632. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  633. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  634. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  635. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  636. data/spec/unit/util/windows/file_spec.rb +0 -1
  637. data/spec/unit/util/windows/root_certs_spec.rb +1 -2
  638. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  639. data/spec/unit/util/windows/service_spec.rb +66 -68
  640. data/spec/unit/util/windows/sid_spec.rb +11 -13
  641. data/spec/unit/util/windows/string_spec.rb +0 -1
  642. data/spec/unit/util_spec.rb +55 -57
  643. data/spec/unit/version_spec.rb +6 -6
  644. data/spec/unit/x509/cert_provider_spec.rb +14 -14
  645. data/spec/unit/x509/pem_store_spec.rb +5 -5
  646. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet_spec/compiler'
4
3
 
@@ -14,7 +13,7 @@ describe Puppet::Transaction do
14
13
  include PuppetSpec::Compiler
15
14
 
16
15
  before do
17
- Puppet::Util::Storage.stubs(:store)
16
+ allow(Puppet::Util::Storage).to receive(:store)
18
17
  end
19
18
 
20
19
  def mk_catalog(*resources)
@@ -42,14 +41,14 @@ describe Puppet::Transaction do
42
41
 
43
42
  child_resource = Puppet::Type.type(:file).new :path => make_absolute("/foo/bar/baz"), :backup => false
44
43
 
45
- resource.expects(:eval_generate).returns([child_resource])
44
+ expect(resource).to receive(:eval_generate).and_return([child_resource])
46
45
 
47
46
  transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
48
47
 
49
- resource.expects(:retrieve).raises "this is a failure"
50
- resource.stubs(:err)
48
+ expect(resource).to receive(:retrieve).and_raise("this is a failure")
49
+ allow(resource).to receive(:err)
51
50
 
52
- child_resource.expects(:retrieve).never
51
+ expect(child_resource).not_to receive(:retrieve)
53
52
 
54
53
  transaction.evaluate
55
54
  end
@@ -62,7 +61,7 @@ describe Puppet::Transaction do
62
61
 
63
62
  transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
64
63
 
65
- resource.expects(:evaluate).never
64
+ expect(resource).not_to receive(:evaluate)
66
65
 
67
66
  transaction.evaluate
68
67
  end
@@ -87,7 +86,7 @@ describe Puppet::Transaction do
87
86
 
88
87
  transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
89
88
 
90
- resource.expects(:evaluate).never
89
+ expect(resource).not_to receive(:evaluate)
91
90
 
92
91
  transaction.evaluate
93
92
  end
@@ -100,7 +99,7 @@ describe Puppet::Transaction do
100
99
  transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
101
100
  transaction.for_network_device = false
102
101
 
103
- transaction.expects(:apply).never.with(resource, nil)
102
+ expect(transaction).not_to receive(:apply).with(resource, nil)
104
103
 
105
104
  transaction.evaluate
106
105
  expect(transaction.resource_status(resource)).to be_skipped
@@ -114,7 +113,7 @@ describe Puppet::Transaction do
114
113
  transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
115
114
  transaction.for_network_device = true
116
115
 
117
- transaction.expects(:apply).never.with(resource, nil)
116
+ expect(transaction).not_to receive(:apply).with(resource, nil)
118
117
 
119
118
  transaction.evaluate
120
119
  expect(transaction.resource_status(resource)).to be_skipped
@@ -128,7 +127,7 @@ describe Puppet::Transaction do
128
127
  transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
129
128
  transaction.for_network_device = true
130
129
 
131
- transaction.expects(:apply).with(resource, nil)
130
+ expect(transaction).to receive(:apply).with(resource, nil)
132
131
 
133
132
  transaction.evaluate
134
133
  expect(transaction.resource_status(resource)).not_to be_skipped
@@ -142,7 +141,7 @@ describe Puppet::Transaction do
142
141
  transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
143
142
  transaction.for_network_device = true
144
143
 
145
- transaction.expects(:apply).with(resource, nil)
144
+ expect(transaction).to receive(:apply).with(resource, nil)
146
145
 
147
146
  transaction.evaluate
148
147
  expect(transaction.resource_status(resource)).not_to be_skipped
@@ -168,7 +167,7 @@ describe Puppet::Transaction do
168
167
  ecomp[:subscribe] = Puppet::Resource.new(:foo, "file")
169
168
  exec[:refreshonly] = true
170
169
 
171
- exec.expects(:refresh)
170
+ expect(exec).to receive(:refresh)
172
171
  catalog.apply
173
172
  end
174
173
 
@@ -232,7 +231,7 @@ describe Puppet::Transaction do
232
231
  notify = Puppet::Type.type(:notify).new(
233
232
  :title => "foo"
234
233
  )
235
- notify.expects(:pre_run_check).raises(Puppet::Error, "fail for testing")
234
+ expect(notify).to receive(:pre_run_check).and_raise(Puppet::Error, "fail for testing")
236
235
 
237
236
  catalog = mk_catalog(file, notify)
238
237
  expect { catalog.apply }.to raise_error(Puppet::Error, /Some pre-run checks failed/)
@@ -265,7 +264,7 @@ describe Puppet::Transaction do
265
264
  :title => "two"
266
265
  )
267
266
 
268
- exec1.stubs(:err)
267
+ allow(exec1).to receive(:err)
269
268
 
270
269
  catalog = mk_catalog(file, exec1, exec2)
271
270
  catalog.apply
@@ -322,8 +321,8 @@ describe Puppet::Transaction do
322
321
  :command => touch(file1),
323
322
  )
324
323
 
325
- exec1.stubs(:eval_generate).returns(
326
- [ (Puppet::Type.type(:notify).new :name => "eval1_notify")]
324
+ allow(exec1).to receive(:eval_generate).and_return(
325
+ [ Puppet::Type.type(:notify).new(:name => "eval1_notify") ]
327
326
  )
328
327
 
329
328
  exec2 = Puppet::Type.type(:exec).new(
@@ -333,8 +332,8 @@ describe Puppet::Transaction do
333
332
  :refreshonly => true,
334
333
  :subscribe => exec1,
335
334
  )
336
- exec2.stubs(:eval_generate).returns(
337
- [ (Puppet::Type.type(:notify).new :name => "eval2_notify")]
335
+ allow(exec2).to receive(:eval_generate).and_return(
336
+ [ Puppet::Type.type(:notify).new(:name => "eval2_notify") ]
338
337
  )
339
338
 
340
339
  Puppet[:tags] = "exec"
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet_spec/files'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet_spec/files'
@@ -79,10 +78,10 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
79
78
 
80
79
  before do
81
80
  # stub this to not try to create state.yaml
82
- Puppet::Util::Storage.stubs(:store)
81
+ allow(Puppet::Util::Storage).to receive(:store)
83
82
 
84
- Puppet::Type.type(:file).any_instance.stubs(:file).returns('my/file.pp')
85
- Puppet::Type.type(:file).any_instance.stubs(:line).returns 5
83
+ allow_any_instance_of(Puppet::Type.type(:file)).to receive(:file).and_return('my/file.pp')
84
+ allow_any_instance_of(Puppet::Type.type(:file)).to receive(:line).and_return(5)
86
85
  end
87
86
 
88
87
  it "should not attempt to manage files that do not exist if no means of creating the file is specified" do
@@ -419,7 +418,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
419
418
 
420
419
  it "should not give a deprecation warning about using a checksum in content when using source to define content" do
421
420
  FileUtils.touch(path)
422
- Puppet.expects(:puppet_deprecation_warning).never
421
+ expect(Puppet).not_to receive(:puppet_deprecation_warning)
423
422
  catalog.add_resource described_class.new(:path => path, :source => link, :links => :follow)
424
423
  catalog.apply
425
424
  end
@@ -533,7 +532,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
533
532
  # Create a directory where the backup should be so that writing to it fails
534
533
  Dir.mkdir(File.join(dir, "testfile.bak"))
535
534
 
536
- Puppet::Util::Log.stubs(:newmessage)
535
+ allow(Puppet::Util::Log).to receive(:newmessage)
537
536
 
538
537
  catalog.apply
539
538
 
@@ -603,7 +602,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
603
602
  end
604
603
 
605
604
  it "should not give a checksum deprecation warning when given actual content" do
606
- Puppet.expects(:puppet_deprecation_warning).never
605
+ expect(Puppet).not_to receive(:puppet_deprecation_warning)
607
606
  catalog.add_resource described_class.new(:path => path, :content => 'this is content')
608
607
  catalog.apply
609
608
  end
@@ -614,14 +613,14 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
614
613
  end
615
614
 
616
615
  it "should give a checksum deprecation warning" do
617
- Puppet.expects(:puppet_deprecation_warning).with('Using a checksum in a file\'s "content" property is deprecated. The ability to use a checksum to retrieve content from the filebucket using the "content" property will be removed in a future release. The literal value of the "content" property will be written to the file. The checksum retrieval functionality is being replaced by the use of static catalogs. See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.', {:file => 'my/file.pp', :line => 5})
616
+ expect(Puppet).to receive(:puppet_deprecation_warning).with('Using a checksum in a file\'s "content" property is deprecated. The ability to use a checksum to retrieve content from the filebucket using the "content" property will be removed in a future release. The literal value of the "content" property will be written to the file. The checksum retrieval functionality is being replaced by the use of static catalogs. See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.', {:file => 'my/file.pp', :line => 5})
618
617
  d = digest("this is some content")
619
618
  catalog.add_resource described_class.new(:path => path, :content => "{#{digest_algorithm}}#{d}")
620
619
  catalog.apply
621
620
  end
622
621
 
623
622
  it "should not give a checksum deprecation warning when no content is specified while checksum and checksum value are used" do
624
- Puppet.expects(:puppet_deprecation_warning).never
623
+ expect(Puppet).not_to receive(:puppet_deprecation_warning)
625
624
  d = digest("this is some content")
626
625
  catalog.add_resource described_class.new(:path => path, :checksum => digest_algorithm, :checksum_value => d)
627
626
  catalog.apply
@@ -1282,7 +1281,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
1282
1281
 
1283
1282
  describe "when sourcing" do
1284
1283
  it "should give a deprecation warning when the user sets source_permissions" do
1285
- Puppet.expects(:puppet_deprecation_warning).with(
1284
+ expect(Puppet).to receive(:puppet_deprecation_warning).with(
1286
1285
  'The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`.',
1287
1286
  {:file => 'my/file.pp', :line => 5})
1288
1287
 
@@ -1291,7 +1290,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
1291
1290
  end
1292
1291
 
1293
1292
  it "should not give a deprecation warning when the user does not set source_permissions" do
1294
- Puppet.expects(:puppet_deprecation_warning).never
1293
+ expect(Puppet).not_to receive(:puppet_deprecation_warning)
1295
1294
  catalog.add_resource described_class.new(:path => path, :content => 'this is content')
1296
1295
  catalog.apply
1297
1296
  end
@@ -1683,7 +1682,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
1683
1682
  describe "when using validate_cmd" do
1684
1683
  it "should fail the file resource if command fails" do
1685
1684
  catalog.add_resource(described_class.new(:path => path, :content => "foo", :validate_cmd => "/usr/bin/env false"))
1686
- Puppet::Util::Execution.expects(:execute).with("/usr/bin/env false", {:combine => true, :failonfail => true}).raises(Puppet::ExecutionFailure, "Failed")
1685
+ expect(Puppet::Util::Execution).to receive(:execute).with("/usr/bin/env false", {:combine => true, :failonfail => true}).and_raise(Puppet::ExecutionFailure, "Failed")
1687
1686
  report = catalog.apply.report
1688
1687
  expect(report.resource_statuses["File[#{path}]"]).to be_failed
1689
1688
  expect(Puppet::FileSystem.exist?(path)).to be_falsey
@@ -1691,9 +1690,9 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
1691
1690
 
1692
1691
  it "should succeed the file resource if command succeeds" do
1693
1692
  catalog.add_resource(described_class.new(:path => path, :content => "foo", :validate_cmd => "/usr/bin/env true"))
1694
- Puppet::Util::Execution.expects(:execute)
1693
+ expect(Puppet::Util::Execution).to receive(:execute)
1695
1694
  .with("/usr/bin/env true", {:combine => true, :failonfail => true})
1696
- .returns Puppet::Util::Execution::ProcessOutput.new('', 0)
1695
+ .and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
1697
1696
  report = catalog.apply.report
1698
1697
  expect(report.resource_statuses["File[#{path}]"]).not_to be_failed
1699
1698
  expect(Puppet::FileSystem.exist?(path)).to be_truthy
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  describe Puppet::Type.type(:package), "when choosing a default package provider" do
@@ -64,8 +63,8 @@ end
64
63
 
65
64
  describe Puppet::Type.type(:package), "when packages with the same name are sourced" do
66
65
  before :each do
67
- Process.stubs(:euid).returns 0
68
- @provider = stub(
66
+ allow(Process).to receive(:euid).and_return(0)
67
+ @provider = double(
69
68
  'provider',
70
69
  :class => Puppet::Type.type(:package).defaultprovider,
71
70
  :clear => nil,
@@ -73,8 +72,8 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
73
72
  :name => :mock,
74
73
  :validate_source => nil
75
74
  )
76
- Puppet::Type.type(:package).defaultprovider.stubs(:new).returns(@provider)
77
- Puppet::Type.type(:package).defaultprovider.stubs(:instances).returns([])
75
+ allow(Puppet::Type.type(:package).defaultprovider).to receive(:new).and_return(@provider)
76
+ allow(Puppet::Type.type(:package).defaultprovider).to receive(:instances).and_return([])
78
77
  @package = Puppet::Type.type(:package).new(:name => "yay", :ensure => :present)
79
78
 
80
79
  @catalog = Puppet::Resource::Catalog.new
@@ -117,18 +116,18 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
117
116
  describe "when it should be present" do
118
117
  [:present, :latest, "1.0"].each do |state|
119
118
  it "should do nothing if it is #{state.to_s}" do
120
- @provider.expects(:properties).returns(:ensure => state).at_least_once
121
- @alt_provider.expects(:properties).returns(:ensure => state).at_least_once
119
+ expect(@provider).to receive(:properties).and_return(:ensure => state).at_least(:once)
120
+ expect(@alt_provider).to receive(:properties).and_return(:ensure => state).at_least(:once)
122
121
  @catalog.apply
123
122
  end
124
123
  end
125
124
 
126
125
  [:purged, :absent].each do |state|
127
126
  it "should install if it is #{state.to_s}" do
128
- @provider.stubs(:properties).returns(:ensure => state)
129
- @provider.expects(:install)
130
- @alt_provider.stubs(:properties).returns(:ensure => state)
131
- @alt_provider.expects(:install)
127
+ allow(@provider).to receive(:properties).and_return(:ensure => state)
128
+ expect(@provider).to receive(:install)
129
+ allow(@alt_provider).to receive(:properties).and_return(:ensure => state)
130
+ expect(@alt_provider).to receive(:install)
132
131
  @catalog.apply
133
132
  end
134
133
  end
@@ -137,18 +136,17 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
137
136
  end
138
137
 
139
138
  describe Puppet::Type.type(:package), 'logging package state transitions' do
140
-
141
139
  let(:catalog) { Puppet::Resource::Catalog.new }
142
- let(:provider) { stub('provider', :class => Puppet::Type.type(:package).defaultprovider, :clear => nil, :validate_source => nil) }
140
+ let(:provider) { double('provider', :class => Puppet::Type.type(:package).defaultprovider, :clear => nil, :validate_source => nil) }
143
141
 
144
142
  before :each do
145
- Process.stubs(:euid).returns 0
146
- provider.stubs(:satisfies?).with([:purgeable]).returns(true)
147
- provider.class.stubs(:instances).returns([])
148
- provider.stubs(:install).returns nil
149
- provider.stubs(:uninstall).returns nil
150
- provider.stubs(:purge).returns nil
151
- Puppet::Type.type(:package).defaultprovider.stubs(:new).returns(provider)
143
+ allow(Process).to receive(:euid).and_return(0)
144
+ allow(provider).to receive(:satisfies?).with([:purgeable]).and_return(true)
145
+ allow(provider.class).to receive(:instances).and_return([])
146
+ allow(provider).to receive(:install).and_return(nil)
147
+ allow(provider).to receive(:uninstall).and_return(nil)
148
+ allow(provider).to receive(:purge).and_return(nil)
149
+ allow(Puppet::Type.type(:package).defaultprovider).to receive(:new).and_return(provider)
152
150
  end
153
151
 
154
152
  after :each do
@@ -179,9 +177,8 @@ describe Puppet::Type.type(:package), 'logging package state transitions' do
179
177
 
180
178
  states.each do |old, new_states|
181
179
  describe "#{old} package" do
182
-
183
180
  before :each do
184
- provider.stubs(:properties).returns(:ensure => old)
181
+ allow(provider).to receive(:properties).and_return(:ensure => old)
185
182
  end
186
183
 
187
184
  new_states.each do |new, status|
@@ -201,4 +198,3 @@ describe Puppet::Type.type(:package), 'logging package state transitions' do
201
198
  end
202
199
  end
203
200
  end
204
-
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet_spec/compiler'
@@ -10,7 +9,7 @@ describe Puppet::Type.type(:tidy) do
10
9
  include PuppetSpec::Compiler
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 be able to recursively remove directories" do
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/type'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/autoload'
@@ -84,7 +83,7 @@ describe Puppet::Util::Autoload do
84
83
 
85
84
  it "should be able to load files directly from modules" do
86
85
  ## modulepath can't be used until after app settings are initialized, so we need to simulate that:
87
- Puppet.settings.expects(:app_defaults_initialized?).returns(true).at_least_once
86
+ expect(Puppet.settings).to receive(:app_defaults_initialized?).and_return(true).at_least(:once)
88
87
 
89
88
  modulepath = tmpfile("autoload_module_testing")
90
89
  libdir = File.join(modulepath, "mymod", "lib", "foo")
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/util/rdoc'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet_spec/files'
@@ -1,4 +1,3 @@
1
- #!/usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/util/windows'
4
3
 
@@ -70,7 +69,6 @@ describe Puppet::Util::Windows::ADSI::Group,
70
69
  original_codepage = Encoding.default_external
71
70
  Encoding.default_external = Encoding::CP850 # Western Europe
72
71
 
73
-
74
72
  Puppet::Util::Windows::ADSI::Group.each do |group|
75
73
  expect(group.name.encoding).to be(Encoding::UTF_8)
76
74
  end
@@ -135,13 +133,13 @@ describe Puppet::Util::Windows::ADSI::Group,
135
133
  it 'should return a list of Principal objects even with unresolvable SIDs' do
136
134
  members = [
137
135
  # NULL SID is not localized
138
- stub('WIN32OLE', {
136
+ double('WIN32OLE', {
139
137
  :objectSID => [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
140
138
  :Name => 'NULL SID',
141
139
  :ole_respond_to? => true,
142
140
  }),
143
141
  # unresolvable SID is a different story altogether
144
- stub('WIN32OLE', {
142
+ double('WIN32OLE', {
145
143
  # completely valid SID, but Name is just a stringified version
146
144
  :objectSID => [1, 5, 0, 0, 0, 0, 0, 5, 21, 0, 0, 0, 5, 113, 65, 218, 15, 127, 9, 57, 219, 4, 84, 126, 88, 4, 0, 0],
147
145
  :Name => 'S-1-5-21-3661721861-956923663-2119435483-1112',
@@ -154,7 +152,7 @@ describe Puppet::Util::Windows::ADSI::Group,
154
152
 
155
153
  # touch the native_object member to have it lazily loaded, so COM objects can be stubbed
156
154
  admins.native_object
157
- admins.native_object.stubs(:Members).returns(members)
155
+ allow(admins.native_object).to receive(:Members).and_return(members)
158
156
 
159
157
  # well-known NULL SID
160
158
  expect(admins.members[0].sid).to eq('S-1-0-0')
@@ -1,4 +1,3 @@
1
- #!/usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/util/windows'
4
3
 
@@ -1,5 +1,3 @@
1
- #! /usr/bin/env ruby
2
-
3
1
  require 'spec_helper'
4
2
  require 'facter'
5
3
 
@@ -38,8 +36,8 @@ describe "Puppet::Util::Windows::Process", :if => Puppet::Util::Platform.windows
38
36
  after :each do
39
37
  # spec\integration\test\test_helper_spec.rb calls set_environment_strings
40
38
  # after :all and thus needs access to the real APIs once again
41
- Puppet::Util::Windows::Process.unstub(:GetEnvironmentStringsW)
42
- Puppet::Util::Windows::Process.unstub(:FreeEnvironmentStringsW)
39
+ allow(Puppet::Util::Windows::Process).to receive(:GetEnvironmentStringsW).and_call_original
40
+ allow(Puppet::Util::Windows::Process).to receive(:FreeEnvironmentStringsW).and_call_original
43
41
  end
44
42
 
45
43
  it "will ignore only keys or values with corrupt byte sequences" do
@@ -63,9 +61,9 @@ describe "Puppet::Util::Windows::Process", :if => Puppet::Util::Platform.windows
63
61
  ptr.put_array_of_uchar(0, env_var_block_bytes)
64
62
 
65
63
  # stub the block of memory that the Win32 API would typically return via pointer
66
- Puppet::Util::Windows::Process.expects(:GetEnvironmentStringsW).returns(ptr)
64
+ expect(Puppet::Util::Windows::Process).to receive(:GetEnvironmentStringsW).and_return(ptr)
67
65
  # stub out the real API call to free memory, else process crashes
68
- Puppet::Util::Windows::Process.expects(:FreeEnvironmentStringsW)
66
+ expect(Puppet::Util::Windows::Process).to receive(:FreeEnvironmentStringsW)
69
67
 
70
68
  env_vars = Puppet::Util::Windows::Process.get_environment_strings
71
69
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/util/windows'
4
3
 
@@ -31,8 +30,8 @@ describe Puppet::Util::Windows::Registry do
31
30
  TestRegistry.new
32
31
  end
33
32
 
34
- let(:name) { 'HKEY_LOCAL_MACHINE' }
35
- let(:path) { 'Software\Microsoft' }
33
+ let(:name) { 'HKEY_LOCAL_MACHINE' }
34
+ let(:path) { 'Software\Microsoft' }
36
35
 
37
36
  context "#root" do
38
37
  it "should lookup the root hkey" do
@@ -45,17 +44,15 @@ describe Puppet::Util::Windows::Registry do
45
44
  end
46
45
 
47
46
  context "#open" do
48
- let(:hkey) { stub 'hklm' }
49
- let(:subkey) { stub 'subkey' }
47
+ let(:hkey) { double('hklm') }
48
+ let(:subkey) { double('subkey') }
50
49
 
51
50
  before :each do
52
- subject.stubs(:root).returns(hkey)
51
+ allow(subject).to receive(:root).and_return(hkey)
53
52
  end
54
53
 
55
54
  it "should yield the opened the subkey" do
56
- hkey.expects(:open).with do |p, _|
57
- expect(p).to eq(path)
58
- end.yields(subkey)
55
+ expect(hkey).to receive(:open).with(path, anything).and_yield(subkey)
59
56
 
60
57
  yielded = nil
61
58
  subject.open(name, path) {|reg| yielded = reg}
@@ -66,7 +63,7 @@ describe Puppet::Util::Windows::Registry do
66
63
  [described_class::KEY64, described_class::KEY32].each do |access|
67
64
  it "should open the key for read access 0x#{access.to_s(16)}" do
68
65
  mode = described_class::KEY_READ | access
69
- hkey.expects(:open).with(path, mode)
66
+ expect(hkey).to receive(:open).with(path, mode)
70
67
 
71
68
  subject.open(name, path, mode) {|reg| }
72
69
  end
@@ -74,14 +71,14 @@ describe Puppet::Util::Windows::Registry do
74
71
  end
75
72
 
76
73
  it "should default to KEY64" do
77
- hkey.expects(:open).with(path, described_class::KEY_READ | described_class::KEY64)
74
+ expect(hkey).to receive(:open).with(path, described_class::KEY_READ | described_class::KEY64)
78
75
 
79
76
  subject.open(hkey, path) {|hkey| }
80
77
  end
81
78
 
82
79
  it "should raise for a path that doesn't exist" do
83
- hkey.expects(:keyname).returns('HKEY_LOCAL_MACHINE')
84
- hkey.expects(:open).raises(Win32::Registry::Error.new(2)) # file not found
80
+ expect(hkey).to receive(:keyname).and_return('HKEY_LOCAL_MACHINE')
81
+ expect(hkey).to receive(:open).and_raise(Win32::Registry::Error.new(2)) # file not found
85
82
  expect do
86
83
  subject.open(hkey, 'doesnotexist') {|hkey| }
87
84
  end.to raise_error(Puppet::Error, /Failed to open registry key 'HKEY_LOCAL_MACHINE\\doesnotexist'/)
@@ -89,34 +86,27 @@ describe Puppet::Util::Windows::Registry do
89
86
  end
90
87
 
91
88
  context "#values" do
92
- let(:key) { stub('uninstall') }
93
-
94
- def expects_registry_value(array)
95
- key.expects(:each_value).never
96
- subject.expects(:each_value).with(key).multiple_yields(array)
97
-
98
- subject.values(key).first[1]
99
- end
89
+ let(:key) { double('uninstall') }
100
90
 
101
91
  it "should return each value's name and data" do
102
- key.expects(:each_value).never
103
- subject.expects(:each_value).with(key).multiple_yields(
104
- ['string', 1, 'foo'], ['dword', 4, 0]
105
- )
92
+ expect(key).not_to receive(:each_value)
93
+ expect(subject).to receive(:each_value).with(key).and_yield('string', 1, 'foo').and_yield('dword', 4, 0)
94
+
106
95
  expect(subject.values(key)).to eq({ 'string' => 'foo', 'dword' => 0 })
107
96
  end
108
97
 
109
98
  it "should return an empty hash if there are no values" do
110
- key.expects(:each_value).never
111
- subject.expects(:each_value).with(key)
99
+ expect(key).not_to receive(:each_value)
100
+ expect(subject).to receive(:each_value).with(key)
112
101
 
113
102
  expect(subject.values(key)).to eq({})
114
103
  end
115
104
 
116
105
  it "passes REG_DWORD through" do
117
- reg_value = ['dword', Win32::Registry::REG_DWORD, '1']
106
+ expect(key).not_to receive(:each_value)
107
+ expect(subject).to receive(:each_value).with(key).and_yield('dword', Win32::Registry::REG_DWORD, '1')
118
108
 
119
- value = expects_registry_value(reg_value)
109
+ value = subject.values(key).first[1]
120
110
 
121
111
  expect(Integer(value)).to eq(1)
122
112
  end
@@ -127,11 +117,11 @@ describe Puppet::Util::Windows::Registry do
127
117
  TM_UTF_8 = [0xE2, 0x84, 0xA2]
128
118
  TM_UTF_16 = [0x2122]
129
119
 
130
- let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
131
- let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
132
- let (:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
133
- let (:guid) { SecureRandom.uuid }
134
- let (:regsam) { Puppet::Util::Windows::Registry::KEY32 }
120
+ let(:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
121
+ let(:puppet_key) { "SOFTWARE\\Puppet Labs"}
122
+ let(:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
123
+ let(:guid) { SecureRandom.uuid }
124
+ let(:regsam) { Puppet::Util::Windows::Registry::KEY32 }
135
125
 
136
126
  after(:each) do
137
127
  # Ruby 2.1.5 has bugs with deleting registry keys due to using ANSI
@@ -160,11 +150,11 @@ describe Puppet::Util::Windows::Registry do
160
150
  # a local codepage which can totally break when that codepage has no
161
151
  # conversion from the given UTF-16LE characters to local codepage
162
152
  # a prime example is that IBM437 has no conversion from a Unicode en-dash
163
- Win32::Registry.expects(:export_string).never
153
+ expect(Win32::Registry).not_to receive(:export_string)
164
154
 
165
155
  # also, expect that we're using our variants of keys / values, not Rubys
166
- Win32::Registry.expects(:each_key).never
167
- Win32::Registry.expects(:each_value).never
156
+ expect(Win32::Registry).not_to receive(:each_key)
157
+ expect(Win32::Registry).not_to receive(:each_value)
168
158
 
169
159
  hklm.create("#{puppet_key}\\#{subkey_name}", Win32::Registry::KEY_ALL_ACCESS | regsam) do |reg|
170
160
  reg.write("#{guid}", Win32::Registry::REG_SZ, utf_16_str)
@@ -185,10 +175,10 @@ describe Puppet::Util::Windows::Registry do
185
175
  end
186
176
 
187
177
  context "when reading values" do
188
- let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
189
- let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
190
- let (:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
191
- let (:value_name) { SecureRandom.uuid }
178
+ let(:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
179
+ let(:puppet_key) { "SOFTWARE\\Puppet Labs"}
180
+ let(:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
181
+ let(:value_name) { SecureRandom.uuid }
192
182
 
193
183
  after(:each) do
194
184
  hklm.open(puppet_key, Win32::Registry::KEY_ALL_ACCESS) do |reg|
@@ -226,10 +216,10 @@ describe Puppet::Util::Windows::Registry do
226
216
  end
227
217
 
228
218
  context "when reading corrupt values" do
229
- let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
230
- let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
231
- let (:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
232
- let (:value_name) { SecureRandom.uuid }
219
+ let(:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
220
+ let(:puppet_key) { "SOFTWARE\\Puppet Labs"}
221
+ let(:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
222
+ let(:value_name) { SecureRandom.uuid }
233
223
 
234
224
  before(:each) do
235
225
  hklm.create("#{puppet_key}\\#{subkey_name}", Win32::Registry::KEY_ALL_ACCESS) do |reg_key|
@@ -255,17 +245,17 @@ describe Puppet::Util::Windows::Registry do
255
245
  end
256
246
 
257
247
  context "#values_by_name" do
258
- let(:hkey) { stub 'hklm' }
259
- let(:subkey) { stub 'subkey' }
248
+ let(:hkey) { double('hklm') }
249
+ let(:subkey) { double('subkey') }
260
250
 
261
251
  before :each do
262
- subject.stubs(:root).returns(hkey)
252
+ allow(subject).to receive(:root).and_return(hkey)
263
253
  end
264
254
 
265
255
  context "when reading values" do
266
- let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
267
- let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
268
- let (:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
256
+ let(:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
257
+ let(:puppet_key) { "SOFTWARE\\Puppet Labs"}
258
+ let(:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
269
259
 
270
260
  before(:each) do
271
261
  hklm.create("#{puppet_key}\\#{subkey_name}", Win32::Registry::KEY_ALL_ACCESS) do |reg|