puppet 6.0.7-x64-mingw32 → 6.0.8-x64-mingw32

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

Potentially problematic release.


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

Files changed (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
@@ -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) }
@@ -70,6 +68,14 @@ describe Puppet::Network::HTTP::Connection do
70
68
  let (:host) { "my_server" }
71
69
  let (:port) { 8140 }
72
70
 
71
+ # This is terrible, and is doing things that should probably be in spec/lib/puppet_spec/validators.rb,
72
+ # but we can't call allow from there.
73
+ before(:each) do
74
+ allow_any_instance_of(ConstantErrorValidator).to receive(:setup_connection) do |cev, connection|
75
+ allow(connection).to receive(:start).and_raise(OpenSSL::SSL::SSLError.new(cev.instance_variable_get(:@fails_with)))
76
+ end
77
+ end
78
+
73
79
  before :all do
74
80
  WebMock.disable!
75
81
  end
@@ -126,9 +132,9 @@ describe Puppet::Network::HTTP::Connection do
126
132
  host, port,
127
133
  :verify => NoProblemsValidator.new(cert))
128
134
 
129
- Net::HTTP.any_instance.stubs(:start)
130
- Net::HTTP.any_instance.stubs(:request).returns(httpok)
131
- Puppet::Network::HTTP::Pool.any_instance.stubs(:setsockopts)
135
+ allow_any_instance_of(Net::HTTP).to receive(:start)
136
+ allow_any_instance_of(Net::HTTP).to receive(:request).and_return(httpok)
137
+ allow_any_instance_of(Puppet::Network::HTTP::Pool).to receive(:setsockopts)
132
138
 
133
139
  connection.get('request')
134
140
  end
@@ -161,7 +167,7 @@ describe Puppet::Network::HTTP::Connection do
161
167
  let (:httpredirection) do
162
168
  response = Net::HTTPFound.new('1.1', 302, 'Moved Temporarily')
163
169
  response['location'] = "#{other_site.addr}/#{other_path}"
164
- response.stubs(:read_body).returns("This resource has moved")
170
+ allow(response).to receive(:read_body).and_return("This resource has moved")
165
171
  response
166
172
  end
167
173
 
@@ -171,24 +177,23 @@ describe Puppet::Network::HTTP::Connection do
171
177
  end
172
178
 
173
179
  it "should redirect to the final resource location" do
174
- http = stub('http')
175
- http.stubs(:request).returns(httpredirection).then.returns(httpok)
180
+ http = double('http')
181
+ allow(http).to receive(:request).and_return(httpredirection, httpok)
176
182
 
177
- seq = sequence('redirection')
178
183
  pool = Puppet.lookup(:http_pool)
179
- pool.expects(:with_connection).with(site, anything).yields(http).in_sequence(seq)
180
- pool.expects(:with_connection).with(other_site, anything).yields(http).in_sequence(seq)
184
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http).ordered
185
+ expect(pool).to receive(:with_connection).with(other_site, anything).and_yield(http).ordered
181
186
 
182
187
  conn = create_connection(site, :verify => verify)
183
188
  conn.get('/foo')
184
189
  end
185
190
 
186
191
  def expects_redirection(conn, &block)
187
- http = stub('http')
188
- http.stubs(:request).returns(httpredirection)
192
+ http = double('http')
193
+ allow(http).to receive(:request).and_return(httpredirection)
189
194
 
190
195
  pool = Puppet.lookup(:http_pool)
191
- pool.expects(:with_connection).with(site, anything).yields(http)
196
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http)
192
197
  pool
193
198
  end
194
199
 
@@ -202,7 +207,7 @@ describe Puppet::Network::HTTP::Connection do
202
207
  conn = create_connection(site, :verify => verify, :redirect_limit => 0)
203
208
 
204
209
  pool = expects_redirection(conn)
205
- pool.expects(:with_connection).with(other_site, anything).never
210
+ expect(pool).not_to receive(:with_connection).with(other_site, anything)
206
211
 
207
212
  expects_limit_exceeded(conn)
208
213
  end
@@ -211,7 +216,7 @@ describe Puppet::Network::HTTP::Connection do
211
216
  conn = create_connection(site, :verify => verify, :redirect_limit => 1)
212
217
 
213
218
  pool = expects_redirection(conn)
214
- pool.expects(:with_connection).with(other_site, anything).once
219
+ expect(pool).to receive(:with_connection).with(other_site, anything).once
215
220
 
216
221
  expects_limit_exceeded(conn)
217
222
  end
@@ -220,14 +225,14 @@ describe Puppet::Network::HTTP::Connection do
220
225
  conn = create_connection(site, :verify => verify, :redirect_limit => 3)
221
226
 
222
227
  pool = expects_redirection(conn)
223
- pool.expects(:with_connection).with(other_site, anything).times(3)
228
+ expect(pool).to receive(:with_connection).with(other_site, anything).exactly(3).times
224
229
 
225
230
  expects_limit_exceeded(conn)
226
231
  end
227
232
  end
228
233
 
229
234
  context "when response indicates an overloaded server" do
230
- let(:http) { stub('http') }
235
+ let(:http) { double('http') }
231
236
  let(:site) { Puppet::Network::HTTP::Site.new('http', 'my_server', 8140) }
232
237
  let(:verify) { Puppet::SSL::Validator.no_validator }
233
238
  let(:httpunavailable) { Net::HTTPServiceUnavailable.new('1.1', 503, 'Service Unavailable') }
@@ -246,10 +251,10 @@ describe Puppet::Network::HTTP::Connection do
246
251
  end
247
252
 
248
253
  it "should return a 503 response if Retry-After is not set" do
249
- http.stubs(:request).returns(httpunavailable)
254
+ allow(http).to receive(:request).and_return(httpunavailable)
250
255
 
251
256
  pool = Puppet.lookup(:http_pool)
252
- pool.expects(:with_connection).with(site, anything).yields(http)
257
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http)
253
258
 
254
259
  result = subject.get('/foo')
255
260
 
@@ -258,10 +263,10 @@ describe Puppet::Network::HTTP::Connection do
258
263
 
259
264
  it "should return a 503 response if Retry-After is not convertible to an Integer or RFC 2822 Date" do
260
265
  httpunavailable['Retry-After'] = 'foo'
261
- http.stubs(:request).returns(httpunavailable)
266
+ allow(http).to receive(:request).and_return(httpunavailable)
262
267
 
263
268
  pool = Puppet.lookup(:http_pool)
264
- pool.expects(:with_connection).with(site, anything).yields(http)
269
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http)
265
270
 
266
271
  result = subject.get('/foo')
267
272
 
@@ -270,12 +275,12 @@ describe Puppet::Network::HTTP::Connection do
270
275
 
271
276
  it "should sleep and retry if Retry-After is an Integer" do
272
277
  httpunavailable['Retry-After'] = '42'
273
- http.stubs(:request).returns(httpunavailable).then.returns(httpok)
278
+ allow(http).to receive(:request).and_return(httpunavailable, httpok)
274
279
 
275
280
  pool = Puppet.lookup(:http_pool)
276
- pool.expects(:with_connection).with(site, anything).twice.yields(http)
281
+ expect(pool).to receive(:with_connection).with(site, anything).twice.and_yield(http)
277
282
 
278
- ::Kernel.expects(:sleep).with(42)
283
+ expect(::Kernel).to receive(:sleep).with(42)
279
284
 
280
285
  result = subject.get('/foo')
281
286
 
@@ -284,15 +289,15 @@ describe Puppet::Network::HTTP::Connection do
284
289
 
285
290
  it "should sleep and retry if Retry-After is an RFC 2822 Date" do
286
291
  httpunavailable['Retry-After'] = 'Wed, 13 Apr 2005 15:18:05 GMT'
287
- http.stubs(:request).returns(httpunavailable).then.returns(httpok)
292
+ allow(http).to receive(:request).and_return(httpunavailable, httpok)
288
293
 
289
294
  now = DateTime.new(2005, 4, 13, 8, 17, 5, '-07:00')
290
- DateTime.stubs(:now).returns(now)
295
+ allow(DateTime).to receive(:now).and_return(now)
291
296
 
292
297
  pool = Puppet.lookup(:http_pool)
293
- pool.expects(:with_connection).with(site, anything).twice.yields(http)
298
+ expect(pool).to receive(:with_connection).with(site, anything).twice.and_yield(http)
294
299
 
295
- ::Kernel.expects(:sleep).with(60)
300
+ expect(::Kernel).to receive(:sleep).with(60)
296
301
 
297
302
  result = subject.get('/foo')
298
303
 
@@ -301,13 +306,13 @@ describe Puppet::Network::HTTP::Connection do
301
306
 
302
307
  it "should sleep for no more than the Puppet runinterval" do
303
308
  httpunavailable['Retry-After'] = '60'
304
- http.stubs(:request).returns(httpunavailable).then.returns(httpok)
309
+ allow(http).to receive(:request).and_return(httpunavailable, httpok)
305
310
  Puppet[:runinterval] = 30
306
311
 
307
312
  pool = Puppet.lookup(:http_pool)
308
- pool.expects(:with_connection).with(site, anything).twice.yields(http)
313
+ expect(pool).to receive(:with_connection).with(site, anything).twice.and_yield(http)
309
314
 
310
- ::Kernel.expects(:sleep).with(30)
315
+ expect(::Kernel).to receive(:sleep).with(30)
311
316
 
312
317
  subject.get('/foo')
313
318
  end
@@ -344,17 +349,17 @@ describe Puppet::Network::HTTP::Connection do
344
349
  end
345
350
 
346
351
  def expect_request_with_basic_auth
347
- Net::HTTP.any_instance.expects(:request).with do |request|
352
+ expect_any_instance_of(Net::HTTP).to receive(:request) do |_, request|
348
353
  expect(request['authorization']).to match(/^Basic/)
349
- end.returns(httpok)
354
+ end.and_return(httpok)
350
355
  end
351
356
 
352
357
  it "sets HTTP User-Agent header" do
353
358
  puppet_ua = "Puppet/#{Puppet.version} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_PLATFORM})"
354
359
 
355
- Net::HTTP.any_instance.expects(:request).with do |request|
360
+ expect_any_instance_of(Net::HTTP).to receive(:request) do |_, request|
356
361
  expect(request['User-Agent']).to eq(puppet_ua)
357
- end.returns(httpok)
362
+ end.and_return(httpok)
358
363
 
359
364
  subject.get('/path')
360
365
  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'
@@ -37,7 +36,7 @@ describe Puppet::Network::HTTP::Factory do
37
36
  it 'creates a connection supporting at least HTTP 1.1' do
38
37
  conn = create_connection(site)
39
38
 
40
- expect(any_of(conn.class.version_1_1?, conn.class.version_1_1?)).to be_truthy
39
+ expect(conn.class.version_1_1? || conn.class.version_1_2?).to be_truthy
41
40
  end
42
41
 
43
42
  context "proxy settings" do
@@ -46,7 +45,7 @@ describe Puppet::Network::HTTP::Factory do
46
45
 
47
46
  it "should not set a proxy if the value is 'none'" do
48
47
  Puppet[:http_proxy_host] = 'none'
49
- Puppet::Util::HttpProxy.expects(:no_proxy?).returns false
48
+ expect(Puppet::Util::HttpProxy).to receive(:no_proxy?).and_return(false)
50
49
  conn = create_connection(site)
51
50
 
52
51
  expect(conn.proxy_address).to be_nil
@@ -55,7 +54,7 @@ describe Puppet::Network::HTTP::Factory do
55
54
  it 'should not set a proxy if a no_proxy env var matches the destination' do
56
55
  Puppet[:http_proxy_host] = proxy_host
57
56
  Puppet[:http_proxy_port] = proxy_port
58
- Puppet::Util::HttpProxy.expects(:no_proxy?).returns true
57
+ expect(Puppet::Util::HttpProxy).to receive(:no_proxy?).and_return(true)
59
58
  conn = create_connection(site)
60
59
 
61
60
  expect(conn.proxy_address).to be_nil
@@ -64,7 +63,7 @@ describe Puppet::Network::HTTP::Factory do
64
63
 
65
64
  it 'sets proxy_address' do
66
65
  Puppet[:http_proxy_host] = proxy_host
67
- Puppet::Util::HttpProxy.expects(:no_proxy?).returns false
66
+ expect(Puppet::Util::HttpProxy).to receive(:no_proxy?).and_return(false)
68
67
  conn = create_connection(site)
69
68
 
70
69
  expect(conn.proxy_address).to eq(proxy_host)
@@ -73,7 +72,7 @@ describe Puppet::Network::HTTP::Factory do
73
72
  it 'sets proxy address and port' do
74
73
  Puppet[:http_proxy_host] = proxy_host
75
74
  Puppet[:http_proxy_port] = proxy_port
76
- Puppet::Util::HttpProxy.expects(:no_proxy?).returns false
75
+ expect(Puppet::Util::HttpProxy).to receive(:no_proxy?).and_return(false)
77
76
  conn = create_connection(site)
78
77
 
79
78
  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