puppet 6.0.7-universal-darwin → 6.0.8-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 (632) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +4 -8
  4. data/lib/puppet/application/device.rb +99 -83
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/configurer.rb +5 -4
  7. data/lib/puppet/defaults.rb +31 -11
  8. data/lib/puppet/indirector/request.rb +26 -15
  9. data/lib/puppet/network/http/connection.rb +15 -7
  10. data/lib/puppet/transaction/event_manager.rb +1 -5
  11. data/lib/puppet/type/file/source.rb +0 -1
  12. data/lib/puppet/util/connection.rb +15 -6
  13. data/lib/puppet/util/http_proxy.rb +3 -2
  14. data/lib/puppet/version.rb +1 -1
  15. data/locales/puppet.pot +99 -40
  16. data/man/man5/puppet.conf.5 +8 -8
  17. data/man/man8/puppet-agent.8 +1 -1
  18. data/man/man8/puppet-apply.8 +1 -1
  19. data/man/man8/puppet-catalog.8 +1 -1
  20. data/man/man8/puppet-config.8 +1 -1
  21. data/man/man8/puppet-describe.8 +1 -1
  22. data/man/man8/puppet-device.8 +1 -1
  23. data/man/man8/puppet-doc.8 +1 -1
  24. data/man/man8/puppet-epp.8 +1 -1
  25. data/man/man8/puppet-facts.8 +1 -1
  26. data/man/man8/puppet-filebucket.8 +1 -1
  27. data/man/man8/puppet-generate.8 +1 -1
  28. data/man/man8/puppet-help.8 +1 -1
  29. data/man/man8/puppet-key.8 +1 -1
  30. data/man/man8/puppet-lookup.8 +1 -1
  31. data/man/man8/puppet-man.8 +1 -1
  32. data/man/man8/puppet-module.8 +1 -1
  33. data/man/man8/puppet-node.8 +1 -1
  34. data/man/man8/puppet-parser.8 +1 -1
  35. data/man/man8/puppet-plugin.8 +1 -1
  36. data/man/man8/puppet-report.8 +1 -1
  37. data/man/man8/puppet-resource.8 +1 -1
  38. data/man/man8/puppet-script.8 +1 -1
  39. data/man/man8/puppet-ssl.8 +1 -1
  40. data/man/man8/puppet-status.8 +1 -1
  41. data/man/man8/puppet.8 +2 -2
  42. data/spec/integration/agent/logging_spec.rb +5 -7
  43. data/spec/integration/application/apply_spec.rb +18 -16
  44. data/spec/integration/application/doc_spec.rb +1 -2
  45. data/spec/integration/application/lookup_spec.rb +5 -5
  46. data/spec/integration/configurer_spec.rb +5 -6
  47. data/spec/integration/defaults_spec.rb +5 -6
  48. data/spec/integration/directory_environments_spec.rb +1 -1
  49. data/spec/integration/faces/config_spec.rb +3 -4
  50. data/spec/integration/faces/documentation_spec.rb +0 -1
  51. data/spec/integration/faces/plugin_spec.rb +1 -1
  52. data/spec/integration/file_bucket/file_spec.rb +2 -4
  53. data/spec/integration/file_serving/content_spec.rb +0 -1
  54. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  55. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  56. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  57. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  58. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  59. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  60. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  61. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  62. data/spec/integration/network/authconfig_spec.rb +23 -24
  63. data/spec/integration/network/formats_spec.rb +0 -1
  64. data/spec/integration/node/environment_spec.rb +0 -1
  65. data/spec/integration/node/facts_spec.rb +9 -10
  66. data/spec/integration/node_spec.rb +6 -7
  67. data/spec/integration/parser/catalog_spec.rb +1 -5
  68. data/spec/integration/parser/collection_spec.rb +1 -2
  69. data/spec/integration/parser/compiler_spec.rb +6 -6
  70. data/spec/integration/parser/scope_spec.rb +1 -1
  71. data/spec/integration/parser/undef_param_spec.rb +1 -1
  72. data/spec/integration/provider/service/init_spec.rb +4 -5
  73. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  74. data/spec/integration/provider/service/windows_spec.rb +1 -2
  75. data/spec/integration/reference/providers_spec.rb +1 -2
  76. data/spec/integration/reports_spec.rb +1 -2
  77. data/spec/integration/resource/catalog_spec.rb +14 -17
  78. data/spec/integration/resource/type_collection_spec.rb +4 -5
  79. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  80. data/spec/integration/ssl/host_spec.rb +1 -2
  81. data/spec/integration/ssl/key_spec.rb +0 -1
  82. data/spec/integration/test/test_helper_spec.rb +0 -1
  83. data/spec/integration/transaction/report_spec.rb +6 -11
  84. data/spec/integration/transaction_spec.rb +18 -19
  85. data/spec/integration/type/exec_spec.rb +0 -1
  86. data/spec/integration/type/file_spec.rb +13 -14
  87. data/spec/integration/type/package_spec.rb +19 -23
  88. data/spec/integration/type/tidy_spec.rb +1 -2
  89. data/spec/integration/type_spec.rb +0 -1
  90. data/spec/integration/util/autoload_spec.rb +1 -2
  91. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  92. data/spec/integration/util/settings_spec.rb +0 -1
  93. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  94. data/spec/integration/util/windows/principal_spec.rb +0 -1
  95. data/spec/integration/util/windows/process_spec.rb +4 -6
  96. data/spec/integration/util/windows/registry_spec.rb +41 -51
  97. data/spec/integration/util/windows/security_spec.rb +2 -4
  98. data/spec/integration/util/windows/user_spec.rb +18 -20
  99. data/spec/integration/util_spec.rb +4 -7
  100. data/spec/lib/puppet_spec/compiler.rb +1 -1
  101. data/spec/lib/puppet_spec/files.rb +0 -1
  102. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  103. data/spec/lib/puppet_spec/scope.rb +1 -2
  104. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  105. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  106. data/spec/shared_behaviours/file_serving.rb +6 -8
  107. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  108. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  109. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  110. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  111. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  112. data/spec/spec_helper.rb +10 -1
  113. data/spec/unit/agent/disabler_spec.rb +4 -5
  114. data/spec/unit/agent/locker_spec.rb +12 -13
  115. data/spec/unit/agent_spec.rb +80 -85
  116. data/spec/unit/application/agent_spec.rb +88 -93
  117. data/spec/unit/application/apply_spec.rb +82 -83
  118. data/spec/unit/application/config_spec.rb +0 -1
  119. data/spec/unit/application/describe_spec.rb +6 -7
  120. data/spec/unit/application/device_spec.rb +395 -419
  121. data/spec/unit/application/doc_spec.rb +44 -46
  122. data/spec/unit/application/face_base_spec.rb +61 -62
  123. data/spec/unit/application/facts_spec.rb +3 -4
  124. data/spec/unit/application/filebucket_spec.rb +66 -74
  125. data/spec/unit/application/indirection_base_spec.rb +8 -6
  126. data/spec/unit/application/lookup_spec.rb +26 -26
  127. data/spec/unit/application/resource_spec.rb +42 -48
  128. data/spec/unit/application/ssl_spec.rb +3 -3
  129. data/spec/unit/application_spec.rb +82 -92
  130. data/spec/unit/capability_spec.rb +6 -6
  131. data/spec/unit/certificate_factory_spec.rb +3 -5
  132. data/spec/unit/configurer/downloader_spec.rb +20 -21
  133. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  134. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  135. data/spec/unit/configurer_spec.rb +189 -192
  136. data/spec/unit/confine/exists_spec.rb +17 -15
  137. data/spec/unit/confine/false_spec.rb +5 -6
  138. data/spec/unit/confine/feature_spec.rb +7 -5
  139. data/spec/unit/confine/true_spec.rb +5 -6
  140. data/spec/unit/confine/variable_spec.rb +14 -15
  141. data/spec/unit/confine_collection_spec.rb +28 -29
  142. data/spec/unit/confine_spec.rb +13 -14
  143. data/spec/unit/confiner_spec.rb +10 -11
  144. data/spec/unit/context/trusted_information_spec.rb +1 -1
  145. data/spec/unit/daemon_spec.rb +35 -36
  146. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  147. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  148. data/spec/unit/datatypes_spec.rb +3 -4
  149. data/spec/unit/defaults_spec.rb +18 -13
  150. data/spec/unit/environments_spec.rb +7 -7
  151. data/spec/unit/etc_spec.rb +30 -32
  152. data/spec/unit/external/pson_spec.rb +0 -1
  153. data/spec/unit/face/catalog_spec.rb +0 -1
  154. data/spec/unit/face/config_spec.rb +31 -35
  155. data/spec/unit/face/epp_face_spec.rb +3 -4
  156. data/spec/unit/face/facts_spec.rb +5 -6
  157. data/spec/unit/face/generate_spec.rb +4 -5
  158. data/spec/unit/face/help_spec.rb +7 -8
  159. data/spec/unit/face/key_spec.rb +0 -1
  160. data/spec/unit/face/man_spec.rb +1 -2
  161. data/spec/unit/face/module/install_spec.rb +3 -5
  162. data/spec/unit/face/module/list_spec.rb +2 -12
  163. data/spec/unit/face/module/search_spec.rb +11 -9
  164. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  165. data/spec/unit/face/node_spec.rb +23 -24
  166. data/spec/unit/face/parser_spec.rb +3 -3
  167. data/spec/unit/face/plugin_spec.rb +36 -9
  168. data/spec/unit/face/status_spec.rb +0 -1
  169. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  170. data/spec/unit/file_bucket/file_spec.rb +0 -2
  171. data/spec/unit/file_serving/base_spec.rb +14 -15
  172. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  173. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  174. data/spec/unit/file_serving/content_spec.rb +10 -11
  175. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  176. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  177. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  178. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  179. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  180. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  181. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  182. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  183. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  184. data/spec/unit/file_serving/mount_spec.rb +0 -1
  185. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  186. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  187. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  188. data/spec/unit/file_system_spec.rb +2 -2
  189. data/spec/unit/forge/errors_spec.rb +1 -1
  190. data/spec/unit/forge/forge_spec.rb +13 -14
  191. data/spec/unit/forge/module_release_spec.rb +18 -18
  192. data/spec/unit/forge/repository_spec.rb +29 -30
  193. data/spec/unit/forge_spec.rb +15 -11
  194. data/spec/unit/functions/binary_file_spec.rb +3 -3
  195. data/spec/unit/functions/contain_spec.rb +0 -2
  196. data/spec/unit/functions/defined_spec.rb +0 -1
  197. data/spec/unit/functions/epp_spec.rb +2 -2
  198. data/spec/unit/functions/find_file_spec.rb +7 -7
  199. data/spec/unit/functions/include_spec.rb +0 -4
  200. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  201. data/spec/unit/functions/lookup_spec.rb +1 -2
  202. data/spec/unit/functions/module_directory_spec.rb +12 -12
  203. data/spec/unit/functions/require_spec.rb +0 -3
  204. data/spec/unit/functions/shared.rb +5 -8
  205. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  206. data/spec/unit/functions4_spec.rb +9 -10
  207. data/spec/unit/gettext/config_spec.rb +4 -4
  208. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  209. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  210. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  211. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  212. data/spec/unit/hiera_puppet_spec.rb +20 -20
  213. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  214. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  215. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  216. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  217. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  218. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  219. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  220. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  221. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  222. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  223. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  224. data/spec/unit/indirector/envelope_spec.rb +1 -2
  225. data/spec/unit/indirector/exec_spec.rb +4 -5
  226. data/spec/unit/indirector/face_spec.rb +9 -9
  227. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  228. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  229. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  230. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  231. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  232. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  233. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  234. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  235. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  236. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  237. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  238. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  239. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  240. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  241. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  242. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  243. data/spec/unit/indirector/file_server_spec.rb +87 -87
  244. data/spec/unit/indirector/indirection_spec.rb +242 -226
  245. data/spec/unit/indirector/json_spec.rb +7 -9
  246. data/spec/unit/indirector/key/file_spec.rb +21 -22
  247. data/spec/unit/indirector/memory_spec.rb +6 -7
  248. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  249. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  250. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  251. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  252. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  253. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  254. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  255. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  256. data/spec/unit/indirector/none_spec.rb +5 -5
  257. data/spec/unit/indirector/plain_spec.rb +7 -8
  258. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  259. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  260. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  261. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  262. data/spec/unit/indirector/request_spec.rb +11 -12
  263. data/spec/unit/indirector/resource/ral_spec.rb +46 -54
  264. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  265. data/spec/unit/indirector/rest_spec.rb +113 -110
  266. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  267. data/spec/unit/indirector/status/local_spec.rb +0 -1
  268. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  269. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  270. data/spec/unit/indirector/terminus_spec.rb +27 -27
  271. data/spec/unit/indirector/yaml_spec.rb +5 -6
  272. data/spec/unit/indirector_spec.rb +1 -2
  273. data/spec/unit/info_service_spec.rb +1 -1
  274. data/spec/unit/interface/action_builder_spec.rb +0 -1
  275. data/spec/unit/interface/action_manager_spec.rb +0 -1
  276. data/spec/unit/interface/action_spec.rb +2 -3
  277. data/spec/unit/interface/documentation_spec.rb +0 -1
  278. data/spec/unit/interface/face_collection_spec.rb +19 -12
  279. data/spec/unit/interface_spec.rb +3 -3
  280. data/spec/unit/man_spec.rb +3 -4
  281. data/spec/unit/module_spec.rb +46 -51
  282. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  283. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  284. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  285. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  286. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  287. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  288. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  289. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  290. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  291. data/spec/unit/module_tool/tar_spec.rb +12 -13
  292. data/spec/unit/module_tool_spec.rb +7 -12
  293. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  294. data/spec/unit/network/authconfig_spec.rb +17 -18
  295. data/spec/unit/network/authorization_spec.rb +4 -5
  296. data/spec/unit/network/authstore_spec.rb +0 -1
  297. data/spec/unit/network/format_handler_spec.rb +0 -1
  298. data/spec/unit/network/format_spec.rb +9 -10
  299. data/spec/unit/network/format_support_spec.rb +28 -29
  300. data/spec/unit/network/formats_spec.rb +4 -5
  301. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  302. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  303. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  304. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  305. data/spec/unit/network/http/api_spec.rb +0 -2
  306. data/spec/unit/network/http/compression_spec.rb +21 -22
  307. data/spec/unit/network/http/connection_spec.rb +41 -36
  308. data/spec/unit/network/http/factory_spec.rb +5 -6
  309. data/spec/unit/network/http/handler_spec.rb +9 -18
  310. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  311. data/spec/unit/network/http/pool_spec.rb +28 -29
  312. data/spec/unit/network/http/request_spec.rb +0 -2
  313. data/spec/unit/network/http/response_spec.rb +11 -13
  314. data/spec/unit/network/http/route_spec.rb +0 -1
  315. data/spec/unit/network/http/session_spec.rb +1 -2
  316. data/spec/unit/network/http/site_spec.rb +0 -1
  317. data/spec/unit/network/http_pool_spec.rb +18 -9
  318. data/spec/unit/network/http_spec.rb +0 -1
  319. data/spec/unit/network/resolver_spec.rb +25 -26
  320. data/spec/unit/network/rights_spec.rb +52 -53
  321. data/spec/unit/node/environment_spec.rb +14 -15
  322. data/spec/unit/node/facts_spec.rb +5 -7
  323. data/spec/unit/node_spec.rb +4 -10
  324. data/spec/unit/other/selinux_spec.rb +0 -1
  325. data/spec/unit/parameter/boolean_spec.rb +1 -2
  326. data/spec/unit/parameter/package_options_spec.rb +1 -2
  327. data/spec/unit/parameter/path_spec.rb +0 -1
  328. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  329. data/spec/unit/parameter/value_spec.rb +0 -1
  330. data/spec/unit/parameter_spec.rb +9 -9
  331. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  332. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  333. data/spec/unit/parser/compiler_spec.rb +84 -96
  334. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  335. data/spec/unit/parser/files_spec.rb +0 -1
  336. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  337. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  338. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  339. data/spec/unit/parser/functions/file_spec.rb +13 -14
  340. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  341. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  342. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  343. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  344. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  345. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  346. data/spec/unit/parser/functions/split_spec.rb +0 -1
  347. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  348. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  349. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  350. data/spec/unit/parser/functions/template_spec.rb +13 -13
  351. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  352. data/spec/unit/parser/functions_spec.rb +6 -7
  353. data/spec/unit/parser/relationship_spec.rb +0 -1
  354. data/spec/unit/parser/resource_spec.rb +42 -42
  355. data/spec/unit/parser/scope_spec.rb +39 -35
  356. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  357. data/spec/unit/parser/type_loader_spec.rb +17 -19
  358. data/spec/unit/pops/adaptable_spec.rb +0 -1
  359. data/spec/unit/pops/benchmark_spec.rb +0 -1
  360. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  361. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  362. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  363. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  364. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  365. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  366. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  367. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  368. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  371. data/spec/unit/pops/factory_spec.rb +3 -4
  372. data/spec/unit/pops/issues_spec.rb +19 -20
  373. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  374. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  375. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  376. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  377. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  378. data/spec/unit/pops/migration_spec.rb +3 -5
  379. data/spec/unit/pops/model/model_spec.rb +0 -1
  380. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  381. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  382. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  383. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  384. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  385. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  386. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  387. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  388. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  389. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  390. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  391. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  392. data/spec/unit/pops/pn_spec.rb +0 -1
  393. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  394. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  395. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  396. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  397. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  398. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  399. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  400. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  401. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  402. data/spec/unit/pops/visitor_spec.rb +0 -1
  403. data/spec/unit/property/boolean_spec.rb +1 -1
  404. data/spec/unit/property/ensure_spec.rb +0 -1
  405. data/spec/unit/property/keyvalue_spec.rb +32 -34
  406. data/spec/unit/property/list_spec.rb +26 -27
  407. data/spec/unit/property/ordered_list_spec.rb +10 -14
  408. data/spec/unit/property_spec.rb +42 -43
  409. data/spec/unit/provider/aix_object_spec.rb +47 -45
  410. data/spec/unit/provider/command_spec.rb +9 -9
  411. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  412. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  413. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  414. data/spec/unit/provider/exec_spec.rb +0 -1
  415. data/spec/unit/provider/file/posix_spec.rb +22 -24
  416. data/spec/unit/provider/file/windows_spec.rb +15 -17
  417. data/spec/unit/provider/group/aix_spec.rb +3 -2
  418. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  419. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  420. data/spec/unit/provider/group/pw_spec.rb +11 -11
  421. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  422. data/spec/unit/provider/ldap_spec.rb +61 -62
  423. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  424. data/spec/unit/provider/nameservice_spec.rb +38 -40
  425. data/spec/unit/provider/package/aix_spec.rb +15 -15
  426. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  427. data/spec/unit/provider/package/apt_spec.rb +44 -27
  428. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  429. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  430. data/spec/unit/provider/package/base_spec.rb +4 -4
  431. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  432. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  433. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  434. data/spec/unit/provider/package/gem_spec.rb +51 -43
  435. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  436. data/spec/unit/provider/package/macports_spec.rb +46 -42
  437. data/spec/unit/provider/package/nim_spec.rb +30 -39
  438. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  439. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  440. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  441. data/spec/unit/provider/package/pip_spec.rb +71 -72
  442. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  443. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  444. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  445. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  446. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  447. data/spec/unit/provider/package/portage_spec.rb +70 -74
  448. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  449. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  450. data/spec/unit/provider/package/sun_spec.rb +16 -18
  451. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  452. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  453. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  454. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  455. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  456. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  457. data/spec/unit/provider/package/windows_spec.rb +36 -32
  458. data/spec/unit/provider/package/yum_spec.rb +7 -7
  459. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  460. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  461. data/spec/unit/provider/service/base_spec.rb +4 -5
  462. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  463. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  464. data/spec/unit/provider/service/debian_spec.rb +38 -38
  465. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  466. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  467. data/spec/unit/provider/service/init_spec.rb +53 -52
  468. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  469. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  470. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  471. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  472. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  473. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  474. data/spec/unit/provider/service/runit_spec.rb +29 -27
  475. data/spec/unit/provider/service/smf_spec.rb +74 -66
  476. data/spec/unit/provider/service/src_spec.rb +46 -47
  477. data/spec/unit/provider/service/systemd_spec.rb +104 -113
  478. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  479. data/spec/unit/provider/service/windows_spec.rb +33 -41
  480. data/spec/unit/provider/user/aix_spec.rb +31 -31
  481. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  482. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  483. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  484. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  485. data/spec/unit/provider/user/pw_spec.rb +37 -35
  486. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  487. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  488. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  489. data/spec/unit/provider_spec.rb +35 -35
  490. data/spec/unit/puppet_pal_2pec.rb +4 -5
  491. data/spec/unit/puppet_pal_spec.rb +0 -1
  492. data/spec/unit/puppet_spec.rb +6 -7
  493. data/spec/unit/relationship_spec.rb +0 -1
  494. data/spec/unit/reports/http_spec.rb +21 -23
  495. data/spec/unit/reports/store_spec.rb +3 -4
  496. data/spec/unit/reports_spec.rb +12 -14
  497. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  498. data/spec/unit/resource/catalog_spec.rb +72 -68
  499. data/spec/unit/resource/status_spec.rb +6 -8
  500. data/spec/unit/resource/type_collection_spec.rb +17 -18
  501. data/spec/unit/resource/type_spec.rb +34 -35
  502. data/spec/unit/resource_spec.rb +36 -32
  503. data/spec/unit/rest/client_spec.rb +58 -27
  504. data/spec/unit/rest/route_spec.rb +5 -5
  505. data/spec/unit/scheduler/job_spec.rb +0 -1
  506. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  507. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  508. data/spec/unit/settings/array_setting_spec.rb +1 -1
  509. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  510. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  511. data/spec/unit/settings/config_file_spec.rb +0 -1
  512. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  513. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  514. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  515. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  516. data/spec/unit/settings/file_setting_spec.rb +44 -46
  517. data/spec/unit/settings/path_setting_spec.rb +1 -2
  518. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  519. data/spec/unit/settings/string_setting_spec.rb +14 -15
  520. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  521. data/spec/unit/settings/value_translator_spec.rb +0 -1
  522. data/spec/unit/settings_spec.rb +228 -235
  523. data/spec/unit/ssl/base_spec.rb +14 -15
  524. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  525. data/spec/unit/ssl/certificate_spec.rb +23 -25
  526. data/spec/unit/ssl/digest_spec.rb +0 -1
  527. data/spec/unit/ssl/host_spec.rb +166 -149
  528. data/spec/unit/ssl/key_spec.rb +30 -31
  529. data/spec/unit/ssl/validator_spec.rb +38 -39
  530. data/spec/unit/task_spec.rb +44 -45
  531. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  532. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  533. data/spec/unit/transaction/event_spec.rb +16 -15
  534. data/spec/unit/transaction/persistence_spec.rb +16 -17
  535. data/spec/unit/transaction/report_spec.rb +11 -12
  536. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  537. data/spec/unit/transaction_spec.rb +100 -101
  538. data/spec/unit/type/component_spec.rb +0 -1
  539. data/spec/unit/type/exec_spec.rb +60 -56
  540. data/spec/unit/type/file/checksum_spec.rb +9 -10
  541. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  542. data/spec/unit/type/file/content_spec.rb +58 -61
  543. data/spec/unit/type/file/ctime_spec.rb +0 -1
  544. data/spec/unit/type/file/ensure_spec.rb +12 -13
  545. data/spec/unit/type/file/group_spec.rb +5 -7
  546. data/spec/unit/type/file/mode_spec.rb +4 -6
  547. data/spec/unit/type/file/mtime_spec.rb +0 -1
  548. data/spec/unit/type/file/owner_spec.rb +6 -8
  549. data/spec/unit/type/file/selinux_spec.rb +17 -19
  550. data/spec/unit/type/file/source_spec.rb +104 -101
  551. data/spec/unit/type/file/type_spec.rb +0 -1
  552. data/spec/unit/type/file_spec.rb +195 -185
  553. data/spec/unit/type/filebucket_spec.rb +4 -5
  554. data/spec/unit/type/group_spec.rb +6 -8
  555. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  556. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  557. data/spec/unit/type/package_spec.rb +56 -57
  558. data/spec/unit/type/resources_spec.rb +72 -74
  559. data/spec/unit/type/schedule_spec.rb +24 -26
  560. data/spec/unit/type/service_spec.rb +48 -48
  561. data/spec/unit/type/stage_spec.rb +0 -1
  562. data/spec/unit/type/tidy_spec.rb +61 -62
  563. data/spec/unit/type/user_spec.rb +24 -25
  564. data/spec/unit/type/whit_spec.rb +0 -1
  565. data/spec/unit/type_spec.rb +55 -54
  566. data/spec/unit/util/at_fork_spec.rb +18 -19
  567. data/spec/unit/util/autoload_spec.rb +55 -56
  568. data/spec/unit/util/backups_spec.rb +34 -35
  569. data/spec/unit/util/character_encoding_spec.rb +5 -5
  570. data/spec/unit/util/checksums_spec.rb +38 -39
  571. data/spec/unit/util/colors_spec.rb +1 -2
  572. data/spec/unit/util/command_line_spec.rb +24 -25
  573. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  574. data/spec/unit/util/diff_spec.rb +7 -8
  575. data/spec/unit/util/errors_spec.rb +0 -1
  576. data/spec/unit/util/execution_spec.rb +185 -161
  577. data/spec/unit/util/execution_stub_spec.rb +0 -1
  578. data/spec/unit/util/feature_spec.rb +21 -14
  579. data/spec/unit/util/filetype_spec.rb +49 -49
  580. data/spec/unit/util/http_proxy_spec.rb +12 -12
  581. data/spec/unit/util/inifile_spec.rb +26 -31
  582. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  583. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  584. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  585. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  586. data/spec/unit/util/lockfile_spec.rb +0 -1
  587. data/spec/unit/util/log/destinations_spec.rb +30 -33
  588. data/spec/unit/util/log_spec.rb +35 -36
  589. data/spec/unit/util/logging_spec.rb +58 -72
  590. data/spec/unit/util/metric_spec.rb +0 -1
  591. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  592. data/spec/unit/util/multi_match_spec.rb +0 -1
  593. data/spec/unit/util/network_device/config_spec.rb +0 -1
  594. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  595. data/spec/unit/util/network_device_spec.rb +7 -9
  596. data/spec/unit/util/package_spec.rb +0 -1
  597. data/spec/unit/util/pidlock_spec.rb +21 -22
  598. data/spec/unit/util/plist_spec.rb +40 -33
  599. data/spec/unit/util/posix_spec.rb +54 -51
  600. data/spec/unit/util/rdoc_spec.rb +9 -10
  601. data/spec/unit/util/reference_spec.rb +0 -1
  602. data/spec/unit/util/resource_template_spec.rb +20 -20
  603. data/spec/unit/util/retry_action_spec.rb +7 -8
  604. data/spec/unit/util/rubygems_spec.rb +7 -8
  605. data/spec/unit/util/run_mode_spec.rb +3 -4
  606. data/spec/unit/util/selinux_spec.rb +79 -72
  607. data/spec/unit/util/splayer_spec.rb +8 -9
  608. data/spec/unit/util/ssl_spec.rb +0 -1
  609. data/spec/unit/util/storage_spec.rb +3 -4
  610. data/spec/unit/util/suidmanager_spec.rb +45 -54
  611. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  612. data/spec/unit/util/tag_set_spec.rb +0 -1
  613. data/spec/unit/util/tagging_spec.rb +0 -1
  614. data/spec/unit/util/terminal_spec.rb +9 -10
  615. data/spec/unit/util/user_attr_spec.rb +1 -2
  616. data/spec/unit/util/warnings_spec.rb +3 -4
  617. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  618. data/spec/unit/util/watcher_spec.rb +51 -21
  619. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  620. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  621. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  622. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  623. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  624. data/spec/unit/util/windows/file_spec.rb +0 -1
  625. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  626. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  627. data/spec/unit/util/windows/service_spec.rb +66 -68
  628. data/spec/unit/util/windows/sid_spec.rb +11 -13
  629. data/spec/unit/util/windows/string_spec.rb +0 -1
  630. data/spec/unit/util_spec.rb +55 -57
  631. data/spec/unit/version_spec.rb +6 -6
  632. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/application/resource'
@@ -6,9 +5,10 @@ require 'puppet_spec/character_encoding'
6
5
 
7
6
  describe Puppet::Application::Resource do
8
7
  include PuppetSpec::Files
8
+
9
9
  before :each do
10
10
  @resource_app = Puppet::Application[:resource]
11
- Puppet::Util::Log.stubs(:newdestination)
11
+ allow(Puppet::Util::Log).to receive(:newdestination)
12
12
  end
13
13
 
14
14
  describe "in preinit" do
@@ -21,17 +21,17 @@ describe Puppet::Application::Resource do
21
21
  describe "when handling options" do
22
22
  [:debug, :verbose, :edit].each do |option|
23
23
  it "should store argument value when calling handle_#{option}" do
24
- @resource_app.options.expects(:[]=).with(option, 'arg')
24
+ expect(@resource_app.options).to receive(:[]=).with(option, 'arg')
25
25
  @resource_app.send("handle_#{option}".to_sym, 'arg')
26
26
  end
27
27
  end
28
28
 
29
29
  it "should load a display all types with types option" do
30
- type1 = stub_everything 'type1', :name => :type1
31
- type2 = stub_everything 'type2', :name => :type2
32
- Puppet::Type.stubs(:loadall)
33
- Puppet::Type.stubs(:eachtype).multiple_yields(type1,type2)
34
- @resource_app.expects(:puts).with(['type1','type2'])
30
+ type1 = double('type1', :name => :type1)
31
+ type2 = double('type2', :name => :type2)
32
+ allow(Puppet::Type).to receive(:loadall)
33
+ allow(Puppet::Type).to receive(:eachtype).and_yield(type1).and_yield(type2)
34
+ expect(@resource_app).to receive(:puts).with(['type1','type2'])
35
35
  expect { @resource_app.handle_types(nil) }.to exit_with 0
36
36
  end
37
37
 
@@ -43,10 +43,10 @@ describe Puppet::Application::Resource do
43
43
  end
44
44
 
45
45
  it "should get a parameter in the printed data if extra_params are passed" do
46
- tty = stub("tty", :tty? => true )
46
+ tty = double("tty", :tty? => true )
47
47
  path = tmpfile('testfile')
48
48
  command_line = Puppet::Util::CommandLine.new("puppet", [ 'resource', 'file', path ], tty )
49
- @resource_app.stubs(:command_line).returns command_line
49
+ allow(@resource_app).to receive(:command_line).and_return(command_line)
50
50
 
51
51
  # provider is a parameter that should always be available
52
52
  @resource_app.extra_params = [ :provider ]
@@ -57,75 +57,70 @@ describe Puppet::Application::Resource do
57
57
 
58
58
  describe "during setup" do
59
59
  before :each do
60
- Puppet::Log.stubs(:newdestination)
60
+ allow(Puppet::Log).to receive(:newdestination)
61
61
  end
62
62
 
63
63
  it "should set console as the log destination" do
64
- Puppet::Log.expects(:newdestination).with(:console)
64
+ expect(Puppet::Log).to receive(:newdestination).with(:console)
65
65
 
66
66
  @resource_app.setup
67
67
  end
68
68
 
69
69
  it "should set log level to debug if --debug was passed" do
70
- @resource_app.options.stubs(:[]).with(:debug).returns(true)
70
+ allow(@resource_app.options).to receive(:[]).with(:debug).and_return(true)
71
71
  @resource_app.setup
72
72
  expect(Puppet::Log.level).to eq(:debug)
73
73
  end
74
74
 
75
75
  it "should set log level to info if --verbose was passed" do
76
- @resource_app.options.stubs(:[]).with(:debug).returns(false)
77
- @resource_app.options.stubs(:[]).with(:verbose).returns(true)
76
+ allow(@resource_app.options).to receive(:[]).with(:debug).and_return(false)
77
+ allow(@resource_app.options).to receive(:[]).with(:verbose).and_return(true)
78
78
  @resource_app.setup
79
79
  expect(Puppet::Log.level).to eq(:info)
80
80
  end
81
-
82
81
  end
83
82
 
84
83
  describe "when running" do
85
84
  before :each do
86
- @type = stub_everything 'type', :properties => []
87
- @resource_app.command_line.stubs(:args).returns(['mytype'])
88
- Puppet::Type.stubs(:type).returns(@type)
89
-
90
- @res = stub_everything "resource"
91
- @res.stubs(:prune_parameters).returns(@res)
92
- @res.stubs(:to_manifest).returns("resource")
93
- @report = stub_everything "report"
85
+ @type = double('type', :properties => [])
86
+ allow(@resource_app.command_line).to receive(:args).and_return(['mytype'])
87
+ allow(Puppet::Type).to receive(:type).and_return(@type)
94
88
 
95
- @resource_app.stubs(:puts)
89
+ @res = double("resource")
90
+ allow(@res).to receive(:prune_parameters).and_return(@res)
91
+ allow(@res).to receive(:to_manifest).and_return("resource")
92
+ @report = double("report")
96
93
 
97
- Puppet::Resource.indirection.stubs(:find ).never
98
- Puppet::Resource.indirection.stubs(:search).never
99
- Puppet::Resource.indirection.stubs(:save ).never
94
+ allow(@resource_app).to receive(:puts)
100
95
  end
101
96
 
102
97
  it "should raise an error if no type is given" do
103
- @resource_app.command_line.stubs(:args).returns([])
98
+ allow(@resource_app.command_line).to receive(:args).and_return([])
104
99
  expect { @resource_app.main }.to raise_error(RuntimeError, "You must specify the type to display")
105
100
  end
106
101
 
107
102
  it "should raise an error if the type is not found" do
108
- Puppet::Type.stubs(:type).returns(nil)
103
+ allow(Puppet::Type).to receive(:type).and_return(nil)
109
104
 
110
105
  expect { @resource_app.main }.to raise_error(RuntimeError, 'Could not find type mytype')
111
106
  end
112
107
 
113
108
  it "should search for resources" do
114
- Puppet::Resource.indirection.expects(:search).with('mytype/', {}).returns([])
109
+ expect(Puppet::Resource.indirection).to receive(:search).with('mytype/', {}).and_return([])
115
110
  @resource_app.main
116
111
  end
117
112
 
118
113
  it "should describe the given resource" do
119
- @resource_app.command_line.stubs(:args).returns(['type','name'])
120
- Puppet::Resource.indirection.expects(:find).with('type/name').returns(@res)
114
+ allow(@resource_app.command_line).to receive(:args).and_return(['type','name'])
115
+ expect(Puppet::Resource.indirection).to receive(:find).with('type/name').and_return(@res)
121
116
  @resource_app.main
122
117
  end
123
118
 
124
119
  it "should add given parameters to the object" do
125
- @resource_app.command_line.stubs(:args).returns(['type','name','param=temp'])
120
+ allow(@resource_app.command_line).to receive(:args).and_return(['type','name','param=temp'])
126
121
 
127
- Puppet::Resource.indirection.expects(:save).with(@res, 'type/name').returns([@res, @report])
128
- Puppet::Resource.expects(:new).with('type', 'name', :parameters => {'param' => 'temp'}).returns(@res)
122
+ expect(Puppet::Resource.indirection).to receive(:save).with(@res, 'type/name').and_return([@res, @report])
123
+ expect(Puppet::Resource).to receive(:new).with('type', 'name', :parameters => {'param' => 'temp'}).and_return(@res)
129
124
 
130
125
  @resource_app.main
131
126
  end
@@ -137,11 +132,11 @@ describe Puppet::Application::Resource do
137
132
  Puppet::Type.type(:user).new(:name => "\u2603".force_encoding(Encoding::UTF_8)).to_resource,
138
133
  Puppet::Type.type(:user).new(:name => "Jos\xE9".force_encoding(Encoding::ISO_8859_1)).to_resource
139
134
  ]
140
- Puppet::Resource.indirection.expects(:search).with('user/', {}).returns(resources)
141
- @resource_app.command_line.stubs(:args).returns(['user'])
135
+ expect(Puppet::Resource.indirection).to receive(:search).with('user/', {}).and_return(resources)
136
+ allow(@resource_app.command_line).to receive(:args).and_return(['user'])
142
137
 
143
138
  # All of our output should be in external encoding
144
- @resource_app.expects(:puts).with { |args| expect(args.encoding).to eq(Encoding::ISO_8859_1) }
139
+ expect(@resource_app).to receive(:puts) { |args| expect(args.encoding).to eq(Encoding::ISO_8859_1) }
145
140
 
146
141
  # This would raise an error if we weren't handling it
147
142
  PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ISO_8859_1) do
@@ -152,12 +147,12 @@ describe Puppet::Application::Resource do
152
147
 
153
148
  describe "when handling file type" do
154
149
  before :each do
155
- Facter.stubs(:loadfacts)
150
+ allow(Facter).to receive(:loadfacts)
156
151
  @resource_app.preinit
157
152
  end
158
153
 
159
154
  it "should raise an exception if no file specified" do
160
- @resource_app.command_line.stubs(:args).returns(['file'])
155
+ allow(@resource_app.command_line).to receive(:args).and_return(['file'])
161
156
 
162
157
  expect { @resource_app.main }.to raise_error(RuntimeError, /Listing all file instances is not supported/)
163
158
  end
@@ -165,12 +160,10 @@ describe Puppet::Application::Resource do
165
160
  it "should output a file resource when given a file path" do
166
161
  path = File.expand_path('/etc')
167
162
  res = Puppet::Type.type(:file).new(:path => path).to_resource
168
- Puppet::Resource.indirection.expects(:find).returns(res)
163
+ expect(Puppet::Resource.indirection).to receive(:find).and_return(res)
169
164
 
170
- @resource_app.command_line.stubs(:args).returns(['file', path])
171
- @resource_app.expects(:puts).with do |args|
172
- expect(args).to match(/file \{ '#{Regexp.escape(path)}'/m)
173
- end
165
+ allow(@resource_app.command_line).to receive(:args).and_return(['file', path])
166
+ expect(@resource_app).to receive(:puts).with(/file \{ '#{Regexp.escape(path)}'/m)
174
167
 
175
168
  @resource_app.main
176
169
  end
@@ -187,8 +180,9 @@ describe Puppet::Application::Resource do
187
180
  @instances ||= [new(:name => name)]
188
181
  end
189
182
  end
190
- @resource_app.command_line.stubs(:args).returns(['testing', 'hello'])
191
- @resource_app.expects(:puts).with { |args| expect(args).to eql("testing { 'hello':\n}") }
183
+
184
+ allow(@resource_app.command_line).to receive(:args).and_return(['testing', 'hello'])
185
+ expect(@resource_app).to receive(:puts).with("testing { 'hello':\n}")
192
186
  expect { @resource_app.main }.not_to raise_error
193
187
  end
194
188
  end
@@ -146,8 +146,8 @@ describe Puppet::Application::Ssl, unless: Puppet::Util::Platform.jruby? do
146
146
  end.to_return(status: 200)
147
147
  stub_request(:get, %r{puppet-ca/v1/certificate/#{name}}).to_return(status: 404)
148
148
 
149
- Puppet.stubs(:warning) # ignore unrelated warnings
150
- Puppet.expects(:warning).with("The local CSR does not match the agent's public key. Generating a new CSR.")
149
+ allow(Puppet).to receive(:warning) # ignore unrelated warnings
150
+ expect(Puppet).to receive(:warning).with("The local CSR does not match the agent's public key. Generating a new CSR.")
151
151
  expects_command_to_pass(%r{Submitted certificate request for '#{name}' to https://.*})
152
152
  end
153
153
 
@@ -266,7 +266,7 @@ describe Puppet::Application::Ssl, unless: Puppet::Util::Platform.jruby? do
266
266
  end
267
267
 
268
268
  it 'reports when verification succeeds' do
269
- OpenSSL::X509::Store.any_instance.stubs(:verify).returns(true)
269
+ allow_any_instance_of(OpenSSL::X509::Store).to receive(:verify).and_return(true)
270
270
 
271
271
  expects_command_to_pass(/Verified certificate '#{name}'/)
272
272
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/application'
@@ -12,8 +11,7 @@ describe Puppet::Application do
12
11
  @app = Class.new(Puppet::Application).new
13
12
  @appclass = @app.class
14
13
 
15
- @app.stubs(:name).returns("test_app")
16
-
14
+ allow(@app).to receive(:name).and_return("test_app")
17
15
  end
18
16
 
19
17
  describe "application commandline" do
@@ -32,8 +30,8 @@ describe Puppet::Application do
32
30
 
33
31
  describe "application defaults" do
34
32
  it "should fail if required app default values are missing" do
35
- @app.stubs(:app_defaults).returns({ :foo => 'bar' })
36
- Puppet.expects(:send_log).with(:err, regexp_matches(/missing required app default setting/))
33
+ allow(@app).to receive(:app_defaults).and_return({ :foo => 'bar' })
34
+ expect(Puppet).to receive(:send_log).with(:err, /missing required app default setting/)
37
35
  expect {
38
36
  @app.run
39
37
  }.to exit_with(1)
@@ -43,7 +41,7 @@ describe Puppet::Application do
43
41
  describe "finding" do
44
42
  before do
45
43
  @klass = Puppet::Application
46
- @klass.stubs(:puts)
44
+ allow(@klass).to receive(:puts)
47
45
  end
48
46
 
49
47
  it "should find classes in the namespace" do
@@ -55,10 +53,10 @@ describe Puppet::Application do
55
53
  end
56
54
 
57
55
  it "should error if it can't find a class" do
58
- Puppet.expects(:send_log).with do |_level, message|
59
- message =~ /Unable to find application 'ThisShallNeverEverEverExist'/ and
60
- message =~ /puppet\/application\/thisshallneverevereverexist/ and
61
- message =~ /no such file to load|cannot load such file/
56
+ expect(Puppet).to receive(:send_log) do |_level, message|
57
+ expect(message).to match(/Unable to find application 'ThisShallNeverEverEverExist'/)
58
+ expect(message).to match(/puppet\/application\/thisshallneverevereverexist/)
59
+ expect(message).to match(/no such file to load|cannot load such file/)
62
60
  end
63
61
 
64
62
  expect {
@@ -70,43 +68,43 @@ describe Puppet::Application do
70
68
  describe "#available_application_names" do
71
69
  it 'should be able to find available application names' do
72
70
  apps = %w{describe filebucket kick queue resource agent cert apply doc master}
73
- Puppet::Util::Autoload.expects(:files_to_load).returns(apps)
71
+ expect(Puppet::Util::Autoload).to receive(:files_to_load).and_return(apps)
74
72
 
75
73
  expect(Puppet::Application.available_application_names).to match_array(apps)
76
74
  end
77
75
 
78
76
  it 'should find applications from multiple paths' do
79
- Puppet::Util::Autoload.expects(:files_to_load).with(
77
+ expect(Puppet::Util::Autoload).to receive(:files_to_load).with(
80
78
  'puppet/application',
81
- is_a(Puppet::Node::Environment)
82
- ).returns(%w{ /a/foo.rb /b/bar.rb })
79
+ be_a(Puppet::Node::Environment)
80
+ ).and_return(%w{ /a/foo.rb /b/bar.rb })
83
81
 
84
82
  expect(Puppet::Application.available_application_names).to match_array(%w{ foo bar })
85
83
  end
86
84
 
87
85
  it 'should return unique application names' do
88
- Puppet::Util::Autoload.expects(:files_to_load).with(
86
+ expect(Puppet::Util::Autoload).to receive(:files_to_load).with(
89
87
  'puppet/application',
90
- is_a(Puppet::Node::Environment)
91
- ).returns(%w{ /a/foo.rb /b/foo.rb })
88
+ be_a(Puppet::Node::Environment)
89
+ ).and_return(%w{ /a/foo.rb /b/foo.rb })
92
90
 
93
91
  expect(Puppet::Application.available_application_names).to eq(%w{ foo })
94
92
  end
95
93
 
96
94
  it 'finds the application using the configured environment' do
97
95
  Puppet[:environment] = 'production'
98
- Puppet::Util::Autoload.expects(:files_to_load).with do |_, env|
96
+ expect(Puppet::Util::Autoload).to receive(:files_to_load) do |_, env|
99
97
  expect(env.name).to eq(:production)
100
- end.returns(%w{ /a/foo.rb })
98
+ end.and_return(%w{ /a/foo.rb })
101
99
 
102
100
  expect(Puppet::Application.available_application_names).to eq(%w{ foo })
103
101
  end
104
102
 
105
103
  it "falls back to the current environment if the configured environment doesn't exist" do
106
104
  Puppet[:environment] = 'doesnotexist'
107
- Puppet::Util::Autoload.expects(:files_to_load).with do |_, env|
105
+ expect(Puppet::Util::Autoload).to receive(:files_to_load) do |_, env|
108
106
  expect(env.name).to eq(:'*root*')
109
- end.returns(%w[a/foo.rb])
107
+ end.and_return(%w[a/foo.rb])
110
108
 
111
109
  expect(Puppet::Application.available_application_names).to eq(%w[foo])
112
110
  end
@@ -157,7 +155,7 @@ describe Puppet::Application do
157
155
  end
158
156
 
159
157
  it "should sadly and frighteningly allow run_mode to change at runtime via #initialize_app_defaults" do
160
- Puppet.features.stubs(:syslog?).returns(true)
158
+ allow(Puppet.features).to receive(:syslog?).and_return(true)
161
159
 
162
160
  app = TestApp.new
163
161
  app.initialize_app_defaults
@@ -207,7 +205,7 @@ describe Puppet::Application do
207
205
  end
208
206
 
209
207
  it "should invoke main as the default" do
210
- @app.expects( :main )
208
+ expect(@app).to receive(:main)
211
209
  @app.run_command
212
210
  end
213
211
 
@@ -303,8 +301,8 @@ describe Puppet::Application do
303
301
  describe 'when performing a controlled_run' do
304
302
  it 'should not execute block if not :clear?' do
305
303
  Puppet::Application.run_status = :stop_requested
306
- target = mock 'target'
307
- target.expects(:some_method).never
304
+ target = double('target')
305
+ expect(target).not_to receive(:some_method)
308
306
  Puppet::Application.controlled_run do
309
307
  target.some_method
310
308
  end
@@ -312,8 +310,8 @@ describe Puppet::Application do
312
310
 
313
311
  it 'should execute block if :clear?' do
314
312
  Puppet::Application.run_status = nil
315
- target = mock 'target'
316
- target.expects(:some_method).once
313
+ target = double('target')
314
+ expect(target).to receive(:some_method).once
317
315
  Puppet::Application.controlled_run do
318
316
  target.some_method
319
317
  end
@@ -354,38 +352,36 @@ describe Puppet::Application do
354
352
  describe "when parsing command-line options" do
355
353
 
356
354
  before :each do
357
- @app.command_line.stubs(:args).returns([])
355
+ allow(@app.command_line).to receive(:args).and_return([])
358
356
 
359
- Puppet.settings.stubs(:optparse_addargs).returns([])
357
+ allow(Puppet.settings).to receive(:optparse_addargs).and_return([])
360
358
  end
361
359
 
362
360
  it "should pass the banner to the option parser" do
363
- option_parser = stub "option parser"
364
- option_parser.stubs(:on)
365
- option_parser.stubs(:parse!)
361
+ option_parser = double("option parser")
362
+ allow(option_parser).to receive(:on)
363
+ allow(option_parser).to receive(:parse!)
366
364
  @app.class.instance_eval do
367
365
  banner "banner"
368
366
  end
369
367
 
370
- OptionParser.expects(:new).with("banner").returns(option_parser)
368
+ expect(OptionParser).to receive(:new).with("banner").and_return(option_parser)
371
369
 
372
370
  @app.parse_options
373
371
  end
374
372
 
375
373
  it "should ask OptionParser to parse the command-line argument" do
376
- @app.command_line.stubs(:args).returns(%w{ fake args })
377
- OptionParser.any_instance.expects(:parse!).with(%w{ fake args })
374
+ allow(@app.command_line).to receive(:args).and_return(%w{ fake args })
375
+ expect_any_instance_of(OptionParser).to receive(:parse!).with(%w{ fake args })
378
376
 
379
377
  @app.parse_options
380
378
  end
381
379
 
382
380
  describe "when using --help" do
383
-
384
381
  it "should call exit" do
385
- @app.stubs(:puts)
382
+ allow(@app).to receive(:puts)
386
383
  expect { @app.handle_help(nil) }.to exit_with 0
387
384
  end
388
-
389
385
  end
390
386
 
391
387
  describe "when using --version" do
@@ -394,66 +390,65 @@ describe Puppet::Application do
394
390
  end
395
391
 
396
392
  it "should exit after printing the version" do
397
- @app.stubs(:puts)
393
+ allow(@app).to receive(:puts)
398
394
  expect { @app.handle_version(nil) }.to exit_with 0
399
395
  end
400
396
  end
401
397
 
402
398
  describe "when dealing with an argument not declared directly by the application" do
403
399
  it "should pass it to handle_unknown if this method exists" do
404
- Puppet.settings.stubs(:optparse_addargs).returns([["--not-handled", :REQUIRED]])
400
+ allow(Puppet.settings).to receive(:optparse_addargs).and_return([["--not-handled", :REQUIRED]])
405
401
 
406
- @app.expects(:handle_unknown).with("--not-handled", "value").returns(true)
407
- @app.command_line.stubs(:args).returns(["--not-handled", "value"])
402
+ expect(@app).to receive(:handle_unknown).with("--not-handled", "value").and_return(true)
403
+ allow(@app.command_line).to receive(:args).and_return(["--not-handled", "value"])
408
404
  @app.parse_options
409
405
  end
410
406
 
411
407
  it "should transform boolean option to normal form for Puppet.settings" do
412
- @app.expects(:handle_unknown).with("--option", true)
408
+ expect(@app).to receive(:handle_unknown).with("--option", true)
413
409
  @app.send(:handlearg, "--[no-]option", true)
414
410
  end
415
411
 
416
412
  it "should transform boolean option to no- form for Puppet.settings" do
417
- @app.expects(:handle_unknown).with("--no-option", false)
413
+ expect(@app).to receive(:handle_unknown).with("--no-option", false)
418
414
  @app.send(:handlearg, "--[no-]option", false)
419
415
  end
420
-
421
416
  end
422
417
  end
423
418
 
424
419
  describe "when calling default setup" do
425
420
  before :each do
426
- @app.options.stubs(:[])
421
+ allow(@app.options).to receive(:[])
427
422
  end
428
423
 
429
424
  [ :debug, :verbose ].each do |level|
430
425
  it "should honor option #{level}" do
431
- @app.options.stubs(:[]).with(level).returns(true)
432
- Puppet::Util::Log.stubs(:newdestination)
426
+ allow(@app.options).to receive(:[]).with(level).and_return(true)
427
+ allow(Puppet::Util::Log).to receive(:newdestination)
433
428
  @app.setup
434
429
  expect(Puppet::Util::Log.level).to eq(level == :verbose ? :info : :debug)
435
430
  end
436
431
  end
437
432
 
438
433
  it "should honor setdest option" do
439
- @app.options.stubs(:[]).with(:setdest).returns(false)
434
+ allow(@app.options).to receive(:[]).with(:setdest).and_return(false)
440
435
 
441
- Puppet::Util::Log.expects(:setup_default)
436
+ expect(Puppet::Util::Log).to receive(:setup_default)
442
437
 
443
438
  @app.setup
444
439
  end
445
-
440
+
446
441
  it "sets the log destination if provided via settings" do
447
- @app.options.unstub(:[])
442
+ allow(@app.options).to receive(:[]).and_call_original
448
443
  Puppet[:logdest] = "set_via_config"
449
- Puppet::Util::Log.expects(:newdestination).with("set_via_config")
444
+ expect(Puppet::Util::Log).to receive(:newdestination).with("set_via_config")
450
445
 
451
446
  @app.setup
452
447
  end
453
448
 
454
449
  it "does not downgrade the loglevel when --verbose is specified" do
455
450
  Puppet[:log_level] = :debug
456
- @app.options.stubs(:[]).with(:verbose).returns(true)
451
+ allow(@app.options).to receive(:[]).with(:verbose).and_return(true)
457
452
  @app.setup_logs
458
453
 
459
454
  expect(Puppet::Util::Log.level).to eq(:debug)
@@ -516,69 +511,65 @@ describe Puppet::Application do
516
511
  end
517
512
 
518
513
  describe "when running" do
519
-
520
514
  before :each do
521
- @app.stubs(:preinit)
522
- @app.stubs(:setup)
523
- @app.stubs(:parse_options)
515
+ allow(@app).to receive(:preinit)
516
+ allow(@app).to receive(:setup)
517
+ allow(@app).to receive(:parse_options)
524
518
  end
525
519
 
526
520
  it "should call preinit" do
527
- @app.stubs(:run_command)
521
+ allow(@app).to receive(:run_command)
528
522
 
529
- @app.expects(:preinit)
523
+ expect(@app).to receive(:preinit)
530
524
 
531
525
  @app.run
532
526
  end
533
527
 
534
528
  it "should call parse_options" do
535
- @app.stubs(:run_command)
529
+ allow(@app).to receive(:run_command)
536
530
 
537
- @app.expects(:parse_options)
531
+ expect(@app).to receive(:parse_options)
538
532
 
539
533
  @app.run
540
534
  end
541
535
 
542
536
  it "should call run_command" do
543
-
544
- @app.expects(:run_command)
537
+ expect(@app).to receive(:run_command)
545
538
 
546
539
  @app.run
547
540
  end
548
541
 
549
-
550
542
  it "should call run_command" do
551
- @app.expects(:run_command)
543
+ expect(@app).to receive(:run_command)
552
544
 
553
545
  @app.run
554
546
  end
555
547
 
556
548
  it "should call main as the default command" do
557
- @app.expects(:main)
549
+ expect(@app).to receive(:main)
558
550
 
559
551
  @app.run
560
552
  end
561
553
 
562
554
  it "should warn and exit if no command can be called" do
563
- Puppet.expects(:send_log).with(:err, "Could not run: No valid command or main")
555
+ expect(Puppet).to receive(:send_log).with(:err, "Could not run: No valid command or main")
564
556
  expect { @app.run }.to exit_with 1
565
557
  end
566
558
 
567
559
  it "should raise an error if dispatch returns no command" do
568
- @app.stubs(:get_command).returns(nil)
569
- Puppet.expects(:send_log).with(:err, "Could not run: No valid command or main")
560
+ allow(@app).to receive(:get_command).and_return(nil)
561
+ expect(Puppet).to receive(:send_log).with(:err, "Could not run: No valid command or main")
570
562
  expect { @app.run }.to exit_with 1
571
563
  end
572
564
 
573
565
  it "should raise an error if dispatch returns an invalid command" do
574
- @app.stubs(:get_command).returns(:this_function_doesnt_exist)
575
- Puppet.expects(:send_log).with(:err, "Could not run: No valid command or main")
566
+ allow(@app).to receive(:get_command).and_return(:this_function_doesnt_exist)
567
+ expect(Puppet).to receive(:send_log).with(:err, "Could not run: No valid command or main")
576
568
  expect { @app.run }.to exit_with 1
577
569
  end
578
570
  end
579
571
 
580
572
  describe "when metaprogramming" do
581
-
582
573
  describe "when calling option" do
583
574
  it "should create a new method named after the option" do
584
575
  @app.class.option("--test1","-t") do
@@ -611,8 +602,8 @@ describe Puppet::Application do
611
602
  end
612
603
 
613
604
  it "should declare the option to OptionParser" do
614
- OptionParser.any_instance.stubs(:on)
615
- OptionParser.any_instance.expects(:on).with { |*arg| arg[0] == "--[no-]test3" }
605
+ allow_any_instance_of(OptionParser).to receive(:on)
606
+ expect_any_instance_of(OptionParser).to receive(:on).with("--[no-]test3", anything)
616
607
 
617
608
  @app.class.option("--[no-]test3","-t") do
618
609
  end
@@ -621,10 +612,10 @@ describe Puppet::Application do
621
612
  end
622
613
 
623
614
  it "should pass a block that calls our defined method" do
624
- OptionParser.any_instance.stubs(:on)
625
- OptionParser.any_instance.stubs(:on).with('--test4','-t').yields(nil)
615
+ allow_any_instance_of(OptionParser).to receive(:on)
616
+ allow_any_instance_of(OptionParser).to receive(:on).with('--test4', '-t').and_yield(nil)
626
617
 
627
- @app.expects(:send).with(:handle_test4, nil)
618
+ expect(@app).to receive(:send).with(:handle_test4, nil)
628
619
 
629
620
  @app.class.option("--test4","-t") do
630
621
  end
@@ -635,8 +626,8 @@ describe Puppet::Application do
635
626
 
636
627
  describe "when no block is given" do
637
628
  it "should declare the option to OptionParser" do
638
- OptionParser.any_instance.stubs(:on)
639
- OptionParser.any_instance.expects(:on).with("--test4","-t")
629
+ allow_any_instance_of(OptionParser).to receive(:on)
630
+ expect_any_instance_of(OptionParser).to receive(:on).with("--test4", "-t")
640
631
 
641
632
  @app.class.option("--test4","-t")
642
633
 
@@ -644,10 +635,10 @@ describe Puppet::Application do
644
635
  end
645
636
 
646
637
  it "should give to OptionParser a block that adds the value to the options array" do
647
- OptionParser.any_instance.stubs(:on)
648
- OptionParser.any_instance.stubs(:on).with("--test4","-t").yields(nil)
638
+ allow_any_instance_of(OptionParser).to receive(:on)
639
+ allow_any_instance_of(OptionParser).to receive(:on).with("--test4", "-t").and_yield(nil)
649
640
 
650
- @app.options.expects(:[]=).with(:test4,nil)
641
+ expect(@app.options).to receive(:[]=).with(:test4, nil)
651
642
 
652
643
  @app.class.option("--test4","-t")
653
644
 
@@ -655,7 +646,6 @@ describe Puppet::Application do
655
646
  end
656
647
  end
657
648
  end
658
-
659
649
  end
660
650
 
661
651
  describe "#handle_logdest_arg" do
@@ -663,38 +653,38 @@ describe Puppet::Application do
663
653
 
664
654
  it "should log an exception that is raised" do
665
655
  our_exception = Puppet::DevError.new("test exception")
666
- Puppet::Util::Log.expects(:newdestination).with(test_arg).raises(our_exception)
667
- Puppet.expects(:log_and_raise).with(our_exception, anything)
656
+ expect(Puppet::Util::Log).to receive(:newdestination).with(test_arg).and_raise(our_exception)
657
+ expect(Puppet).to receive(:log_and_raise).with(our_exception, anything)
668
658
  @app.handle_logdest_arg(test_arg)
669
659
  end
670
660
 
671
661
  it "should exit when an exception is raised" do
672
662
  our_exception = Puppet::DevError.new("test exception")
673
- Puppet::Util::Log.expects(:newdestination).with(test_arg).raises(our_exception)
674
- Puppet.expects(:log_and_raise).with(our_exception, anything).raises(our_exception)
663
+ expect(Puppet::Util::Log).to receive(:newdestination).with(test_arg).and_raise(our_exception)
664
+ expect(Puppet).to receive(:log_and_raise).with(our_exception, anything).and_raise(our_exception)
675
665
  expect { @app.handle_logdest_arg(test_arg) }.to raise_error(Puppet::DevError)
676
666
  end
677
667
 
678
668
  it "should set the new log destination" do
679
- Puppet::Util::Log.expects(:newdestination).with(test_arg)
669
+ expect(Puppet::Util::Log).to receive(:newdestination).with(test_arg)
680
670
  @app.handle_logdest_arg(test_arg)
681
671
  end
682
672
 
683
673
  it "should set the flag that a destination is set in the options hash" do
684
- Puppet::Util::Log.stubs(:newdestination).with(test_arg)
674
+ allow(Puppet::Util::Log).to receive(:newdestination).with(test_arg)
685
675
  @app.handle_logdest_arg(test_arg)
686
676
  expect(@app.options[:setdest]).to be_truthy
687
677
  end
688
678
 
689
679
  it "does not set the log destination if setdest is true" do
690
- Puppet::Util::Log.expects(:newdestination).never
680
+ expect(Puppet::Util::Log).not_to receive(:newdestination)
691
681
  @app.options[:setdest] = true
692
682
 
693
683
  @app.handle_logdest_arg(test_arg)
694
684
  end
695
685
 
696
686
  it "does not set the log destination if arg is nil" do
697
- Puppet::Util::Log.expects(:newdestination).never
687
+ expect(Puppet::Util::Log).not_to receive(:newdestination)
698
688
 
699
689
  @app.handle_logdest_arg(nil)
700
690
  end