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,6 +1,4 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
-
4
2
  require 'puppet/resource/status'
5
3
 
6
4
  describe Puppet::Resource::Status do
@@ -11,7 +9,7 @@ describe Puppet::Resource::Status do
11
9
  let(:status) { Puppet::Resource::Status.new(resource) }
12
10
 
13
11
  before do
14
- resource.stubs(:pathbuilder).returns(containment_path)
12
+ allow(resource).to receive(:pathbuilder).and_return(containment_path)
15
13
  end
16
14
 
17
15
  it "should compute type and title correctly" do
@@ -43,7 +41,7 @@ describe Puppet::Resource::Status do
43
41
  end
44
42
 
45
43
  it "should set its source description to the resource's path" do
46
- resource.expects(:path).returns "/my/path"
44
+ expect(resource).to receive(:path).and_return("/my/path")
47
45
  expect(Puppet::Resource::Status.new(resource).source_description).to eq("/my/path")
48
46
  end
49
47
 
@@ -53,7 +51,7 @@ describe Puppet::Resource::Status do
53
51
 
54
52
  [:file, :line].each do |attr|
55
53
  it "should copy the resource's #{attr}" do
56
- resource.expects(attr).returns "foo"
54
+ expect(resource).to receive(attr).and_return("foo")
57
55
  expect(Puppet::Resource::Status.new(resource).send(attr)).to eq("foo")
58
56
  end
59
57
  end
@@ -66,7 +64,7 @@ describe Puppet::Resource::Status do
66
64
  end
67
65
 
68
66
  it "should always convert the resource to a string" do
69
- resource.expects(:to_s).returns "foo"
67
+ expect(resource).to receive(:to_s).and_return("foo")
70
68
  expect(Puppet::Resource::Status.new(resource).resource).to eq("foo")
71
69
  end
72
70
 
@@ -111,8 +109,8 @@ describe Puppet::Resource::Status do
111
109
 
112
110
  it "fails and records a failure event with a given exception" do
113
111
  error = StandardError.new("the message")
114
- resource.expects(:log_exception).with(error, "Could not evaluate: the message")
115
- status.expects(:fail_with_event).with("the message")
112
+ expect(resource).to receive(:log_exception).with(error, "Could not evaluate: the message")
113
+ expect(status).to receive(:fail_with_event).with("the message")
116
114
 
117
115
  status.failed_because(error)
118
116
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/resource/type_collection'
@@ -15,8 +14,8 @@ describe Puppet::Resource::TypeCollection do
15
14
  end
16
15
 
17
16
  it "should consider '<<' to be an alias to 'add' but should return self" do
18
- @code.expects(:add).with "foo"
19
- @code.expects(:add).with "bar"
17
+ expect(@code).to receive(:add).with("foo")
18
+ expect(@code).to receive(:add).with("bar")
20
19
  @code << "foo" << "bar"
21
20
  end
22
21
 
@@ -97,39 +96,40 @@ describe Puppet::Resource::TypeCollection do
97
96
 
98
97
  it "should not attempt to import anything when the type is already defined" do
99
98
  @code.add @type
100
- @code.loader.expects(:import).never
99
+ expect(@code.loader).not_to receive(:import)
101
100
  expect(@code.find_hostclass("ns::klass")).to equal(@type)
102
101
  end
103
102
 
104
103
  describe "that need to be loaded" do
105
104
  it "should use the loader to load the files" do
106
- @code.loader.expects(:try_load_fqname).with(:hostclass, "klass")
105
+ expect(@code.loader).to receive(:try_load_fqname).with(:hostclass, "klass")
107
106
  @code.find_hostclass("klass")
108
107
  end
108
+
109
109
  it "should use the loader to load the files" do
110
- @code.loader.expects(:try_load_fqname).with(:hostclass, "ns::klass")
110
+ expect(@code.loader).to receive(:try_load_fqname).with(:hostclass, "ns::klass")
111
111
  @code.find_hostclass("ns::klass")
112
112
  end
113
113
 
114
114
  it "should downcase the name and downcase and array-fy the namespaces before passing to the loader" do
115
- @code.loader.expects(:try_load_fqname).with(:hostclass, "ns::klass")
115
+ expect(@code.loader).to receive(:try_load_fqname).with(:hostclass, "ns::klass")
116
116
  @code.find_hostclass("ns::klass")
117
117
  end
118
118
 
119
119
  it "should use the class returned by the loader" do
120
- @code.loader.expects(:try_load_fqname).returns(:klass)
121
- @code.expects(:hostclass).with("ns::klass").returns(false)
120
+ expect(@code.loader).to receive(:try_load_fqname).and_return(:klass)
121
+ expect(@code).to receive(:hostclass).with("ns::klass").and_return(false)
122
122
  expect(@code.find_hostclass("ns::klass")).to eq(:klass)
123
123
  end
124
124
 
125
125
  it "should return nil if the name isn't found" do
126
- @code.loader.stubs(:try_load_fqname).returns(nil)
126
+ allow(@code.loader).to receive(:try_load_fqname).and_return(nil)
127
127
  expect(@code.find_hostclass("Ns::Klass")).to be_nil
128
128
  end
129
129
 
130
130
  it "already-loaded names at broader scopes should not shadow autoloaded names" do
131
131
  @code.add Puppet::Resource::Type.new(:hostclass, "bar")
132
- @code.loader.expects(:try_load_fqname).with(:hostclass, "foo::bar").returns(:foobar)
132
+ expect(@code.loader).to receive(:try_load_fqname).with(:hostclass, "foo::bar").and_return(:foobar)
133
133
  expect(@code.find_hostclass("foo::bar")).to eq(:foobar)
134
134
  end
135
135
 
@@ -146,9 +146,9 @@ describe Puppet::Resource::TypeCollection do
146
146
 
147
147
  it "should not try to autoload names that we couldn't autoload in a previous step if ignoremissingtypes is enabled" do
148
148
  Puppet[:ignoremissingtypes] = true
149
- @code.loader.expects(:try_load_fqname).with(:hostclass, "ns::klass").returns(nil)
149
+ expect(@code.loader).to receive(:try_load_fqname).with(:hostclass, "ns::klass").and_return(nil)
150
150
  expect(@code.find_hostclass("ns::klass")).to be_nil
151
- Puppet.expects(:debug).at_least_once.with {|msg| msg =~ /Not attempting to load hostclass/}
151
+ expect(Puppet).to receive(:debug).at_least(:once).with(/Not attempting to load hostclass/)
152
152
  expect(@code.find_hostclass("ns::klass")).to be_nil
153
153
  end
154
154
  end
@@ -255,7 +255,6 @@ describe Puppet::Resource::TypeCollection do
255
255
 
256
256
  expect(@loader.find_hostclass("::bar")).to eq(nil)
257
257
  end
258
-
259
258
  end
260
259
 
261
260
  it "should be able to find nodes" do
@@ -312,7 +311,7 @@ describe Puppet::Resource::TypeCollection do
312
311
  it "should default to the current time" do
313
312
  time = Time.now
314
313
 
315
- Time.stubs(:now).returns time
314
+ allow(Time).to receive(:now).and_return(time)
316
315
  expect(@code.version).to eq(time.to_i)
317
316
  end
318
317
 
@@ -320,15 +319,15 @@ describe Puppet::Resource::TypeCollection do
320
319
  let(:environment) { Puppet::Node::Environment.create(:testing, [], '', '/my/foo') }
321
320
 
322
321
  it "should use the output of the environment's config_version setting if one is provided" do
323
- Puppet::Util::Execution.expects(:execute)
322
+ expect(Puppet::Util::Execution).to receive(:execute)
324
323
  .with(["/my/foo"])
325
- .returns Puppet::Util::Execution::ProcessOutput.new("output\n", 0)
324
+ .and_return(Puppet::Util::Execution::ProcessOutput.new("output\n", 0))
326
325
  expect(@code.version).to be_instance_of(String)
327
326
  expect(@code.version).to eq("output")
328
327
  end
329
328
 
330
329
  it "should raise a puppet parser error if executing config_version fails" do
331
- Puppet::Util::Execution.expects(:execute).raises(Puppet::ExecutionFailure.new("msg"))
330
+ expect(Puppet::Util::Execution).to receive(:execute).and_raise(Puppet::ExecutionFailure.new("msg"))
332
331
 
333
332
  expect { @code.version }.to raise_error(Puppet::ParseError)
334
333
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/resource/type'
4
3
  require 'puppet/pops'
@@ -197,7 +196,7 @@ describe Puppet::Resource::Type do
197
196
 
198
197
  before(:each) do
199
198
  compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("foo"))
200
- @scope = Puppet::Parser::Scope.new(compiler, :source => stub("source"))
199
+ @scope = Puppet::Parser::Scope.new(compiler, :source => double("source"))
201
200
  @resource = Puppet::Parser::Resource.new(:foo, "bar", :scope => @scope)
202
201
  @type = Puppet::Resource::Type.new(:definition, "foo")
203
202
  @resource.environment.known_resource_types.add @type
@@ -433,7 +432,7 @@ describe Puppet::Resource::Type do
433
432
  end
434
433
 
435
434
  it "should set its caller module name in the scope if available" do
436
- @scope.expects(:parent_module_name).returns "mycaller"
435
+ expect(@scope).to receive(:parent_module_name).and_return("mycaller")
437
436
 
438
437
  @type.set_resource_parameters(@resource, @scope)
439
438
 
@@ -472,8 +471,8 @@ describe Puppet::Resource::Type do
472
471
  end
473
472
 
474
473
  it "should cache a reference to the parent type" do
475
- @krt.stubs(:hostclass).with("foo::bar").returns nil
476
- @krt.expects(:hostclass).with("bar").once.returns @parent
474
+ allow(@krt).to receive(:hostclass).with("foo::bar").and_return(nil)
475
+ expect(@krt).to receive(:hostclass).with("bar").once.and_return(@parent)
477
476
  @child.parent_type(@scope)
478
477
  @child.parent_type
479
478
  end
@@ -518,18 +517,18 @@ describe Puppet::Resource::Type do
518
517
  @type = Puppet::Resource::Type.new(:node, /f(\w)o(.*)$/)
519
518
  match = @type.match('foo')
520
519
 
521
- code = stub 'code'
522
- @type.stubs(:code).returns code
520
+ code = double('code')
521
+ allow(@type).to receive(:code).and_return(code)
523
522
 
524
- subscope = stub 'subscope', :compiler => @compiler
525
- @scope.expects(:newscope).with(:source => @type, :resource => @resource).returns subscope
523
+ subscope = double('subscope', :compiler => @compiler)
524
+ expect(@scope).to receive(:newscope).with(:source => @type, :resource => @resource).and_return(subscope)
526
525
 
527
- subscope.expects(:with_guarded_scope).yields
528
- subscope.expects(:ephemeral_from).with(match, nil, nil).returns subscope
529
- code.expects(:safeevaluate).with(subscope)
526
+ expect(subscope).to receive(:with_guarded_scope).and_yield
527
+ expect(subscope).to receive(:ephemeral_from).with(match, nil, nil).and_return(subscope)
528
+ expect(code).to receive(:safeevaluate).with(subscope)
530
529
 
531
530
  # Just to keep the stub quiet about intermediate calls
532
- @type.expects(:set_resource_parameters).with(@resource, subscope)
531
+ expect(@type).to receive(:set_resource_parameters).with(@resource, subscope)
533
532
 
534
533
  @type.evaluate_code(@resource)
535
534
  end
@@ -546,17 +545,17 @@ describe Puppet::Resource::Type do
546
545
  end
547
546
 
548
547
  it "should set all of its parameters in a subscope" do
549
- subscope = stub 'subscope', :compiler => @compiler
550
- @scope.expects(:newscope).with(:source => @type, :resource => @resource).returns subscope
551
- @type.expects(:set_resource_parameters).with(@resource, subscope)
548
+ subscope = double('subscope', :compiler => @compiler)
549
+ expect(@scope).to receive(:newscope).with(:source => @type, :resource => @resource).and_return(subscope)
550
+ expect(@type).to receive(:set_resource_parameters).with(@resource, subscope)
552
551
 
553
552
  @type.evaluate_code(@resource)
554
553
  end
555
554
 
556
555
  it "should not create a subscope for the :main class" do
557
- @resource.stubs(:title).returns(:main)
558
- @type.expects(:subscope).never
559
- @type.expects(:set_resource_parameters).with(@resource, @scope)
556
+ allow(@resource).to receive(:title).and_return(:main)
557
+ expect(@type).not_to receive(:subscope)
558
+ expect(@type).to receive(:set_resource_parameters).with(@resource, @scope)
560
559
 
561
560
  @type.evaluate_code(@resource)
562
561
  end
@@ -573,15 +572,15 @@ describe Puppet::Resource::Type do
573
572
  end
574
573
 
575
574
  it "should evaluate the AST code if any is provided" do
576
- code = stub 'code'
577
- @type.stubs(:code).returns code
578
- code.expects(:safeevaluate).with kind_of(Puppet::Parser::Scope)
575
+ code = double('code')
576
+ allow(@type).to receive(:code).and_return(code)
577
+ expect(code).to receive(:safeevaluate).with(kind_of(Puppet::Parser::Scope))
579
578
 
580
579
  @type.evaluate_code(@resource)
581
580
  end
582
581
 
583
582
  it "should noop if there is no code" do
584
- @type.expects(:code).returns nil
583
+ expect(@type).to receive(:code).and_return(nil)
585
584
 
586
585
  @type.evaluate_code(@resource)
587
586
  end
@@ -611,7 +610,7 @@ describe Puppet::Resource::Type do
611
610
 
612
611
  @type.parent_type(@scope)
613
612
 
614
- @parent_resource.expects(:evaluate).never
613
+ expect(@parent_resource).not_to receive(:evaluate)
615
614
 
616
615
  @type.evaluate_code(@resource)
617
616
  end
@@ -651,7 +650,7 @@ describe Puppet::Resource::Type do
651
650
 
652
651
  @type.parent_type(@scope)
653
652
 
654
- @parent_resource.expects(:evaluate).never
653
+ expect(@parent_resource).not_to receive(:evaluate)
655
654
 
656
655
  @type.evaluate_code(@resource)
657
656
  end
@@ -740,14 +739,14 @@ describe Puppet::Resource::Type do
740
739
  end
741
740
 
742
741
  it "should not create a new resource if one already exists" do
743
- @compiler.catalog.expects(:resource).with(:class, "top").returns("something")
744
- @compiler.catalog.expects(:add_resource).never
742
+ expect(@compiler.catalog).to receive(:resource).with(:class, "top").and_return("something")
743
+ expect(@compiler.catalog).not_to receive(:add_resource)
745
744
  @top.ensure_in_catalog(@scope)
746
745
  end
747
746
 
748
747
  it "should return the existing resource when not creating a new one" do
749
- @compiler.catalog.expects(:resource).with(:class, "top").returns("something")
750
- @compiler.catalog.expects(:add_resource).never
748
+ expect(@compiler.catalog).to receive(:resource).with(:class, "top").and_return("something")
749
+ expect(@compiler.catalog).not_to receive(:add_resource)
751
750
  expect(@top.ensure_in_catalog(@scope)).to eq("something")
752
751
  end
753
752
 
@@ -805,9 +804,9 @@ describe Puppet::Resource::Type do
805
804
  code = Puppet::Resource::TypeCollection.new("env")
806
805
  code.add Puppet::Resource::Type.new(:hostclass, "")
807
806
  other = Puppet::Resource::Type.new(:hostclass, "")
808
- mock = stub
809
- mock.expects(:is_definitions_only?).returns(false)
810
- other.expects(:code).returns(mock)
807
+ mock = double()
808
+ expect(mock).to receive(:is_definitions_only?).and_return(false)
809
+ expect(other).to receive(:code).and_return(mock)
811
810
  expect { code.hostclass("").merge(other) }.to raise_error(Puppet::Error)
812
811
  end
813
812
 
@@ -816,9 +815,9 @@ describe Puppet::Resource::Type do
816
815
  code = Puppet::Resource::TypeCollection.new("env")
817
816
  code.add Puppet::Resource::Type.new(:hostclass, "")
818
817
  other = Puppet::Resource::Type.new(:hostclass, "")
819
- mock = stub
820
- mock.expects(:is_definitions_only?).returns(true)
821
- other.expects(:code).at_least_once.returns(mock)
818
+ mock = double()
819
+ expect(mock).to receive(:is_definitions_only?).and_return(true)
820
+ expect(other).to receive(:code).at_least(:once).and_return(mock)
822
821
  expect { code.hostclass("").merge(other) }.not_to raise_error
823
822
  end
824
823
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/resource'
4
3
 
@@ -8,8 +7,13 @@ describe Puppet::Resource do
8
7
  let(:basepath) { make_absolute("/somepath") }
9
8
  let(:environment) { Puppet::Node::Environment.create(:testing, []) }
10
9
 
11
- def expect_lookup(key)
12
- Puppet::Pops::Lookup::GlobalDataProvider.any_instance.expects(:unchecked_key_lookup).with(Puppet::Pops::Lookup::LookupKey.new(key), any_parameters)
10
+ def expect_lookup(key, options = {})
11
+ expectation = receive(:unchecked_key_lookup).with(Puppet::Pops::Lookup::LookupKey.new(key), any_args)
12
+ expectation = expectation.and_throw(options[:throws]) if options[:throws]
13
+ expectation = expectation.and_raise(*options[:raises]) if options[:raises]
14
+ expectation = expectation.and_return(options[:returns]) if options[:returns]
15
+
16
+ expect_any_instance_of(Puppet::Pops::Lookup::GlobalDataProvider).to expectation
13
17
  end
14
18
 
15
19
  [:catalog, :file, :line].each do |attr|
@@ -284,7 +288,7 @@ describe Puppet::Resource do
284
288
 
285
289
  it "should fail when asked to set default values and it is not a parser resource" do
286
290
  environment.known_resource_types.add(
287
- Puppet::Resource::Type.new(:definition, "default_param", :arguments => {"a" => ast_leaf("default")})
291
+ Puppet::Resource::Type.new(:definition, "default_param", :arguments => {"a" => ast_leaf("default")})
288
292
  )
289
293
  resource = Puppet::Resource.new("default_param", "name", :environment => environment)
290
294
  expect { resource.set_default_parameters(scope) }.to raise_error(Puppet::DevError)
@@ -327,9 +331,9 @@ describe Puppet::Resource do
327
331
  before do
328
332
  environment.known_resource_types.add(apache)
329
333
 
330
- scope.stubs(:host).returns('host')
331
- scope.stubs(:environment).returns(environment)
332
- scope.stubs(:facts).returns(Puppet::Node::Facts.new("facts", fact_values))
334
+ allow(scope).to receive(:host).and_return('host')
335
+ allow(scope).to receive(:environment).and_return(environment)
336
+ allow(scope).to receive(:facts).and_return(Puppet::Node::Facts.new("facts", fact_values))
333
337
  end
334
338
 
335
339
  context 'with a default value expression' do
@@ -341,14 +345,14 @@ describe Puppet::Resource do
341
345
  end
342
346
 
343
347
  it "should query the data_binding terminus using a namespaced key" do
344
- expect_lookup('lookup_options').throws(:no_such_key)
348
+ expect_lookup('lookup_options', throws: :no_such_key)
345
349
  expect_lookup('apache::port')
346
350
  inject_and_set_defaults(resource, scope)
347
351
  end
348
352
 
349
353
  it "should use the value from the data_binding terminus" do
350
- expect_lookup('lookup_options').throws(:no_such_key)
351
- expect_lookup('apache::port').returns('443')
354
+ expect_lookup('lookup_options', throws: :no_such_key)
355
+ expect_lookup('apache::port', returns: '443')
352
356
 
353
357
  inject_and_set_defaults(resource, scope)
354
358
 
@@ -356,8 +360,8 @@ describe Puppet::Resource do
356
360
  end
357
361
 
358
362
  it 'should use the default value if no value is found using the data_binding terminus' do
359
- expect_lookup('lookup_options').throws(:no_such_key)
360
- expect_lookup('apache::port').throws(:no_such_key)
363
+ expect_lookup('lookup_options', throws: :no_such_key)
364
+ expect_lookup('apache::port', throws: :no_such_key)
361
365
 
362
366
  inject_and_set_defaults(resource, scope)
363
367
 
@@ -365,8 +369,8 @@ describe Puppet::Resource do
365
369
  end
366
370
 
367
371
  it 'should use the default value if an undef value is found using the data_binding terminus' do
368
- expect_lookup('lookup_options').throws(:no_such_key)
369
- expect_lookup('apache::port').returns(nil)
372
+ expect_lookup('lookup_options', throws: :no_such_key)
373
+ expect_lookup('apache::port', returns: nil)
370
374
 
371
375
  inject_and_set_defaults(resource, scope)
372
376
 
@@ -374,8 +378,8 @@ describe Puppet::Resource do
374
378
  end
375
379
 
376
380
  it "should fail with error message about data binding on a hiera failure" do
377
- expect_lookup('lookup_options').throws(:no_such_key)
378
- expect_lookup('apache::port').raises(Puppet::DataBinding::LookupError, 'Forgettabotit')
381
+ expect_lookup('lookup_options', throws: :no_such_key)
382
+ expect_lookup('apache::port', raises: [Puppet::DataBinding::LookupError, 'Forgettabotit'])
379
383
  expect {
380
384
  inject_and_set_defaults(resource, scope)
381
385
  }.to raise_error(Puppet::Error, /Lookup of key 'apache::port' failed: Forgettabotit/)
@@ -395,19 +399,19 @@ describe Puppet::Resource do
395
399
  end
396
400
 
397
401
  it "should not query the data_binding terminus" do
398
- Puppet::DataBinding.indirection.expects(:find).never
402
+ expect(Puppet::DataBinding.indirection).not_to receive(:find)
399
403
  inject_and_set_defaults(resource, scope)
400
404
  end
401
405
 
402
406
  it "should use the value provided" do
403
- Puppet::DataBinding.indirection.expects(:find).never
407
+ expect(Puppet::DataBinding.indirection).not_to receive(:find)
404
408
  expect(resource.set_default_parameters(scope)).to eq([])
405
409
  expect(resource[:port]).to eq('8080')
406
410
  end
407
411
 
408
412
  it "should use the value from the data_binding terminus when provided value is undef" do
409
- expect_lookup('lookup_options').throws(:no_such_key)
410
- expect_lookup('apache::port').returns('443')
413
+ expect_lookup('lookup_options', throws: :no_such_key)
414
+ expect_lookup('apache::port', returns: '443')
411
415
 
412
416
  rs = Puppet::Parser::Resource.new("class", "apache", :scope => scope,
413
417
  :parameters => [Puppet::Parser::Resource::Param.new({ :name => 'port', :value => nil })])
@@ -423,8 +427,8 @@ describe Puppet::Resource do
423
427
  let(:resource) { Puppet::Parser::Resource.new("class", "apache", :scope => scope) }
424
428
 
425
429
  it "should use the value from the data_binding terminus" do
426
- expect_lookup('lookup_options').throws(:no_such_key)
427
- expect_lookup('apache::port').returns('443')
430
+ expect_lookup('lookup_options', throws: :no_such_key)
431
+ expect_lookup('apache::port', returns: '443')
428
432
 
429
433
  inject_and_set_defaults(resource, scope)
430
434
 
@@ -432,8 +436,8 @@ describe Puppet::Resource do
432
436
  end
433
437
 
434
438
  it "should use an undef value from the data_binding terminus" do
435
- expect_lookup('lookup_options').throws(:no_such_key)
436
- expect_lookup('apache::port').returns(nil)
439
+ expect_lookup('lookup_options', throws: :no_such_key)
440
+ expect_lookup('apache::port', returns: nil)
437
441
 
438
442
  inject_and_set_defaults(resource, scope)
439
443
 
@@ -533,14 +537,14 @@ describe Puppet::Resource do
533
537
 
534
538
  it "should set the namevar when asked to set the name" do
535
539
  resource = Puppet::Resource.new("user", "bob")
536
- Puppet::Type.type(:user).stubs(:key_attributes).returns [:myvar]
540
+ allow(Puppet::Type.type(:user)).to receive(:key_attributes).and_return([:myvar])
537
541
  resource[:name] = "bob"
538
542
  expect(resource[:myvar]).to eq("bob")
539
543
  end
540
544
 
541
545
  it "should return the namevar when asked to return the name" do
542
546
  resource = Puppet::Resource.new("user", "bob")
543
- Puppet::Type.type(:user).stubs(:key_attributes).returns [:myvar]
547
+ allow(Puppet::Type.type(:user)).to receive(:key_attributes).and_return([:myvar])
544
548
  resource[:myvar] = "test"
545
549
  expect(resource[:name]).to eq("test")
546
550
  end
@@ -619,7 +623,7 @@ describe Puppet::Resource do
619
623
 
620
624
  it "should use the title as the namevar to the hash if no namevar is present" do
621
625
  resource = Puppet::Resource.new("user", "bob")
622
- Puppet::Type.type(:user).stubs(:key_attributes).returns [:myvar]
626
+ allow(Puppet::Type.type(:user)).to receive(:key_attributes).and_return([:myvar])
623
627
  expect(resource.to_hash[:myvar]).to eq("bob")
624
628
  end
625
629
 
@@ -627,7 +631,7 @@ describe Puppet::Resource do
627
631
  krt = Puppet::Resource::TypeCollection.new("myenv")
628
632
  krt.add Puppet::Resource::Type.new(:definition, :foo)
629
633
  resource = Puppet::Resource.new :foo, "bar"
630
- resource.stubs(:known_resource_types).returns krt
634
+ allow(resource).to receive(:known_resource_types).and_return(krt)
631
635
  expect(resource.to_hash[:name]).to eq("bar")
632
636
  end
633
637
  end
@@ -976,11 +980,11 @@ describe Puppet::Resource do
976
980
 
977
981
  describe "when resolving resources with a catalog" do
978
982
  it "should resolve all resources using the catalog" do
979
- catalog = mock 'catalog'
983
+ catalog = double('catalog')
980
984
  resource = Puppet::Resource.new("foo::bar", "yay")
981
985
  resource.catalog = catalog
982
986
 
983
- catalog.expects(:resource).with("Foo::Bar[yay]").returns(:myresource)
987
+ expect(catalog).to receive(:resource).with("Foo::Bar[yay]").and_return(:myresource)
984
988
 
985
989
  expect(resource.resolve).to eq(:myresource)
986
990
  end
@@ -988,8 +992,8 @@ describe Puppet::Resource do
988
992
 
989
993
  describe "when generating the uniqueness key" do
990
994
  it "should include all of the key_attributes in alphabetical order by attribute name" do
991
- Puppet::Type.type(:file).stubs(:key_attributes).returns [:myvar, :owner, :path]
992
- Puppet::Type.type(:file).stubs(:title_patterns).returns(
995
+ allow(Puppet::Type.type(:file)).to receive(:key_attributes).and_return([:myvar, :owner, :path])
996
+ allow(Puppet::Type.type(:file)).to receive(:title_patterns).and_return(
993
997
  [ [ /(.*)/, [ [:path, lambda{|x| x} ] ] ] ]
994
998
  )
995
999
  res = Puppet::Resource.new("file", "/my/file", :parameters => {:owner => 'root', :content => 'hello'})