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
@@ -17,7 +17,7 @@ describe Puppet::Network::HTTP::API::Master::V3::Authorization do
17
17
  :params => { :authenticated => true, :node => "testing", :ip => "127.0.0.1" }
18
18
  })
19
19
 
20
- authz.stubs(:authconfig).returns(Puppet::Network::AuthConfigParser.new(<<-AUTH).parse)
20
+ allow(authz).to receive(:authconfig).and_return(Puppet::Network::AuthConfigParser.new(<<-AUTH).parse)
21
21
  path /v3/environments
22
22
  method find
23
23
  allow *
@@ -39,7 +39,7 @@ allow *
39
39
  :params => { :authenticated => true, :node => "testing", :ip => "127.0.0.1" }
40
40
  })
41
41
 
42
- authz.stubs(:authconfig).returns(Puppet::Network::AuthConfigParser.new(<<-AUTH).parse)
42
+ allow(authz).to receive(:authconfig).and_return(Puppet::Network::AuthConfigParser.new(<<-AUTH).parse)
43
43
  path /v3/environments
44
44
  method find
45
45
  auth any
@@ -175,7 +175,7 @@ describe Puppet::Network::HTTP::API::Master::V3::Environment do
175
175
  it "uses code_id from the catalog if it differs from the request" do
176
176
  request = Puppet::Network::HTTP::Request.from_hash(:params => {:code_id => '12345'}, :routing_path => "environment/production")
177
177
 
178
- Puppet::Resource::Catalog.any_instance.stubs(:code_id).returns('67890')
178
+ allow_any_instance_of(Puppet::Resource::Catalog).to receive(:code_id).and_return('67890')
179
179
 
180
180
  subject.call(request, response)
181
181
 
@@ -33,11 +33,11 @@ describe Puppet::Network::HTTP::API::Master::V3::Environments do
33
33
  end
34
34
 
35
35
  it "the response conforms to the environments schema for unlimited timeout" do
36
- conf_stub = stub 'conf_stub'
37
- conf_stub.expects(:environment_timeout).returns(Float::INFINITY)
36
+ conf_stub = double('conf_stub')
37
+ expect(conf_stub).to receive(:environment_timeout).and_return(Float::INFINITY)
38
38
  environment = Puppet::Node::Environment.create(:production, [])
39
39
  env_loader = Puppet::Environments::Static.new(environment)
40
- env_loader.expects(:get_conf).with(:production).returns(conf_stub)
40
+ expect(env_loader).to receive(:get_conf).with(:production).and_return(conf_stub)
41
41
  handler = Puppet::Network::HTTP::API::Master::V3::Environments.new(env_loader)
42
42
  response = Puppet::Network::HTTP::MemoryResponse.new
43
43
 
@@ -47,11 +47,11 @@ describe Puppet::Network::HTTP::API::Master::V3::Environments do
47
47
  end
48
48
 
49
49
  it "the response conforms to the environments schema for integer timeout" do
50
- conf_stub = stub 'conf_stub'
51
- conf_stub.expects(:environment_timeout).returns(1)
50
+ conf_stub = double('conf_stub')
51
+ expect(conf_stub).to receive(:environment_timeout).and_return(1)
52
52
  environment = Puppet::Node::Environment.create(:production, [])
53
53
  env_loader = Puppet::Environments::Static.new(environment)
54
- env_loader.expects(:get_conf).with(:production).returns(conf_stub)
54
+ expect(env_loader).to receive(:get_conf).with(:production).and_return(conf_stub)
55
55
  handler = Puppet::Network::HTTP::API::Master::V3::Environments.new(env_loader)
56
56
  response = Puppet::Network::HTTP::MemoryResponse.new
57
57
 
@@ -59,5 +59,4 @@ describe Puppet::Network::HTTP::API::Master::V3::Environments do
59
59
 
60
60
  expect(response.body).to validate_against('api/schemas/environments.json')
61
61
  end
62
-
63
62
  end
@@ -1,5 +1,3 @@
1
- #! /usr/bin/env ruby
2
-
3
1
  require 'spec_helper'
4
2
  require 'puppet_spec/handler'
5
3
  require 'puppet/network/http'
@@ -1,9 +1,8 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  describe "http compression" do
5
4
  let(:data) { "uncompresseddata" }
6
- let(:response) { stub 'response' }
5
+ let(:response) { double('response') }
7
6
  let(:compressed_zlib) { Zlib::Deflate.deflate(data) }
8
7
  let(:compressed_gzip) do
9
8
  str = StringIO.new
@@ -14,13 +13,13 @@ describe "http compression" do
14
13
  end
15
14
 
16
15
  def stubs_response_with(response, content_encoding, body)
17
- response.stubs(:[]).with('content-encoding').returns(content_encoding)
18
- response.stubs(:body).returns(body)
16
+ allow(response).to receive(:[]).with('content-encoding').and_return(content_encoding)
17
+ allow(response).to receive(:body).and_return(body)
19
18
  end
20
19
 
21
20
  describe "when zlib is not available" do
22
21
  before(:each) do
23
- Puppet.features.stubs(:zlib?).returns false
22
+ allow(Puppet.features).to receive(:zlib?).and_return(false)
24
23
 
25
24
  require 'puppet/network/http/compression'
26
25
  class HttpUncompressor
@@ -39,12 +38,12 @@ describe "http compression" do
39
38
  end
40
39
 
41
40
  it "should not tamper the body" do
42
- response = stub 'response', :body => data
41
+ response = double('response', :body => data)
43
42
  expect(@uncompressor.uncompress_body(response)).to eq(data)
44
43
  end
45
44
 
46
45
  it "should yield an identity uncompressor" do
47
- response = stub 'response'
46
+ response = double('response')
48
47
  @uncompressor.uncompress(response) { |u|
49
48
  expect(u).to be_instance_of(Puppet::Network::HTTP::Compression::IdentityAdapter)
50
49
  }
@@ -169,19 +168,19 @@ describe "http compression" do
169
168
 
170
169
  it "should close the underlying adapter" do
171
170
  stubs_response_with(response, 'identity', data)
172
- adapter = stub_everything 'adapter'
173
- Puppet::Network::HTTP::Compression::IdentityAdapter.expects(:new).returns(adapter)
171
+ adapter = double('adapter')
172
+ expect(Puppet::Network::HTTP::Compression::IdentityAdapter).to receive(:new).and_return(adapter)
174
173
 
175
- adapter.expects(:close)
174
+ expect(adapter).to receive(:close)
176
175
  uncompressor.uncompress(response) { |u| }
177
176
  end
178
177
 
179
178
  it "should close the underlying adapter if the yielded block raises" do
180
179
  stubs_response_with(response, 'identity', data)
181
- adapter = stub_everything 'adapter'
182
- Puppet::Network::HTTP::Compression::IdentityAdapter.expects(:new).returns(adapter)
180
+ adapter = double('adapter')
181
+ expect(Puppet::Network::HTTP::Compression::IdentityAdapter).to receive(:new).and_return(adapter)
183
182
 
184
- adapter.expects(:close)
183
+ expect(adapter).to receive(:close)
185
184
  expect {
186
185
  uncompressor.uncompress(response) { |u| raise ArgumentError, "whoops" }
187
186
  }.to raise_error(ArgumentError, "whoops")
@@ -190,7 +189,7 @@ describe "http compression" do
190
189
 
191
190
  describe "zlib adapter" do
192
191
  it "should initialize the underlying inflater with gzip/zlib header parsing" do
193
- Zlib::Inflate.expects(:new).with(15+32)
192
+ expect(Zlib::Inflate).to receive(:new).with(15 + 32)
194
193
 
195
194
  Puppet::Network::HTTP::Compression::Active::ZlibAdapter.new
196
195
  end
@@ -203,7 +202,7 @@ describe "http compression" do
203
202
 
204
203
  it "should try a 'regular' inflater on Zlib::DataError" do
205
204
  inflater = Zlib::Inflate.new(15 + 32)
206
- inflater.expects(:inflate).raises(Zlib::DataError.new("not a zlib stream"))
205
+ expect(inflater).to receive(:inflate).and_raise(Zlib::DataError.new("not a zlib stream"))
207
206
  adapter = Puppet::Network::HTTP::Compression::Active::ZlibAdapter.new(inflater)
208
207
 
209
208
  expect(adapter.uncompress(compressed_zlib)).to eq(data)
@@ -211,25 +210,25 @@ describe "http compression" do
211
210
 
212
211
  it "should raise the error the second time" do
213
212
  inflater = Zlib::Inflate.new(15 + 32)
214
- inflater.expects(:inflate).raises(Zlib::DataError.new("not a zlib stream"))
213
+ expect(inflater).to receive(:inflate).and_raise(Zlib::DataError.new("not a zlib stream"))
215
214
  adapter = Puppet::Network::HTTP::Compression::Active::ZlibAdapter.new(inflater)
216
215
 
217
216
  expect { adapter.uncompress("this is not compressed data") }.to raise_error(Zlib::DataError, /incorrect header check/)
218
217
  end
219
218
 
220
219
  it "should finish and close the stream" do
221
- inflater = stub 'inflater'
222
- inflater.expects(:finish)
223
- inflater.expects(:close)
220
+ inflater = double('inflater')
221
+ expect(inflater).to receive(:finish)
222
+ expect(inflater).to receive(:close)
224
223
  adapter = Puppet::Network::HTTP::Compression::Active::ZlibAdapter.new(inflater)
225
224
 
226
225
  adapter.close
227
226
  end
228
227
 
229
228
  it "should close the stream even if finish raises" do
230
- inflater = stub 'inflater'
231
- inflater.expects(:finish).raises(Zlib::BufError)
232
- inflater.expects(:close)
229
+ inflater = double('inflater')
230
+ expect(inflater).to receive(:finish).and_raise(Zlib::BufError)
231
+ expect(inflater).to receive(:close)
233
232
 
234
233
  adapter = Puppet::Network::HTTP::Compression::Active::ZlibAdapter.new(inflater)
235
234
  expect {
@@ -1,11 +1,9 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/network/http/connection'
4
3
  require 'puppet_spec/validators'
5
4
  require 'puppet/test_ca'
6
5
 
7
6
  describe Puppet::Network::HTTP::Connection do
8
-
9
7
  let (:host) { "me" }
10
8
  let (:port) { 54321 }
11
9
  subject { Puppet::Network::HTTP::Connection.new(host, port, :verify => Puppet::SSL::Validator.no_validator) }
@@ -55,7 +53,7 @@ describe Puppet::Network::HTTP::Connection do
55
53
  end
56
54
 
57
55
  it "accepts a verifier" do
58
- verifier = Puppet::SSL::Verifier.new('fqdn', stub('ssl_context'))
56
+ verifier = Puppet::SSL::Verifier.new('fqdn', double('ssl_context'))
59
57
  conn = Puppet::Network::HTTP::Connection.new(host, port, :use_ssl => true, :verifier => verifier)
60
58
 
61
59
  expect(conn.verifier).to eq(verifier)
@@ -80,7 +78,10 @@ describe Puppet::Network::HTTP::Connection do
80
78
  :request_post => "param: value" }.each do |method,body|
81
79
  context "##{method}" do
82
80
  it "should yield to the block" do
83
- Net::HTTP.any_instance.stubs(method).yields.returns(httpok)
81
+ allow_any_instance_of(Net::HTTP).to receive(method) do |_, *_, &block|
82
+ block.call()
83
+ httpok
84
+ end
84
85
 
85
86
  block_executed = false
86
87
  subject.send(method, "/foo", body) do |response|
@@ -101,7 +102,7 @@ describe Puppet::Network::HTTP::Connection do
101
102
  let (:httpredirection) do
102
103
  response = Net::HTTPFound.new('1.1', 302, 'Moved Temporarily')
103
104
  response['location'] = "#{other_site.addr}/#{other_path}"
104
- response.stubs(:read_body).returns("This resource has moved")
105
+ allow(response).to receive(:read_body).and_return("This resource has moved")
105
106
  response
106
107
  end
107
108
 
@@ -111,24 +112,23 @@ describe Puppet::Network::HTTP::Connection do
111
112
  end
112
113
 
113
114
  it "should redirect to the final resource location" do
114
- http = stub('http')
115
- http.stubs(:request).returns(httpredirection).then.returns(httpok)
115
+ http = double('http')
116
+ allow(http).to receive(:request).and_return(httpredirection, httpok)
116
117
 
117
- seq = sequence('redirection')
118
118
  pool = Puppet.lookup(:http_pool)
119
- pool.expects(:with_connection).with(site, anything).yields(http).in_sequence(seq)
120
- pool.expects(:with_connection).with(other_site, anything).yields(http).in_sequence(seq)
119
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http).ordered
120
+ expect(pool).to receive(:with_connection).with(other_site, anything).and_yield(http).ordered
121
121
 
122
122
  conn = create_connection(site, :verify => verify)
123
123
  conn.get('/foo')
124
124
  end
125
125
 
126
126
  def expects_redirection(conn, &block)
127
- http = stub('http')
128
- http.stubs(:request).returns(httpredirection)
127
+ http = double('http')
128
+ allow(http).to receive(:request).and_return(httpredirection)
129
129
 
130
130
  pool = Puppet.lookup(:http_pool)
131
- pool.expects(:with_connection).with(site, anything).yields(http)
131
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http)
132
132
  pool
133
133
  end
134
134
 
@@ -142,7 +142,7 @@ describe Puppet::Network::HTTP::Connection do
142
142
  conn = create_connection(site, :verify => verify, :redirect_limit => 0)
143
143
 
144
144
  pool = expects_redirection(conn)
145
- pool.expects(:with_connection).with(other_site, anything).never
145
+ expect(pool).not_to receive(:with_connection).with(other_site, anything)
146
146
 
147
147
  expects_limit_exceeded(conn)
148
148
  end
@@ -151,7 +151,7 @@ describe Puppet::Network::HTTP::Connection do
151
151
  conn = create_connection(site, :verify => verify, :redirect_limit => 1)
152
152
 
153
153
  pool = expects_redirection(conn)
154
- pool.expects(:with_connection).with(other_site, anything).once
154
+ expect(pool).to receive(:with_connection).with(other_site, anything).once
155
155
 
156
156
  expects_limit_exceeded(conn)
157
157
  end
@@ -160,14 +160,14 @@ describe Puppet::Network::HTTP::Connection do
160
160
  conn = create_connection(site, :verify => verify, :redirect_limit => 3)
161
161
 
162
162
  pool = expects_redirection(conn)
163
- pool.expects(:with_connection).with(other_site, anything).times(3)
163
+ expect(pool).to receive(:with_connection).with(other_site, anything).exactly(3).times
164
164
 
165
165
  expects_limit_exceeded(conn)
166
166
  end
167
167
  end
168
168
 
169
169
  context "when response indicates an overloaded server" do
170
- let(:http) { stub('http') }
170
+ let(:http) { double('http') }
171
171
  let(:site) { Puppet::Network::HTTP::Site.new('http', 'my_server', 8140) }
172
172
  let(:verify) { Puppet::SSL::Validator.no_validator }
173
173
  let(:httpunavailable) { Net::HTTPServiceUnavailable.new('1.1', 503, 'Service Unavailable') }
@@ -186,10 +186,10 @@ describe Puppet::Network::HTTP::Connection do
186
186
  end
187
187
 
188
188
  it "should return a 503 response if Retry-After is not set" do
189
- http.stubs(:request).returns(httpunavailable)
189
+ allow(http).to receive(:request).and_return(httpunavailable)
190
190
 
191
191
  pool = Puppet.lookup(:http_pool)
192
- pool.expects(:with_connection).with(site, anything).yields(http)
192
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http)
193
193
 
194
194
  result = subject.get('/foo')
195
195
 
@@ -198,10 +198,10 @@ describe Puppet::Network::HTTP::Connection do
198
198
 
199
199
  it "should return a 503 response if Retry-After is not convertible to an Integer or RFC 2822 Date" do
200
200
  httpunavailable['Retry-After'] = 'foo'
201
- http.stubs(:request).returns(httpunavailable)
201
+ allow(http).to receive(:request).and_return(httpunavailable)
202
202
 
203
203
  pool = Puppet.lookup(:http_pool)
204
- pool.expects(:with_connection).with(site, anything).yields(http)
204
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http)
205
205
 
206
206
  result = subject.get('/foo')
207
207
 
@@ -210,12 +210,12 @@ describe Puppet::Network::HTTP::Connection do
210
210
 
211
211
  it "should sleep and retry if Retry-After is an Integer" do
212
212
  httpunavailable['Retry-After'] = '42'
213
- http.stubs(:request).returns(httpunavailable).then.returns(httpok)
213
+ allow(http).to receive(:request).and_return(httpunavailable, httpok)
214
214
 
215
215
  pool = Puppet.lookup(:http_pool)
216
- pool.expects(:with_connection).with(site, anything).twice.yields(http)
216
+ expect(pool).to receive(:with_connection).with(site, anything).twice.and_yield(http)
217
217
 
218
- ::Kernel.expects(:sleep).with(42)
218
+ expect(::Kernel).to receive(:sleep).with(42)
219
219
 
220
220
  result = subject.get('/foo')
221
221
 
@@ -224,15 +224,15 @@ describe Puppet::Network::HTTP::Connection do
224
224
 
225
225
  it "should sleep and retry if Retry-After is an RFC 2822 Date" do
226
226
  httpunavailable['Retry-After'] = 'Wed, 13 Apr 2005 15:18:05 GMT'
227
- http.stubs(:request).returns(httpunavailable).then.returns(httpok)
227
+ allow(http).to receive(:request).and_return(httpunavailable, httpok)
228
228
 
229
229
  now = DateTime.new(2005, 4, 13, 8, 17, 5, '-07:00')
230
- DateTime.stubs(:now).returns(now)
230
+ allow(DateTime).to receive(:now).and_return(now)
231
231
 
232
232
  pool = Puppet.lookup(:http_pool)
233
- pool.expects(:with_connection).with(site, anything).twice.yields(http)
233
+ expect(pool).to receive(:with_connection).with(site, anything).twice.and_yield(http)
234
234
 
235
- ::Kernel.expects(:sleep).with(60)
235
+ expect(::Kernel).to receive(:sleep).with(60)
236
236
 
237
237
  result = subject.get('/foo')
238
238
 
@@ -241,13 +241,13 @@ describe Puppet::Network::HTTP::Connection do
241
241
 
242
242
  it "should sleep for no more than the Puppet runinterval" do
243
243
  httpunavailable['Retry-After'] = '60'
244
- http.stubs(:request).returns(httpunavailable).then.returns(httpok)
244
+ allow(http).to receive(:request).and_return(httpunavailable, httpok)
245
245
  Puppet[:runinterval] = 30
246
246
 
247
247
  pool = Puppet.lookup(:http_pool)
248
- pool.expects(:with_connection).with(site, anything).twice.yields(http)
248
+ expect(pool).to receive(:with_connection).with(site, anything).twice.and_yield(http)
249
249
 
250
- ::Kernel.expects(:sleep).with(30)
250
+ expect(::Kernel).to receive(:sleep).with(30)
251
251
 
252
252
  subject.get('/foo')
253
253
  end
@@ -284,17 +284,17 @@ describe Puppet::Network::HTTP::Connection do
284
284
  end
285
285
 
286
286
  def expect_request_with_basic_auth
287
- Net::HTTP.any_instance.expects(:request).with do |request|
287
+ expect_any_instance_of(Net::HTTP).to receive(:request) do |_, request|
288
288
  expect(request['authorization']).to match(/^Basic/)
289
- end.returns(httpok)
289
+ end.and_return(httpok)
290
290
  end
291
291
 
292
292
  it "sets HTTP User-Agent header" do
293
293
  puppet_ua = "Puppet/#{Puppet.version} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_PLATFORM})"
294
294
 
295
- Net::HTTP.any_instance.expects(:request).with do |request|
295
+ expect_any_instance_of(Net::HTTP).to receive(:request) do |_, request|
296
296
  expect(request['User-Agent']).to eq(puppet_ua)
297
- end.returns(httpok)
297
+ end.and_return(httpok)
298
298
 
299
299
  subject.get('/path')
300
300
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/network/http'
4
3
  require 'puppet/util/http_proxy'
@@ -38,7 +37,7 @@ describe Puppet::Network::HTTP::Factory do
38
37
  it 'creates a connection supporting at least HTTP 1.1' do
39
38
  conn = create_connection(site)
40
39
 
41
- expect(any_of(conn.class.version_1_1?, conn.class.version_1_1?)).to be_truthy
40
+ expect(conn.class.version_1_1? || conn.class.version_1_2?).to be_truthy
42
41
  end
43
42
 
44
43
  context "proxy settings" do
@@ -47,7 +46,7 @@ describe Puppet::Network::HTTP::Factory do
47
46
 
48
47
  it "should not set a proxy if the value is 'none'" do
49
48
  Puppet[:http_proxy_host] = 'none'
50
- Puppet::Util::HttpProxy.expects(:no_proxy?).returns false
49
+ expect(Puppet::Util::HttpProxy).to receive(:no_proxy?).and_return(false)
51
50
  conn = create_connection(site)
52
51
 
53
52
  expect(conn.proxy_address).to be_nil
@@ -56,7 +55,7 @@ describe Puppet::Network::HTTP::Factory do
56
55
  it 'should not set a proxy if a no_proxy env var matches the destination' do
57
56
  Puppet[:http_proxy_host] = proxy_host
58
57
  Puppet[:http_proxy_port] = proxy_port
59
- Puppet::Util::HttpProxy.expects(:no_proxy?).returns true
58
+ expect(Puppet::Util::HttpProxy).to receive(:no_proxy?).and_return(true)
60
59
  conn = create_connection(site)
61
60
 
62
61
  expect(conn.proxy_address).to be_nil
@@ -65,7 +64,7 @@ describe Puppet::Network::HTTP::Factory do
65
64
 
66
65
  it 'sets proxy_address' do
67
66
  Puppet[:http_proxy_host] = proxy_host
68
- Puppet::Util::HttpProxy.expects(:no_proxy?).returns false
67
+ expect(Puppet::Util::HttpProxy).to receive(:no_proxy?).and_return(false)
69
68
  conn = create_connection(site)
70
69
 
71
70
  expect(conn.proxy_address).to eq(proxy_host)
@@ -74,7 +73,7 @@ describe Puppet::Network::HTTP::Factory do
74
73
  it 'sets proxy address and port' do
75
74
  Puppet[:http_proxy_host] = proxy_host
76
75
  Puppet[:http_proxy_port] = proxy_port
77
- Puppet::Util::HttpProxy.expects(:no_proxy?).returns false
76
+ expect(Puppet::Util::HttpProxy).to receive(:no_proxy?).and_return(false)
78
77
  conn = create_connection(site)
79
78
 
80
79
  expect(conn.proxy_port).to eq(proxy_port)
@@ -1,12 +1,8 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet_spec/handler'
5
-
6
4
  require 'puppet/indirector_testing'
7
-
8
5
  require 'puppet/network/authorization'
9
-
10
6
  require 'puppet/network/http'
11
7
 
12
8
  describe Puppet::Network::HTTP::Handler do
@@ -84,7 +80,7 @@ describe Puppet::Network::HTTP::Handler do
84
80
  Puppet::Network::HTTP::Route.path(/.*/).get(lambda { |_, _| raise error}))
85
81
 
86
82
  # Stacktraces should be included in logs
87
- Puppet.expects(:err).with("Server Error: the sky is falling!\na.rb\nb.rb")
83
+ expect(Puppet).to receive(:err).with("Server Error: the sky is falling!\na.rb\nb.rb")
88
84
 
89
85
  req = a_request("GET", "/vtest/foo")
90
86
  res = {}
@@ -107,8 +103,8 @@ describe Puppet::Network::HTTP::Handler do
107
103
  end
108
104
 
109
105
  before do
110
- handler.stubs(:check_authorization)
111
- handler.stubs(:warn_if_near_expiration)
106
+ allow(handler).to receive(:check_authorization)
107
+ allow(handler).to receive(:warn_if_near_expiration)
112
108
  end
113
109
 
114
110
  it "should setup a profiler when the puppet-profiling header exists" do
@@ -117,13 +113,8 @@ describe Puppet::Network::HTTP::Handler do
117
113
 
118
114
  p = PuppetSpec::HandlerProfiler.new
119
115
 
120
- Puppet::Util::Profiler.expects(:add_profiler).with { |profiler|
121
- profiler.is_a? Puppet::Util::Profiler::WallClock
122
- }.returns(p)
123
-
124
- Puppet::Util::Profiler.expects(:remove_profiler).with { |profiler|
125
- profiler == p
126
- }
116
+ expect(Puppet::Util::Profiler).to receive(:add_profiler).with(be_a(Puppet::Util::Profiler::WallClock)).and_return(p)
117
+ expect(Puppet::Util::Profiler).to receive(:remove_profiler).with(p)
127
118
 
128
119
  handler.process(request, response)
129
120
  end
@@ -132,7 +123,7 @@ describe Puppet::Network::HTTP::Handler do
132
123
  request = a_request
133
124
  request[:params] = { }
134
125
 
135
- Puppet::Util::Profiler.expects(:add_profiler).never
126
+ expect(Puppet::Util::Profiler).not_to receive(:add_profiler)
136
127
 
137
128
  handler.process(request, response)
138
129
  end
@@ -159,19 +150,19 @@ describe Puppet::Network::HTTP::Handler do
159
150
 
160
151
  describe "when resolving node" do
161
152
  it "should use a look-up from the ip address" do
162
- Resolv.expects(:getname).with("1.2.3.4").returns("host.domain.com")
153
+ expect(Resolv).to receive(:getname).with("1.2.3.4").and_return("host.domain.com")
163
154
 
164
155
  handler.resolve_node(:ip => "1.2.3.4")
165
156
  end
166
157
 
167
158
  it "should return the look-up result" do
168
- Resolv.stubs(:getname).with("1.2.3.4").returns("host.domain.com")
159
+ allow(Resolv).to receive(:getname).with("1.2.3.4").and_return("host.domain.com")
169
160
 
170
161
  expect(handler.resolve_node(:ip => "1.2.3.4")).to eq("host.domain.com")
171
162
  end
172
163
 
173
164
  it "should return the ip address if resolving fails" do
174
- Resolv.stubs(:getname).with("1.2.3.4").raises(RuntimeError, "no such host")
165
+ allow(Resolv).to receive(:getname).with("1.2.3.4").and_raise(RuntimeError, "no such host")
175
166
 
176
167
  expect(handler.resolve_node(:ip => "1.2.3.4")).to eq("1.2.3.4")
177
168
  end