puppet 6.4.0-x64-mingw32 → 6.4.1-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (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
@@ -102,12 +102,11 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
102
102
  user
103
103
  end
104
104
 
105
- shared_examples "methods that return an overridden group struct from Etc" do |params|
106
-
105
+ shared_examples "methods that return an overridden group struct from Etc" do |param|
107
106
  it "should return a new Struct object with corresponding canonical_ members" do
108
107
  group = Etc::Group.new
109
- Etc.expects(subject).with(*params).returns(group)
110
- puppet_group = Puppet::Etc.send(subject, *params)
108
+ expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(group)
109
+ puppet_group = Puppet::Etc.send(subject, *param)
111
110
 
112
111
  expect(puppet_group.members).to include(*group.members)
113
112
  expect(puppet_group.members).to include(*group.members.map { |mem| "canonical_#{mem}".to_sym })
@@ -118,12 +117,12 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
118
117
 
119
118
  context "when Encoding.default_external is UTF-8" do
120
119
  before do
121
- Etc.expects(subject).with(*params).returns(utf_8_group_struct)
120
+ expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(utf_8_group_struct)
122
121
  end
123
122
 
124
123
  let(:overridden) {
125
124
  PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::UTF_8) do
126
- Puppet::Etc.send(subject, *params)
125
+ Puppet::Etc.send(subject, *param)
127
126
  end
128
127
  }
129
128
 
@@ -168,12 +167,12 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
168
167
 
169
168
  context "when Encoding.default_external is EUC_KR (i.e., neither UTF-8 nor POSIX)" do
170
169
  before do
171
- Etc.expects(subject).with(*params).returns(euc_kr_group_struct)
170
+ expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(euc_kr_group_struct)
172
171
  end
173
172
 
174
173
  let(:overridden) {
175
174
  PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::EUC_KR) do
176
- Puppet::Etc.send(subject, *params)
175
+ Puppet::Etc.send(subject, *param)
177
176
  end
178
177
  }
179
178
 
@@ -210,12 +209,12 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
210
209
 
211
210
  context "when Encoding.default_external is POSIX (ASCII-7bit)" do
212
211
  before do
213
- Etc.expects(subject).with(*params).returns(ascii_group_struct)
212
+ expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(ascii_group_struct)
214
213
  end
215
214
 
216
215
  let(:overridden) {
217
216
  PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ASCII) do
218
- Puppet::Etc.send(subject, *params)
217
+ Puppet::Etc.send(subject, *param)
219
218
  end
220
219
  }
221
220
 
@@ -251,12 +250,11 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
251
250
  end
252
251
  end
253
252
 
254
- shared_examples "methods that return an overridden user struct from Etc" do |params|
255
-
253
+ shared_examples "methods that return an overridden user struct from Etc" do |param|
256
254
  it "should return a new Struct object with corresponding canonical_ members" do
257
255
  user = Etc::Passwd.new
258
- Etc.expects(subject).with(*params).returns(user)
259
- puppet_user = Puppet::Etc.send(subject, *params)
256
+ expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(user)
257
+ puppet_user = Puppet::Etc.send(subject, *param)
260
258
 
261
259
  expect(puppet_user.members).to include(*user.members)
262
260
  expect(puppet_user.members).to include(*user.members.map { |mem| "canonical_#{mem}".to_sym })
@@ -266,12 +264,12 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
266
264
 
267
265
  context "when Encoding.default_external is UTF-8" do
268
266
  before do
269
- Etc.expects(subject).with(*params).returns(utf_8_user_struct)
267
+ expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(utf_8_user_struct)
270
268
  end
271
269
 
272
270
  let(:overridden) {
273
271
  PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::UTF_8) do
274
- Puppet::Etc.send(subject, *params)
272
+ Puppet::Etc.send(subject, *param)
275
273
  end
276
274
  }
277
275
 
@@ -303,12 +301,12 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
303
301
 
304
302
  context "when Encoding.default_external is EUC_KR (i.e., neither UTF-8 nor POSIX)" do
305
303
  before do
306
- Etc.expects(subject).with(*params).returns(euc_kr_user_struct)
304
+ expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(euc_kr_user_struct)
307
305
  end
308
306
 
309
307
  let(:overridden) {
310
308
  PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::EUC_KR) do
311
- Puppet::Etc.send(subject, *params)
309
+ Puppet::Etc.send(subject, *param)
312
310
  end
313
311
  }
314
312
 
@@ -336,12 +334,12 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
336
334
 
337
335
  context "when Encoding.default_external is POSIX (ASCII-7bit)" do
338
336
  before do
339
- Etc.expects(subject).with(*params).returns(ascii_user_struct)
337
+ expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(ascii_user_struct)
340
338
  end
341
339
 
342
340
  let(:overridden) {
343
341
  PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ASCII) do
344
- Puppet::Etc.send(subject, *params)
342
+ Puppet::Etc.send(subject, *param)
345
343
  end
346
344
  }
347
345
 
@@ -376,7 +374,7 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
376
374
  it_should_behave_like "methods that return an overridden group struct from Etc", 'foo'
377
375
 
378
376
  it "should call Etc.getgrnam with the supplied group name" do
379
- Etc.expects(:getgrnam).with('foo')
377
+ expect(Etc).to receive(:getgrnam).with('foo')
380
378
  Puppet::Etc.getgrnam('foo')
381
379
  end
382
380
  end
@@ -385,7 +383,7 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
385
383
  it_should_behave_like "methods that return an overridden group struct from Etc", 0
386
384
 
387
385
  it "should call Etc.getgrgid with supplied group id" do
388
- Etc.expects(:getgrgid).with(0)
386
+ expect(Etc).to receive(:getgrgid).with(0)
389
387
  Puppet::Etc.getgrgid(0)
390
388
  end
391
389
  end
@@ -398,7 +396,7 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
398
396
  it_should_behave_like "methods that return an overridden user struct from Etc", 'foo'
399
397
 
400
398
  it "should call Etc.getpwnam with that username" do
401
- Etc.expects(:getpwnam).with('foo')
399
+ expect(Etc).to receive(:getpwnam).with('foo')
402
400
  Puppet::Etc.getpwnam('foo')
403
401
  end
404
402
  end
@@ -407,14 +405,14 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
407
405
  it_should_behave_like "methods that return an overridden user struct from Etc", 2
408
406
 
409
407
  it "should call Etc.getpwuid with the id" do
410
- Etc.expects(:getpwuid).with(2)
408
+ expect(Etc).to receive(:getpwuid).with(2)
411
409
  Puppet::Etc.getpwuid(2)
412
410
  end
413
411
  end
414
412
 
415
413
  describe :group do
416
414
  it 'should return the next group struct if a block is not provided' do
417
- Puppet::Etc.expects(:getgrent).returns(ascii_group_struct)
415
+ expect(Puppet::Etc).to receive(:getgrent).and_return(ascii_group_struct)
418
416
 
419
417
  expect(Puppet::Etc.group).to eql(ascii_group_struct)
420
418
  end
@@ -425,10 +423,10 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
425
423
  euc_kr_group_struct,
426
424
  ascii_group_struct
427
425
  ]
428
- Puppet::Etc.stubs(:getgrent).returns(*(expected_groups + [nil]))
426
+ allow(Puppet::Etc).to receive(:getgrent).and_return(*(expected_groups + [nil]))
429
427
 
430
- Puppet::Etc.expects(:setgrent)
431
- Puppet::Etc.expects(:endgrent)
428
+ expect(Puppet::Etc).to receive(:setgrent)
429
+ expect(Puppet::Etc).to receive(:endgrent)
432
430
 
433
431
  actual_groups = []
434
432
  Puppet::Etc.group { |group| actual_groups << group }
@@ -439,28 +437,28 @@ describe Puppet::Etc, :if => !Puppet::Util::Platform.windows? do
439
437
 
440
438
  describe "endgrent" do
441
439
  it "should call Etc.getgrent" do
442
- Etc.expects(:getgrent)
440
+ expect(Etc).to receive(:getgrent)
443
441
  Puppet::Etc.getgrent
444
442
  end
445
443
  end
446
444
 
447
445
  describe "setgrent" do
448
446
  it "should call Etc.setgrent" do
449
- Etc.expects(:setgrent)
447
+ expect(Etc).to receive(:setgrent)
450
448
  Puppet::Etc.setgrent
451
449
  end
452
450
  end
453
451
 
454
452
  describe "endpwent" do
455
453
  it "should call Etc.endpwent" do
456
- Etc.expects(:endpwent)
454
+ expect(Etc).to receive(:endpwent)
457
455
  Puppet::Etc.endpwent
458
456
  end
459
457
  end
460
458
 
461
459
  describe "setpwent" do
462
460
  it "should call Etc.setpwent" do
463
- Etc.expects(:setpwent)
461
+ expect(Etc).to receive(:setpwent)
464
462
  Puppet::Etc.setpwent
465
463
  end
466
464
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  # Encoding: UTF-8
3
2
  require 'spec_helper'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/face'
4
3
 
@@ -1,8 +1,6 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/face'
4
3
 
5
- module PuppetFaceSpecs
6
4
  describe Puppet::Face[:config, '0.0.1'] do
7
5
 
8
6
  let(:config) { described_class }
@@ -65,7 +63,7 @@ trace = true
65
63
  #This has to be after the settings above, which resets the value
66
64
  Puppet[:log_level] = 'info'
67
65
 
68
- Puppet.expects(:warning).never
66
+ expect(Puppet).not_to receive(:warning)
69
67
  expect {
70
68
  result = subject.print("syslogfacility", :section => "user")
71
69
  expect(render(:print, result)).to eq("file\n")
@@ -76,7 +74,7 @@ trace = true
76
74
  Puppet[:log_level] = 'info'
77
75
  Puppet[:trace] = true
78
76
 
79
- Puppet.expects(:warning).with("No section specified; defaulting to 'main'.\nSet the config section " +
77
+ expect(Puppet).to receive(:warning).with("No section specified; defaulting to 'main'.\nSet the config section " +
80
78
  "by using the `--section` flag.\nFor example, `puppet config --section user print foo`.\nFor more " +
81
79
  "information, see https://puppet.com/docs/puppet/latest/configuration.html")
82
80
  expect {
@@ -89,7 +87,7 @@ trace = true
89
87
  Puppet[:log_level] = 'notice'
90
88
  Puppet[:trace] = true
91
89
 
92
- Puppet.expects(:warning).never
90
+ expect(Puppet).not_to receive(:warning)
93
91
  expect {
94
92
  result = subject.print("trace")
95
93
  expect(render(:print, result)).to eq("true\n")
@@ -132,13 +130,13 @@ trace = true
132
130
  let(:path) { Pathname.new(config_file).expand_path }
133
131
  before(:each) do
134
132
  Puppet[:config] = config_file
135
- Puppet::FileSystem.stubs(:pathname).with(path.to_s).returns(path)
136
- Puppet::FileSystem.stubs(:touch)
133
+ allow(Puppet::FileSystem).to receive(:pathname).with(path.to_s).and_return(path)
134
+ allow(Puppet::FileSystem).to receive(:touch)
137
135
  end
138
136
 
139
137
  it "prints the section and environment when no section is given and verbose is set" do
140
138
  Puppet[:log_level] = 'info'
141
- Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
139
+ allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
142
140
  expect {
143
141
  subject.set('foo', 'bar')
144
142
  }.to output("\e[1;33mResolving settings from section 'main' in environment 'production'\e[0m\n").to_stderr
@@ -146,40 +144,40 @@ trace = true
146
144
 
147
145
  it "prints the section and environment when a section is given and verbose is set" do
148
146
  Puppet[:log_level] = 'info'
149
- Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
147
+ allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
150
148
  expect {
151
149
  subject.set('foo', 'bar', {:section => "baz"})
152
150
  }.to output("\e[1;33mResolving settings from section 'baz' in environment 'production'\e[0m\n").to_stderr
153
151
  end
154
152
 
155
153
  it "writes to the correct puppet config file" do
156
- Puppet::FileSystem.expects(:open).with(path, anything, anything)
154
+ expect(Puppet::FileSystem).to receive(:open).with(path, anything, anything)
157
155
  subject.set('foo', 'bar')
158
156
  end
159
157
 
160
158
  it "creates a config file if one does not exist" do
161
- Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
162
- Puppet::FileSystem.expects(:touch).with(path)
159
+ allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
160
+ expect(Puppet::FileSystem).to receive(:touch).with(path)
163
161
  subject.set('foo', 'bar')
164
162
  end
165
163
 
166
164
  it "sets the supplied config/value in the default section (main)" do
167
- Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
165
+ allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
168
166
  config = Puppet::Settings::IniFile.new([Puppet::Settings::IniFile::DefaultSection.new])
169
167
  manipulator = Puppet::Settings::IniFile::Manipulator.new(config)
170
- Puppet::Settings::IniFile::Manipulator.stubs(:new).returns(manipulator)
168
+ allow(Puppet::Settings::IniFile::Manipulator).to receive(:new).and_return(manipulator)
171
169
 
172
- manipulator.expects(:set).with("main", "foo", "bar")
170
+ expect(manipulator).to receive(:set).with("main", "foo", "bar")
173
171
  subject.set('foo', 'bar')
174
172
  end
175
173
 
176
174
  it "sets the value in the supplied section" do
177
- Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
175
+ allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
178
176
  config = Puppet::Settings::IniFile.new([Puppet::Settings::IniFile::DefaultSection.new])
179
177
  manipulator = Puppet::Settings::IniFile::Manipulator.new(config)
180
- Puppet::Settings::IniFile::Manipulator.stubs(:new).returns(manipulator)
178
+ allow(Puppet::Settings::IniFile::Manipulator).to receive(:new).and_return(manipulator)
181
179
 
182
- manipulator.expects(:set).with("baz", "foo", "bar")
180
+ expect(manipulator).to receive(:set).with("baz", "foo", "bar")
183
181
  subject.set('foo', 'bar', {:section => "baz"})
184
182
  end
185
183
 
@@ -190,7 +188,7 @@ trace = true
190
188
  CONF
191
189
 
192
190
  myfile = StringIO.new(contents)
193
- Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(myfile)
191
+ allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(myfile)
194
192
 
195
193
  subject.set('foo', 'bar')
196
194
 
@@ -199,7 +197,7 @@ trace = true
199
197
  end
200
198
 
201
199
  it "opens the file with UTF-8 encoding" do
202
- Puppet::FileSystem.expects(:open).with(path, nil, 'r+:UTF-8')
200
+ expect(Puppet::FileSystem).to receive(:open).with(path, nil, 'r+:UTF-8')
203
201
  subject.set('foo', 'bar')
204
202
  end
205
203
  end
@@ -207,14 +205,15 @@ trace = true
207
205
  context 'when the puppet.conf file does not exist' do
208
206
  let(:config_file) { '/foo/puppet.conf' }
209
207
  let(:path) { Pathname.new(config_file).expand_path }
208
+
210
209
  before(:each) do
211
210
  Puppet[:config] = config_file
212
- Puppet::FileSystem.stubs(:pathname).with(path.to_s).returns(path)
211
+ allow(Puppet::FileSystem).to receive(:pathname).with(path.to_s).and_return(path)
213
212
  end
214
213
 
215
214
  it 'prints a message when the puppet.conf file does not exist' do
216
- Puppet::FileSystem.stubs(:exist?).with(path).returns(false)
217
- Puppet.expects(:warning).with("The puppet.conf file does not exist #{path.to_s}")
215
+ allow(Puppet::FileSystem).to receive(:exist?).with(path).and_return(false)
216
+ expect(Puppet).to receive(:warning).with("The puppet.conf file does not exist #{path.to_s}")
218
217
  subject.delete('setting', {:section => 'main'})
219
218
  end
220
219
  end
@@ -224,34 +223,33 @@ trace = true
224
223
  let(:path) { Pathname.new(config_file).expand_path }
225
224
  before(:each) do
226
225
  Puppet[:config] = config_file
227
- Puppet::FileSystem.stubs(:pathname).with(path.to_s).returns(path)
228
- Puppet::FileSystem.stubs(:exist?).with(path).returns(true)
226
+ allow(Puppet::FileSystem).to receive(:pathname).with(path.to_s).and_return(path)
227
+ allow(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
229
228
  end
230
229
 
231
230
  it 'prints a message about what was deleted' do
232
- Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
231
+ allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
233
232
  config = Puppet::Settings::IniFile.new([Puppet::Settings::IniFile::DefaultSection.new])
234
233
  manipulator = Puppet::Settings::IniFile::Manipulator.new(config)
235
- Puppet::Settings::IniFile::Manipulator.stubs(:new).returns(manipulator)
234
+ allow(Puppet::Settings::IniFile::Manipulator).to receive(:new).and_return(manipulator)
236
235
 
237
- manipulator.expects(:delete).with('main', 'setting').returns(' setting=value')
236
+ expect(manipulator).to receive(:delete).with('main', 'setting').and_return(' setting=value')
238
237
  expect { subject.delete('setting', {:section => 'main'}) }.to have_printed("Deleted setting from 'main': 'setting=value'")
239
238
  end
240
239
 
241
240
  it 'prints a warning when a setting is not found to delete' do
242
- Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
241
+ allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
243
242
  config = Puppet::Settings::IniFile.new([Puppet::Settings::IniFile::DefaultSection.new])
244
243
  manipulator = Puppet::Settings::IniFile::Manipulator.new(config)
245
- Puppet::Settings::IniFile::Manipulator.stubs(:new).returns(manipulator)
244
+ allow(Puppet::Settings::IniFile::Manipulator).to receive(:new).and_return(manipulator)
246
245
 
247
- manipulator.expects(:delete).with('main', 'setting').returns(nil)
248
- Puppet.expects(:warning).with("No setting found in configuration file for section 'main' setting name 'setting'")
246
+ expect(manipulator).to receive(:delete).with('main', 'setting').and_return(nil)
247
+ expect(Puppet).to receive(:warning).with("No setting found in configuration file for section 'main' setting name 'setting'")
249
248
  subject.delete('setting', {:section => 'main'})
250
249
  end
251
250
  end
252
251
 
253
252
  shared_examples_for :config_printing_a_section do |section|
254
-
255
253
  def add_section_option(args, section)
256
254
  args << { :section => section } if section
257
255
  args
@@ -337,7 +335,6 @@ modulepath =
337
335
  end
338
336
 
339
337
  context "from master section" do
340
-
341
338
  before(:each) do
342
339
  Puppet.settings.parse_config(<<-CONF)
343
340
  [master]
@@ -350,4 +347,3 @@ modulepath =
350
347
  end
351
348
  end
352
349
  end
353
- end
@@ -102,7 +102,6 @@ describe Puppet::Face[:epp, :current] do
102
102
  end
103
103
  end
104
104
 
105
-
106
105
  context "dump" do
107
106
  it "prints the AST of a template given with the -e option" do
108
107
  expect(eppface.dump({ :e => 'hello world' })).to eq("(lambda (epp (block\n (render-s 'hello world')\n)))\n")
@@ -376,11 +375,11 @@ goodbye world
376
375
  end
377
376
 
378
377
  def from_an_interactive_terminal
379
- STDIN.stubs(:tty?).returns(true)
378
+ allow(STDIN).to receive(:tty?).and_return(true)
380
379
  end
381
380
 
382
381
  def from_a_piped_input_of(contents)
383
- STDIN.stubs(:tty?).returns(false)
384
- STDIN.stubs(:read).returns(contents)
382
+ allow(STDIN).to receive(:tty?).and_return(false)
383
+ allow(STDIN).to receive(:read).and_return(contents)
385
384
  end
386
385
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/face'
4
3
  require 'puppet/indirector/facts/facter'
@@ -28,26 +27,26 @@ CONF
28
27
  # Faces start in :user run mode
29
28
  Puppet.settings.preferred_run_mode = :user
30
29
 
31
- facter_terminus.stubs(:find).with(instance_of(Puppet::Indirector::Request)).returns(test_data)
32
- rest_terminus.stubs(:save).with(instance_of(Puppet::Indirector::Request)).returns(nil)
30
+ allow(facter_terminus).to receive(:find).with(instance_of(Puppet::Indirector::Request)).and_return(test_data)
31
+ allow(rest_terminus).to receive(:save).with(instance_of(Puppet::Indirector::Request)).and_return(nil)
33
32
  end
34
33
 
35
34
  it { is_expected.to be_action :upload }
36
35
 
37
36
  it "finds facts from terminus_class :facter" do
38
- facter_terminus.expects(:find).with(instance_of(Puppet::Indirector::Request)).returns(test_data)
37
+ expect(facter_terminus).to receive(:find).with(instance_of(Puppet::Indirector::Request)).and_return(test_data)
39
38
 
40
39
  subject.upload
41
40
  end
42
41
 
43
42
  it "saves facts to terminus_class :rest" do
44
- rest_terminus.expects(:save).with(instance_of(Puppet::Indirector::Request)).returns(nil)
43
+ expect(rest_terminus).to receive(:save).with(instance_of(Puppet::Indirector::Request)).and_return(nil)
45
44
 
46
45
  subject.upload
47
46
  end
48
47
 
49
48
  it "uses settings from the agent section of puppet.conf" do
50
- facter_terminus.expects(:find).with(responds_with(:key, 'puppet.node.test')).returns(test_data)
49
+ expect(facter_terminus).to receive(:find).with(have_attributes(key: 'puppet.node.test')).and_return(test_data)
51
50
 
52
51
  subject.upload
53
52
  end