puppet 5.5.12-universal-darwin → 5.5.13-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 (733) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -5
  3. data/Gemfile.lock +11 -11
  4. data/lib/puppet/application/filebucket.rb +4 -0
  5. data/lib/puppet/configurer.rb +9 -3
  6. data/lib/puppet/indirector/request.rb +26 -15
  7. data/lib/puppet/indirector/rest.rb +16 -7
  8. data/lib/puppet/network/http/connection.rb +15 -7
  9. data/lib/puppet/transaction/event_manager.rb +1 -5
  10. data/lib/puppet/type/file/source.rb +0 -1
  11. data/lib/puppet/util/http_proxy.rb +3 -2
  12. data/lib/puppet/version.rb +1 -1
  13. data/locales/puppet.pot +108 -36
  14. data/man/man5/puppet.conf.5 +2 -2
  15. data/man/man8/puppet-agent.8 +1 -1
  16. data/man/man8/puppet-apply.8 +1 -1
  17. data/man/man8/puppet-ca.8 +1 -1
  18. data/man/man8/puppet-catalog.8 +1 -1
  19. data/man/man8/puppet-cert.8 +1 -1
  20. data/man/man8/puppet-certificate.8 +1 -1
  21. data/man/man8/puppet-certificate_request.8 +1 -1
  22. data/man/man8/puppet-certificate_revocation_list.8 +1 -1
  23. data/man/man8/puppet-config.8 +1 -1
  24. data/man/man8/puppet-describe.8 +1 -1
  25. data/man/man8/puppet-device.8 +1 -1
  26. data/man/man8/puppet-doc.8 +1 -1
  27. data/man/man8/puppet-epp.8 +1 -1
  28. data/man/man8/puppet-facts.8 +1 -1
  29. data/man/man8/puppet-filebucket.8 +1 -1
  30. data/man/man8/puppet-generate.8 +1 -1
  31. data/man/man8/puppet-help.8 +1 -1
  32. data/man/man8/puppet-key.8 +1 -1
  33. data/man/man8/puppet-lookup.8 +1 -1
  34. data/man/man8/puppet-man.8 +1 -1
  35. data/man/man8/puppet-master.8 +1 -1
  36. data/man/man8/puppet-module.8 +1 -1
  37. data/man/man8/puppet-node.8 +1 -1
  38. data/man/man8/puppet-parser.8 +1 -1
  39. data/man/man8/puppet-plugin.8 +1 -1
  40. data/man/man8/puppet-report.8 +1 -1
  41. data/man/man8/puppet-resource.8 +1 -1
  42. data/man/man8/puppet-script.8 +1 -1
  43. data/man/man8/puppet-status.8 +1 -1
  44. data/man/man8/puppet.8 +2 -2
  45. data/spec/integration/agent/logging_spec.rb +5 -7
  46. data/spec/integration/application/apply_spec.rb +28 -26
  47. data/spec/integration/application/doc_spec.rb +1 -2
  48. data/spec/integration/application/lookup_spec.rb +5 -5
  49. data/spec/integration/configurer_spec.rb +5 -6
  50. data/spec/integration/defaults_spec.rb +5 -6
  51. data/spec/integration/directory_environments_spec.rb +1 -1
  52. data/spec/integration/faces/ca_spec.rb +2 -3
  53. data/spec/integration/faces/config_spec.rb +3 -4
  54. data/spec/integration/faces/documentation_spec.rb +0 -1
  55. data/spec/integration/faces/plugin_spec.rb +1 -1
  56. data/spec/integration/file_bucket/file_spec.rb +3 -5
  57. data/spec/integration/file_serving/content_spec.rb +0 -1
  58. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  59. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  60. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  61. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  62. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  63. data/spec/integration/indirector/facts/facter_spec.rb +5 -5
  64. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  65. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  66. data/spec/integration/indirector/node/ldap_spec.rb +2 -3
  67. data/spec/integration/network/authconfig_spec.rb +23 -24
  68. data/spec/integration/network/formats_spec.rb +0 -1
  69. data/spec/integration/network/http/api/indirected_routes_spec.rb +0 -1
  70. data/spec/integration/node/environment_spec.rb +0 -1
  71. data/spec/integration/node/facts_spec.rb +9 -10
  72. data/spec/integration/node_spec.rb +6 -7
  73. data/spec/integration/parser/catalog_spec.rb +4 -2
  74. data/spec/integration/parser/collection_spec.rb +1 -2
  75. data/spec/integration/parser/compiler_spec.rb +6 -6
  76. data/spec/integration/parser/scope_spec.rb +1 -1
  77. data/spec/integration/parser/undef_param_spec.rb +1 -1
  78. data/spec/integration/provider/cron/crontab_spec.rb +8 -10
  79. data/spec/integration/provider/mailalias/aliases_spec.rb +0 -1
  80. data/spec/integration/provider/mount_spec.rb +9 -9
  81. data/spec/integration/provider/service/init_spec.rb +4 -5
  82. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  83. data/spec/integration/provider/service/windows_spec.rb +1 -2
  84. data/spec/integration/provider/ssh_authorized_key_spec.rb +6 -8
  85. data/spec/integration/provider/sshkey_spec.rb +6 -12
  86. data/spec/integration/provider/yumrepo_spec.rb +8 -12
  87. data/spec/integration/reference/providers_spec.rb +0 -1
  88. data/spec/integration/reports_spec.rb +1 -2
  89. data/spec/integration/resource/catalog_spec.rb +14 -17
  90. data/spec/integration/resource/type_collection_spec.rb +4 -5
  91. data/spec/integration/ssl/certificate_authority_spec.rb +0 -1
  92. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  93. data/spec/integration/ssl/certificate_revocation_list_spec.rb +0 -1
  94. data/spec/integration/ssl/host_spec.rb +0 -1
  95. data/spec/integration/ssl/key_spec.rb +0 -1
  96. data/spec/integration/test/test_helper_spec.rb +1 -2
  97. data/spec/integration/transaction/report_spec.rb +6 -11
  98. data/spec/integration/transaction_spec.rb +18 -19
  99. data/spec/integration/type/exec_spec.rb +0 -1
  100. data/spec/integration/type/file_spec.rb +13 -14
  101. data/spec/integration/type/nagios_spec.rb +3 -5
  102. data/spec/integration/type/package_spec.rb +19 -23
  103. data/spec/integration/type/tidy_spec.rb +1 -2
  104. data/spec/integration/type/user_spec.rb +0 -1
  105. data/spec/integration/type_spec.rb +0 -1
  106. data/spec/integration/util/autoload_spec.rb +1 -2
  107. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  108. data/spec/integration/util/settings_spec.rb +0 -1
  109. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  110. data/spec/integration/util/windows/principal_spec.rb +0 -1
  111. data/spec/integration/util/windows/process_spec.rb +4 -6
  112. data/spec/integration/util/windows/registry_spec.rb +41 -51
  113. data/spec/integration/util/windows/security_spec.rb +2 -4
  114. data/spec/integration/util/windows/user_spec.rb +18 -20
  115. data/spec/integration/util_spec.rb +4 -7
  116. data/spec/lib/puppet_spec/compiler.rb +1 -1
  117. data/spec/lib/puppet_spec/files.rb +0 -1
  118. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  119. data/spec/lib/puppet_spec/scope.rb +1 -2
  120. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  121. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  122. data/spec/shared_behaviours/file_serving.rb +6 -8
  123. data/spec/shared_behaviours/file_serving_model.rb +4 -6
  124. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  125. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  126. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  127. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  128. data/spec/spec_helper.rb +11 -2
  129. data/spec/unit/agent/disabler_spec.rb +4 -5
  130. data/spec/unit/agent/locker_spec.rb +12 -13
  131. data/spec/unit/agent_spec.rb +80 -85
  132. data/spec/unit/application/agent_spec.rb +88 -93
  133. data/spec/unit/application/apply_spec.rb +78 -79
  134. data/spec/unit/application/cert_spec.rb +42 -49
  135. data/spec/unit/application/certificate_spec.rb +2 -3
  136. data/spec/unit/application/config_spec.rb +0 -1
  137. data/spec/unit/application/describe_spec.rb +6 -7
  138. data/spec/unit/application/device_spec.rb +175 -184
  139. data/spec/unit/application/doc_spec.rb +44 -46
  140. data/spec/unit/application/face_base_spec.rb +61 -62
  141. data/spec/unit/application/facts_spec.rb +3 -4
  142. data/spec/unit/application/filebucket_spec.rb +66 -74
  143. data/spec/unit/application/indirection_base_spec.rb +8 -6
  144. data/spec/unit/application/lookup_spec.rb +26 -26
  145. data/spec/unit/application/master_spec.rb +95 -95
  146. data/spec/unit/application/resource_spec.rb +42 -48
  147. data/spec/unit/application_spec.rb +74 -84
  148. data/spec/unit/capability_spec.rb +9 -6
  149. data/spec/unit/configurer/downloader_spec.rb +20 -21
  150. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  151. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  152. data/spec/unit/configurer_spec.rb +190 -193
  153. data/spec/unit/confine/exists_spec.rb +17 -15
  154. data/spec/unit/confine/false_spec.rb +5 -6
  155. data/spec/unit/confine/feature_spec.rb +7 -5
  156. data/spec/unit/confine/true_spec.rb +5 -6
  157. data/spec/unit/confine/variable_spec.rb +14 -15
  158. data/spec/unit/confine_collection_spec.rb +28 -29
  159. data/spec/unit/confine_spec.rb +13 -14
  160. data/spec/unit/confiner_spec.rb +10 -11
  161. data/spec/unit/context/trusted_information_spec.rb +1 -1
  162. data/spec/unit/daemon_spec.rb +34 -35
  163. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  164. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  165. data/spec/unit/datatypes_spec.rb +3 -4
  166. data/spec/unit/defaults_spec.rb +17 -12
  167. data/spec/unit/environments_spec.rb +7 -7
  168. data/spec/unit/etc_spec.rb +30 -32
  169. data/spec/unit/external/pson_spec.rb +0 -1
  170. data/spec/unit/face/ca_spec.rb +0 -1
  171. data/spec/unit/face/catalog_spec.rb +0 -1
  172. data/spec/unit/face/certificate_request_spec.rb +0 -1
  173. data/spec/unit/face/certificate_revocation_list_spec.rb +0 -1
  174. data/spec/unit/face/certificate_spec.rb +7 -10
  175. data/spec/unit/face/config_spec.rb +31 -35
  176. data/spec/unit/face/epp_face_spec.rb +3 -4
  177. data/spec/unit/face/facts_spec.rb +5 -6
  178. data/spec/unit/face/generate_spec.rb +4 -5
  179. data/spec/unit/face/help_spec.rb +7 -8
  180. data/spec/unit/face/key_spec.rb +0 -1
  181. data/spec/unit/face/man_spec.rb +1 -2
  182. data/spec/unit/face/module/build_spec.rb +17 -17
  183. data/spec/unit/face/module/install_spec.rb +3 -5
  184. data/spec/unit/face/module/list_spec.rb +2 -12
  185. data/spec/unit/face/module/search_spec.rb +11 -9
  186. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  187. data/spec/unit/face/node_spec.rb +33 -34
  188. data/spec/unit/face/parser_spec.rb +3 -3
  189. data/spec/unit/face/plugin_spec.rb +36 -9
  190. data/spec/unit/face/status_spec.rb +0 -1
  191. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  192. data/spec/unit/file_bucket/file_spec.rb +0 -2
  193. data/spec/unit/file_serving/base_spec.rb +16 -17
  194. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  195. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  196. data/spec/unit/file_serving/content_spec.rb +10 -11
  197. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  198. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  199. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  200. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  201. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  202. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  203. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  204. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  205. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  206. data/spec/unit/file_serving/mount_spec.rb +0 -1
  207. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  208. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  209. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  210. data/spec/unit/file_system_spec.rb +2 -2
  211. data/spec/unit/forge/errors_spec.rb +1 -1
  212. data/spec/unit/forge/forge_spec.rb +13 -14
  213. data/spec/unit/forge/module_release_spec.rb +18 -18
  214. data/spec/unit/forge/repository_spec.rb +29 -30
  215. data/spec/unit/forge_spec.rb +15 -11
  216. data/spec/unit/functions/binary_file_spec.rb +3 -3
  217. data/spec/unit/functions/contain_spec.rb +0 -2
  218. data/spec/unit/functions/defined_spec.rb +0 -1
  219. data/spec/unit/functions/epp_spec.rb +2 -2
  220. data/spec/unit/functions/find_file_spec.rb +7 -7
  221. data/spec/unit/functions/include_spec.rb +0 -4
  222. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  223. data/spec/unit/functions/lookup_spec.rb +1 -2
  224. data/spec/unit/functions/module_directory_spec.rb +12 -12
  225. data/spec/unit/functions/require_spec.rb +0 -3
  226. data/spec/unit/functions/shared.rb +5 -8
  227. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  228. data/spec/unit/functions4_spec.rb +7 -8
  229. data/spec/unit/gettext/config_spec.rb +4 -4
  230. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  231. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  232. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  233. data/spec/unit/graph/simple_graph_spec.rb +8 -9
  234. data/spec/unit/hiera_puppet_spec.rb +20 -20
  235. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  236. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  237. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  238. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  239. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  240. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  241. data/spec/unit/indirector/certificate/ca_spec.rb +2 -4
  242. data/spec/unit/indirector/certificate/disabled_ca_spec.rb +1 -2
  243. data/spec/unit/indirector/certificate/file_spec.rb +2 -3
  244. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  245. data/spec/unit/indirector/certificate_request/ca_spec.rb +0 -1
  246. data/spec/unit/indirector/certificate_request/disabled_ca_spec.rb +1 -2
  247. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  248. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  249. data/spec/unit/indirector/certificate_revocation_list/ca_spec.rb +1 -2
  250. data/spec/unit/indirector/certificate_revocation_list/disabled_ca_spec.rb +1 -2
  251. data/spec/unit/indirector/certificate_revocation_list/file_spec.rb +1 -2
  252. data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +2 -3
  253. data/spec/unit/indirector/certificate_status/file_spec.rb +2 -3
  254. data/spec/unit/indirector/certificate_status/rest_spec.rb +0 -1
  255. data/spec/unit/indirector/code_spec.rb +5 -6
  256. data/spec/unit/indirector/direct_file_server_spec.rb +33 -27
  257. data/spec/unit/indirector/envelope_spec.rb +1 -2
  258. data/spec/unit/indirector/exec_spec.rb +15 -14
  259. data/spec/unit/indirector/face_spec.rb +9 -9
  260. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  261. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  262. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  263. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  264. data/spec/unit/indirector/facts/yaml_spec.rb +2 -4
  265. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  266. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  267. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  268. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  269. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  270. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  271. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  272. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  273. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  274. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  275. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  276. data/spec/unit/indirector/file_server_spec.rb +99 -93
  277. data/spec/unit/indirector/indirection_spec.rb +242 -226
  278. data/spec/unit/indirector/json_spec.rb +7 -9
  279. data/spec/unit/indirector/key/ca_spec.rb +2 -3
  280. data/spec/unit/indirector/key/disabled_ca_spec.rb +1 -2
  281. data/spec/unit/indirector/key/file_spec.rb +25 -26
  282. data/spec/unit/indirector/ldap_spec.rb +34 -41
  283. data/spec/unit/indirector/memory_spec.rb +6 -7
  284. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  285. data/spec/unit/indirector/node/exec_spec.rb +6 -6
  286. data/spec/unit/indirector/node/ldap_spec.rb +74 -76
  287. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  288. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  289. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  290. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  291. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  292. data/spec/unit/indirector/node/write_only_yaml_spec.rb +1 -2
  293. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  294. data/spec/unit/indirector/none_spec.rb +5 -5
  295. data/spec/unit/indirector/plain_spec.rb +7 -8
  296. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  297. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  298. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  299. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  300. data/spec/unit/indirector/request_spec.rb +11 -12
  301. data/spec/unit/indirector/resource/ral_spec.rb +47 -54
  302. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  303. data/spec/unit/indirector/rest_spec.rb +113 -110
  304. data/spec/unit/indirector/ssl_file_spec.rb +74 -77
  305. data/spec/unit/indirector/status/local_spec.rb +0 -1
  306. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  307. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  308. data/spec/unit/indirector/terminus_spec.rb +31 -29
  309. data/spec/unit/indirector/yaml_spec.rb +33 -32
  310. data/spec/unit/indirector_spec.rb +1 -2
  311. data/spec/unit/info_service_spec.rb +3 -1
  312. data/spec/unit/interface/action_builder_spec.rb +0 -1
  313. data/spec/unit/interface/action_manager_spec.rb +0 -1
  314. data/spec/unit/interface/action_spec.rb +2 -3
  315. data/spec/unit/interface/documentation_spec.rb +0 -1
  316. data/spec/unit/interface/face_collection_spec.rb +19 -12
  317. data/spec/unit/interface_spec.rb +3 -3
  318. data/spec/unit/man_spec.rb +3 -4
  319. data/spec/unit/module_spec.rb +46 -51
  320. data/spec/unit/module_tool/applications/builder_spec.rb +5 -5
  321. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  322. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  323. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  324. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  325. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  326. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  327. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  328. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  329. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  330. data/spec/unit/module_tool/tar_spec.rb +12 -13
  331. data/spec/unit/module_tool_spec.rb +7 -12
  332. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  333. data/spec/unit/network/authconfig_spec.rb +17 -18
  334. data/spec/unit/network/authorization_spec.rb +4 -5
  335. data/spec/unit/network/authstore_spec.rb +0 -1
  336. data/spec/unit/network/format_handler_spec.rb +0 -1
  337. data/spec/unit/network/format_spec.rb +9 -10
  338. data/spec/unit/network/format_support_spec.rb +28 -29
  339. data/spec/unit/network/formats_spec.rb +4 -5
  340. data/spec/unit/network/http/api/ca/v1_spec.rb +1 -1
  341. data/spec/unit/network/http/api/indirected_routes_spec.rb +22 -29
  342. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  343. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  344. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  345. data/spec/unit/network/http/api_spec.rb +1 -3
  346. data/spec/unit/network/http/compression_spec.rb +21 -22
  347. data/spec/unit/network/http/connection_spec.rb +39 -36
  348. data/spec/unit/network/http/factory_spec.rb +5 -6
  349. data/spec/unit/network/http/handler_spec.rb +9 -18
  350. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  351. data/spec/unit/network/http/pool_spec.rb +28 -29
  352. data/spec/unit/network/http/rack/rest_spec.rb +24 -27
  353. data/spec/unit/network/http/rack_spec.rb +5 -6
  354. data/spec/unit/network/http/request_spec.rb +0 -2
  355. data/spec/unit/network/http/response_spec.rb +11 -13
  356. data/spec/unit/network/http/route_spec.rb +0 -1
  357. data/spec/unit/network/http/session_spec.rb +1 -2
  358. data/spec/unit/network/http/site_spec.rb +0 -1
  359. data/spec/unit/network/http/webrick/rest_spec.rb +40 -41
  360. data/spec/unit/network/http/webrick_spec.rb +49 -52
  361. data/spec/unit/network/http_pool_spec.rb +18 -9
  362. data/spec/unit/network/http_spec.rb +0 -1
  363. data/spec/unit/network/resolver_spec.rb +16 -17
  364. data/spec/unit/network/rights_spec.rb +52 -53
  365. data/spec/unit/network/server_spec.rb +12 -13
  366. data/spec/unit/node/environment_spec.rb +16 -14
  367. data/spec/unit/node/facts_spec.rb +5 -7
  368. data/spec/unit/node_spec.rb +4 -10
  369. data/spec/unit/other/selinux_spec.rb +2 -3
  370. data/spec/unit/parameter/boolean_spec.rb +1 -2
  371. data/spec/unit/parameter/package_options_spec.rb +1 -2
  372. data/spec/unit/parameter/path_spec.rb +0 -1
  373. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  374. data/spec/unit/parameter/value_spec.rb +0 -1
  375. data/spec/unit/parameter_spec.rb +9 -9
  376. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  377. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  378. data/spec/unit/parser/compiler_spec.rb +84 -96
  379. data/spec/unit/parser/environment_compiler_spec.rb +11 -9
  380. data/spec/unit/parser/files_spec.rb +0 -1
  381. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  382. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  383. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  384. data/spec/unit/parser/functions/file_spec.rb +13 -14
  385. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  386. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  387. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  388. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  389. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  390. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  391. data/spec/unit/parser/functions/split_spec.rb +0 -1
  392. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  393. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  394. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  395. data/spec/unit/parser/functions/template_spec.rb +13 -13
  396. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  397. data/spec/unit/parser/functions_spec.rb +3 -4
  398. data/spec/unit/parser/relationship_spec.rb +0 -1
  399. data/spec/unit/parser/resource_spec.rb +42 -42
  400. data/spec/unit/parser/scope_spec.rb +39 -35
  401. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  402. data/spec/unit/parser/type_loader_spec.rb +17 -19
  403. data/spec/unit/pops/adaptable_spec.rb +0 -1
  404. data/spec/unit/pops/benchmark_spec.rb +0 -1
  405. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  406. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  407. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  408. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  409. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  410. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  411. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +6 -6
  412. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  413. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  414. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  415. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  416. data/spec/unit/pops/factory_spec.rb +3 -4
  417. data/spec/unit/pops/issues_spec.rb +19 -20
  418. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  419. data/spec/unit/pops/loaders/loaders_spec.rb +30 -27
  420. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  421. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  422. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  423. data/spec/unit/pops/migration_spec.rb +3 -5
  424. data/spec/unit/pops/model/model_spec.rb +0 -1
  425. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  426. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  427. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  428. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  429. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  430. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  431. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  432. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  433. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  434. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  435. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  436. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  437. data/spec/unit/pops/pn_spec.rb +0 -1
  438. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  439. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  440. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  441. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  442. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  443. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  444. data/spec/unit/pops/types/type_calculator_spec.rb +36 -36
  445. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  446. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  447. data/spec/unit/pops/visitor_spec.rb +0 -1
  448. data/spec/unit/property/boolean_spec.rb +1 -1
  449. data/spec/unit/property/ensure_spec.rb +0 -1
  450. data/spec/unit/property/keyvalue_spec.rb +32 -34
  451. data/spec/unit/property/list_spec.rb +26 -27
  452. data/spec/unit/property/ordered_list_spec.rb +10 -14
  453. data/spec/unit/property_spec.rb +42 -43
  454. data/spec/unit/provider/aix_object_spec.rb +47 -45
  455. data/spec/unit/provider/augeas/augeas_spec.rb +192 -192
  456. data/spec/unit/provider/cisco_spec.rb +1 -2
  457. data/spec/unit/provider/command_spec.rb +9 -9
  458. data/spec/unit/provider/cron/crontab_spec.rb +10 -11
  459. data/spec/unit/provider/cron/parsed_spec.rb +22 -24
  460. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  461. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  462. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  463. data/spec/unit/provider/exec_spec.rb +0 -1
  464. data/spec/unit/provider/file/posix_spec.rb +22 -24
  465. data/spec/unit/provider/file/windows_spec.rb +15 -17
  466. data/spec/unit/provider/group/aix_spec.rb +3 -2
  467. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  468. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  469. data/spec/unit/provider/group/pw_spec.rb +11 -11
  470. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  471. data/spec/unit/provider/host/parsed_spec.rb +6 -6
  472. data/spec/unit/provider/interface/cisco_spec.rb +20 -24
  473. data/spec/unit/provider/ldap_spec.rb +61 -62
  474. data/spec/unit/provider/macauthorization_spec.rb +26 -47
  475. data/spec/unit/provider/mcx/mcxcontent_spec.rb +45 -47
  476. data/spec/unit/provider/mount/parsed_spec.rb +18 -24
  477. data/spec/unit/provider/mount_spec.rb +57 -66
  478. data/spec/unit/provider/naginator_spec.rb +13 -14
  479. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  480. data/spec/unit/provider/nameservice_spec.rb +38 -40
  481. data/spec/unit/provider/network_device_spec.rb +28 -28
  482. data/spec/unit/provider/package/aix_spec.rb +15 -15
  483. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  484. data/spec/unit/provider/package/apt_spec.rb +44 -27
  485. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  486. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  487. data/spec/unit/provider/package/base_spec.rb +4 -4
  488. data/spec/unit/provider/package/dnf_spec.rb +14 -16
  489. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  490. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  491. data/spec/unit/provider/package/gem_spec.rb +51 -43
  492. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  493. data/spec/unit/provider/package/macports_spec.rb +46 -42
  494. data/spec/unit/provider/package/nim_spec.rb +30 -39
  495. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  496. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  497. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  498. data/spec/unit/provider/package/pip_spec.rb +69 -71
  499. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  500. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  501. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  502. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  503. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  504. data/spec/unit/provider/package/portage_spec.rb +70 -74
  505. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  506. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  507. data/spec/unit/provider/package/sun_spec.rb +16 -18
  508. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  509. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  510. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  511. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  512. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  513. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  514. data/spec/unit/provider/package/windows_spec.rb +36 -32
  515. data/spec/unit/provider/package/yum_spec.rb +4 -4
  516. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  517. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  518. data/spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb +120 -130
  519. data/spec/unit/provider/selboolean_spec.rb +9 -11
  520. data/spec/unit/provider/selmodule_spec.rb +20 -22
  521. data/spec/unit/provider/service/base_spec.rb +4 -5
  522. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  523. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  524. data/spec/unit/provider/service/debian_spec.rb +37 -37
  525. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  526. data/spec/unit/provider/service/gentoo_spec.rb +50 -56
  527. data/spec/unit/provider/service/init_spec.rb +55 -55
  528. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  529. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  530. data/spec/unit/provider/service/openrc_spec.rb +43 -46
  531. data/spec/unit/provider/service/openwrt_spec.rb +26 -32
  532. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  533. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  534. data/spec/unit/provider/service/runit_spec.rb +29 -27
  535. data/spec/unit/provider/service/smf_spec.rb +74 -66
  536. data/spec/unit/provider/service/src_spec.rb +46 -47
  537. data/spec/unit/provider/service/systemd_spec.rb +93 -98
  538. data/spec/unit/provider/service/upstart_spec.rb +74 -72
  539. data/spec/unit/provider/service/windows_spec.rb +33 -41
  540. data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +54 -68
  541. data/spec/unit/provider/sshkey/parsed_spec.rb +7 -8
  542. data/spec/unit/provider/user/aix_spec.rb +31 -31
  543. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  544. data/spec/unit/provider/user/hpux_spec.rb +15 -15
  545. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  546. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  547. data/spec/unit/provider/user/pw_spec.rb +37 -35
  548. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  549. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  550. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  551. data/spec/unit/provider/vlan/cisco_spec.rb +10 -12
  552. data/spec/unit/provider/yumrepo/inifile_spec.rb +75 -80
  553. data/spec/unit/provider/zfs/zfs_spec.rb +26 -21
  554. data/spec/unit/provider/zone/solaris_spec.rb +56 -42
  555. data/spec/unit/provider/zpool/zpool_spec.rb +19 -20
  556. data/spec/unit/provider_spec.rb +29 -29
  557. data/spec/unit/puppet_pal_2pec.rb +4 -5
  558. data/spec/unit/puppet_pal_spec.rb +0 -1
  559. data/spec/unit/puppet_spec.rb +7 -8
  560. data/spec/unit/relationship_spec.rb +0 -1
  561. data/spec/unit/reports/http_spec.rb +21 -23
  562. data/spec/unit/reports/store_spec.rb +3 -4
  563. data/spec/unit/reports_spec.rb +12 -14
  564. data/spec/unit/resource/capability_finder_spec.rb +18 -16
  565. data/spec/unit/resource/catalog_spec.rb +72 -68
  566. data/spec/unit/resource/status_spec.rb +6 -8
  567. data/spec/unit/resource/type_collection_spec.rb +17 -18
  568. data/spec/unit/resource/type_spec.rb +34 -35
  569. data/spec/unit/resource_spec.rb +36 -32
  570. data/spec/unit/scheduler/job_spec.rb +0 -1
  571. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  572. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  573. data/spec/unit/settings/array_setting_spec.rb +1 -1
  574. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  575. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  576. data/spec/unit/settings/config_file_spec.rb +0 -1
  577. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  578. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  579. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  580. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  581. data/spec/unit/settings/file_setting_spec.rb +44 -46
  582. data/spec/unit/settings/path_setting_spec.rb +1 -2
  583. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  584. data/spec/unit/settings/string_setting_spec.rb +14 -15
  585. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  586. data/spec/unit/settings/value_translator_spec.rb +0 -1
  587. data/spec/unit/settings_spec.rb +226 -233
  588. data/spec/unit/ssl/base_spec.rb +14 -15
  589. data/spec/unit/ssl/certificate_authority/autosign_command_spec.rb +6 -7
  590. data/spec/unit/ssl/certificate_authority/interface_spec.rb +116 -113
  591. data/spec/unit/ssl/certificate_authority_spec.rb +258 -268
  592. data/spec/unit/ssl/certificate_factory_spec.rb +3 -5
  593. data/spec/unit/ssl/certificate_request_attributes_spec.rb +2 -3
  594. data/spec/unit/ssl/certificate_request_spec.rb +66 -67
  595. data/spec/unit/ssl/certificate_revocation_list_spec.rb +3 -4
  596. data/spec/unit/ssl/certificate_spec.rb +23 -25
  597. data/spec/unit/ssl/configuration_spec.rb +1 -4
  598. data/spec/unit/ssl/digest_spec.rb +0 -1
  599. data/spec/unit/ssl/host_spec.rb +217 -188
  600. data/spec/unit/ssl/inventory_spec.rb +25 -21
  601. data/spec/unit/ssl/key_spec.rb +30 -31
  602. data/spec/unit/ssl/validator_spec.rb +40 -40
  603. data/spec/unit/task_spec.rb +6 -7
  604. data/spec/unit/transaction/additional_resource_generator_spec.rb +6 -5
  605. data/spec/unit/transaction/event_manager_spec.rb +88 -88
  606. data/spec/unit/transaction/event_spec.rb +16 -15
  607. data/spec/unit/transaction/persistence_spec.rb +16 -17
  608. data/spec/unit/transaction/report_spec.rb +11 -12
  609. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  610. data/spec/unit/transaction_spec.rb +98 -100
  611. data/spec/unit/type/augeas_spec.rb +11 -10
  612. data/spec/unit/type/component_spec.rb +0 -1
  613. data/spec/unit/type/computer_spec.rb +7 -10
  614. data/spec/unit/type/cron_spec.rb +3 -7
  615. data/spec/unit/type/exec_spec.rb +60 -56
  616. data/spec/unit/type/file/checksum_spec.rb +9 -10
  617. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  618. data/spec/unit/type/file/content_spec.rb +58 -61
  619. data/spec/unit/type/file/ctime_spec.rb +0 -1
  620. data/spec/unit/type/file/ensure_spec.rb +12 -13
  621. data/spec/unit/type/file/group_spec.rb +5 -7
  622. data/spec/unit/type/file/mode_spec.rb +4 -6
  623. data/spec/unit/type/file/mtime_spec.rb +0 -1
  624. data/spec/unit/type/file/owner_spec.rb +6 -8
  625. data/spec/unit/type/file/selinux_spec.rb +17 -19
  626. data/spec/unit/type/file/source_spec.rb +104 -101
  627. data/spec/unit/type/file/type_spec.rb +0 -1
  628. data/spec/unit/type/file_spec.rb +195 -185
  629. data/spec/unit/type/filebucket_spec.rb +4 -5
  630. data/spec/unit/type/group_spec.rb +6 -8
  631. data/spec/unit/type/host_spec.rb +2 -3
  632. data/spec/unit/type/interface_spec.rb +2 -3
  633. data/spec/unit/type/k5login_spec.rb +3 -4
  634. data/spec/unit/type/macauthorization_spec.rb +6 -8
  635. data/spec/unit/type/mailalias_spec.rb +2 -3
  636. data/spec/unit/type/maillist_spec.rb +6 -9
  637. data/spec/unit/type/mcx_spec.rb +4 -8
  638. data/spec/unit/type/mount_spec.rb +26 -38
  639. data/spec/unit/type/nagios_spec.rb +0 -1
  640. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  641. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  642. data/spec/unit/type/package_spec.rb +53 -54
  643. data/spec/unit/type/resources_spec.rb +86 -88
  644. data/spec/unit/type/schedule_spec.rb +24 -26
  645. data/spec/unit/type/scheduled_task_spec.rb +1 -2
  646. data/spec/unit/type/selboolean_spec.rb +5 -6
  647. data/spec/unit/type/selmodule_spec.rb +0 -1
  648. data/spec/unit/type/service_spec.rb +47 -47
  649. data/spec/unit/type/ssh_authorized_key_spec.rb +5 -35
  650. data/spec/unit/type/sshkey_spec.rb +0 -2
  651. data/spec/unit/type/stage_spec.rb +0 -1
  652. data/spec/unit/type/tidy_spec.rb +61 -62
  653. data/spec/unit/type/user_spec.rb +41 -27
  654. data/spec/unit/type/vlan_spec.rb +2 -4
  655. data/spec/unit/type/whit_spec.rb +0 -1
  656. data/spec/unit/type/zfs_spec.rb +6 -7
  657. data/spec/unit/type/zone_spec.rb +14 -4
  658. data/spec/unit/type/zpool_spec.rb +4 -5
  659. data/spec/unit/type_spec.rb +54 -53
  660. data/spec/unit/util/at_fork_spec.rb +18 -19
  661. data/spec/unit/util/autoload_spec.rb +53 -54
  662. data/spec/unit/util/backups_spec.rb +34 -35
  663. data/spec/unit/util/character_encoding_spec.rb +8 -8
  664. data/spec/unit/util/checksums_spec.rb +38 -39
  665. data/spec/unit/util/colors_spec.rb +1 -2
  666. data/spec/unit/util/command_line_spec.rb +24 -25
  667. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  668. data/spec/unit/util/diff_spec.rb +7 -8
  669. data/spec/unit/util/errors_spec.rb +0 -1
  670. data/spec/unit/util/execution_spec.rb +187 -162
  671. data/spec/unit/util/execution_stub_spec.rb +0 -1
  672. data/spec/unit/util/feature_spec.rb +13 -13
  673. data/spec/unit/util/filetype_spec.rb +49 -49
  674. data/spec/unit/util/http_proxy_spec.rb +12 -12
  675. data/spec/unit/util/inifile_spec.rb +26 -31
  676. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  677. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  678. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  679. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  680. data/spec/unit/util/lockfile_spec.rb +0 -1
  681. data/spec/unit/util/log/destinations_spec.rb +30 -33
  682. data/spec/unit/util/log_spec.rb +35 -36
  683. data/spec/unit/util/logging_spec.rb +58 -66
  684. data/spec/unit/util/metric_spec.rb +0 -1
  685. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  686. data/spec/unit/util/multi_match_spec.rb +0 -1
  687. data/spec/unit/util/nagios_maker_spec.rb +35 -36
  688. data/spec/unit/util/network_device/cisco/device_spec.rb +59 -50
  689. data/spec/unit/util/network_device/cisco/facts_spec.rb +4 -5
  690. data/spec/unit/util/network_device/cisco/interface_spec.rb +29 -20
  691. data/spec/unit/util/network_device/config_spec.rb +0 -1
  692. data/spec/unit/util/network_device/ipcalc_spec.rb +0 -1
  693. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  694. data/spec/unit/util/network_device/transport/ssh_spec.rb +94 -60
  695. data/spec/unit/util/network_device/transport/telnet_spec.rb +18 -14
  696. data/spec/unit/util/network_device_spec.rb +7 -9
  697. data/spec/unit/util/package_spec.rb +0 -1
  698. data/spec/unit/util/pidlock_spec.rb +13 -14
  699. data/spec/unit/util/plist_spec.rb +40 -33
  700. data/spec/unit/util/posix_spec.rb +54 -51
  701. data/spec/unit/util/rdoc_spec.rb +9 -10
  702. data/spec/unit/util/reference_spec.rb +0 -1
  703. data/spec/unit/util/resource_template_spec.rb +20 -20
  704. data/spec/unit/util/retry_action_spec.rb +7 -8
  705. data/spec/unit/util/rubygems_spec.rb +14 -14
  706. data/spec/unit/util/run_mode_spec.rb +3 -4
  707. data/spec/unit/util/selinux_spec.rb +79 -72
  708. data/spec/unit/util/splayer_spec.rb +8 -9
  709. data/spec/unit/util/ssl_spec.rb +0 -1
  710. data/spec/unit/util/storage_spec.rb +3 -4
  711. data/spec/unit/util/suidmanager_spec.rb +45 -54
  712. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  713. data/spec/unit/util/tag_set_spec.rb +0 -1
  714. data/spec/unit/util/tagging_spec.rb +0 -1
  715. data/spec/unit/util/terminal_spec.rb +9 -10
  716. data/spec/unit/util/user_attr_spec.rb +1 -2
  717. data/spec/unit/util/warnings_spec.rb +3 -4
  718. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  719. data/spec/unit/util/watcher_spec.rb +51 -21
  720. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  721. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  722. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  723. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  724. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  725. data/spec/unit/util/windows/file_spec.rb +0 -1
  726. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  727. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  728. data/spec/unit/util/windows/service_spec.rb +66 -68
  729. data/spec/unit/util/windows/sid_spec.rb +11 -13
  730. data/spec/unit/util/windows/string_spec.rb +0 -1
  731. data/spec/unit/util_spec.rb +55 -59
  732. data/spec/unit/version_spec.rb +6 -6
  733. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/network/formats'
@@ -102,14 +101,14 @@ describe "Puppet Network Format" do
102
101
  end
103
102
 
104
103
  it "should render by calling 'to_yaml' on the instance" do
105
- instance = mock 'instance'
106
- instance.expects(:to_yaml).returns "foo"
104
+ instance = double('instance')
105
+ expect(instance).to receive(:to_yaml).and_return("foo")
107
106
  expect(yaml.render(instance)).to eq("foo")
108
107
  end
109
108
 
110
109
  it "should render multiple instances by calling 'to_yaml' on the array" do
111
- instances = [mock('instance')]
112
- instances.expects(:to_yaml).returns "foo"
110
+ instances = [double('instance')]
111
+ expect(instances).to receive(:to_yaml).and_return("foo")
113
112
  expect(yaml.render_multiple(instances)).to eq("foo")
114
113
  end
115
114
 
@@ -14,7 +14,7 @@ describe Puppet::Network::HTTP::API::CA::V1 do
14
14
  }
15
15
 
16
16
  it "mounts ca routes" do
17
- Puppet::SSL::Certificate.indirection.stubs(:find).returns "foo"
17
+ allow(Puppet::SSL::Certificate.indirection).to receive(:find).and_return("foo")
18
18
  request = Puppet::Network::HTTP::Request.
19
19
  from_hash(:path => "#{ca_url_prefix}/certificate/foo",
20
20
  :params => {:environment => "production"},
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/network/http'
@@ -16,7 +15,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
16
15
  before do
17
16
  Puppet::IndirectorTesting.indirection.terminus_class = :memory
18
17
  Puppet::IndirectorTesting.indirection.terminus.clear
19
- handler.stubs(:warn_if_near_expiration)
18
+ allow(handler).to receive(:warn_if_near_expiration)
20
19
  end
21
20
 
22
21
  describe "when converting a URI into a request" do
@@ -25,7 +24,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
25
24
  let(:params) { { :environment => "env" } }
26
25
 
27
26
  before do
28
- handler.stubs(:handler).returns "foo"
27
+ allow(handler).to receive(:handler).and_return("foo")
29
28
  end
30
29
 
31
30
  around do |example|
@@ -139,28 +138,22 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
139
138
  it "should not unescape the URI passed through in a call to check_authorization" do
140
139
  key_escaped = Puppet::Util.uri_encode("foo bar")
141
140
  uri_escaped = "#{master_url_prefix}/node/#{key_escaped}"
142
- handler.expects(:check_authorization).with(anything, uri_escaped, anything)
143
- _, _, _, _ = handler.uri2indirection("GET", uri_escaped, params)
141
+ expect(handler).to receive(:check_authorization).with(anything, uri_escaped, anything)
142
+ handler.uri2indirection("GET", uri_escaped, params)
144
143
  end
145
144
 
146
145
  it "should not pass through an environment to check_authorization and fail if the environment is unknown" do
147
- handler.expects(:check_authorization).with(anything,
148
- anything,
149
- Not(has_entry(:environment)))
146
+ expect(handler).to receive(:check_authorization) do |_, _, arg|
147
+ expect(arg).not_to include(:environment)
148
+ end
150
149
  expect(lambda { handler.uri2indirection("GET",
151
150
  "#{master_url_prefix}/node/bar",
152
151
  {:environment => 'bogus'}) }).to raise_error(not_found_error)
153
152
  end
154
153
 
155
154
  it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
156
- handler.expects(:check_authorization).with(anything,
157
- anything,
158
- all_of(
159
- has_entry(:environment,
160
- is_a(Puppet::Node::Environment)),
161
- has_entry(:environment,
162
- responds_with(:name,
163
- :env))))
155
+ expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
156
+
164
157
  handler.uri2indirection("GET", "#{master_url_prefix}/node/bar", params)
165
158
  end
166
159
 
@@ -171,7 +164,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
171
164
  let(:request) { Puppet::Indirector::Request.new(:foo, :find, "with spaces", nil, :foo => :bar, :environment => environment) }
172
165
 
173
166
  before do
174
- handler.stubs(:handler).returns "foo"
167
+ allow(handler).to receive(:handler).and_return("foo")
175
168
  end
176
169
 
177
170
  it "should include the environment in the query string of the URI" do
@@ -179,17 +172,17 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
179
172
  end
180
173
 
181
174
  it "should include the correct url prefix if it is a ca request" do
182
- request.stubs(:indirection_name).returns("certificate")
175
+ allow(request).to receive(:indirection_name).and_return("certificate")
183
176
  expect(handler.class.request_to_uri(request)).to eq("#{ca_url_prefix}/certificate/with%20spaces?environment=myenv&foo=bar")
184
177
  end
185
178
 
186
179
  it "should pluralize the indirection name if the method is 'search'" do
187
- request.stubs(:method).returns :search
180
+ allow(request).to receive(:method).and_return(:search)
188
181
  expect(handler.class.request_to_uri(request).split("/")[3]).to eq("foos")
189
182
  end
190
183
 
191
184
  it "should add the query string to the URI" do
192
- request.expects(:query_string).returns "query"
185
+ expect(request).to receive(:query_string).and_return("query")
193
186
  expect(handler.class.request_to_uri(request)).to match(/\&query$/)
194
187
  end
195
188
  end
@@ -212,7 +205,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
212
205
  end
213
206
 
214
207
  it "should include the correct url prefix if it is a ca request" do
215
- request.stubs(:indirection_name).returns("certificate")
208
+ allow(request).to receive(:indirection_name).and_return("certificate")
216
209
  expect(handler.class.request_to_uri_and_body(request).first).to eq("#{ca_url_prefix}/certificate/with%20spaces")
217
210
  end
218
211
 
@@ -227,7 +220,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
227
220
  indirection.save(data, "my data")
228
221
  request = a_request_that_heads(data)
229
222
 
230
- handler.expects(:check_authorization).raises(Puppet::Network::AuthorizationError.new("forbidden"))
223
+ expect(handler).to receive(:check_authorization).and_raise(Puppet::Network::AuthorizationError.new("forbidden"))
231
224
 
232
225
  expect {
233
226
  handler.call(request, response)
@@ -237,7 +230,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
237
230
  it "should raise not_found_error if the indirection does not support remote requests" do
238
231
  request = a_request_that_heads(Puppet::IndirectorTesting.new("my data"))
239
232
 
240
- indirection.expects(:allow_remote_requests?).returns(false)
233
+ expect(indirection).to receive(:allow_remote_requests?).and_return(false)
241
234
 
242
235
  expect {
243
236
  handler.call(request, response)
@@ -271,7 +264,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
271
264
  data = Puppet::IndirectorTesting.new("my data")
272
265
  indirection.save(data, "my data")
273
266
  request = a_request_that_finds(data, :accept_header => "application/json, text/pson")
274
- data.stubs(:to_json).raises(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[json]: source sequence is illegal/malformed utf-8')
267
+ allow(data).to receive(:to_json).and_raise(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[json]: source sequence is illegal/malformed utf-8')
275
268
 
276
269
  handler.call(request, response)
277
270
 
@@ -283,7 +276,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
283
276
  data = Puppet::IndirectorTesting.new("my data")
284
277
  data_string = "my data string"
285
278
  request = a_request_that_finds(data, :accept_header => "application/json")
286
- indirection.expects(:find).returns(data_string)
279
+ expect(indirection).to receive(:find).and_return(data_string)
287
280
 
288
281
  handler.call(request, response)
289
282
 
@@ -317,7 +310,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
317
310
  data = Puppet::IndirectorTesting.new("my data")
318
311
  indirection.save(data, "my data")
319
312
  request = a_request_that_searches(Puppet::IndirectorTesting.new("my"), :accept_header => "application/json, text/pson")
320
- data.stubs(:to_json).raises(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[json]: source sequence is illegal/malformed utf-8')
313
+ allow(data).to receive(:to_json).and_raise(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[json]: source sequence is illegal/malformed utf-8')
321
314
 
322
315
  handler.call(request, response)
323
316
 
@@ -329,8 +322,8 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
329
322
  data = Puppet::IndirectorTesting.new("my data")
330
323
  indirection.save(data, "my data")
331
324
  request = a_request_that_searches(Puppet::IndirectorTesting.new("my"), :accept_header => "application/json, text/pson")
332
- data.stubs(:to_json).raises(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[json]: source sequence is illegal/malformed utf-8')
333
- data.stubs(:to_pson).raises(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[pson]: source sequence is illegal/malformed utf-8')
325
+ allow(data).to receive(:to_json).and_raise(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[json]: source sequence is illegal/malformed utf-8')
326
+ allow(data).to receive(:to_pson).and_raise(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[pson]: source sequence is illegal/malformed utf-8')
334
327
 
335
328
  expect {
336
329
  handler.call(request, response)
@@ -348,7 +341,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
348
341
 
349
342
  it "should raise not_found_error when searching returns nil" do
350
343
  request = a_request_that_searches(Puppet::IndirectorTesting.new("nothing"), :accept_header => "unknown, application/json")
351
- indirection.expects(:search).returns(nil)
344
+ expect(indirection).to receive(:search).and_return(nil)
352
345
 
353
346
  expect {
354
347
  handler.call(request, response)
@@ -19,7 +19,7 @@ describe Puppet::Network::HTTP::API::Master::V3::Authorization do
19
19
  :params => { :authenticated => true, :node => "testing", :ip => "127.0.0.1" }
20
20
  })
21
21
 
22
- authz.stubs(:authconfig).returns(Puppet::Network::AuthConfigParser.new(<<-AUTH).parse)
22
+ allow(authz).to receive(:authconfig).and_return(Puppet::Network::AuthConfigParser.new(<<-AUTH).parse)
23
23
  path /v3/environments
24
24
  method find
25
25
  allow *
@@ -41,7 +41,7 @@ allow *
41
41
  :params => { :authenticated => true, :node => "testing", :ip => "127.0.0.1" }
42
42
  })
43
43
 
44
- authz.stubs(:authconfig).returns(Puppet::Network::AuthConfigParser.new(<<-AUTH).parse)
44
+ allow(authz).to receive(:authconfig).and_return(Puppet::Network::AuthConfigParser.new(<<-AUTH).parse)
45
45
  path /v3/environments
46
46
  method find
47
47
  auth any
@@ -176,7 +176,7 @@ describe Puppet::Network::HTTP::API::Master::V3::Environment do
176
176
  it "uses code_id from the catalog if it differs from the request" do
177
177
  request = Puppet::Network::HTTP::Request.from_hash(:params => {:code_id => '12345'}, :routing_path => "environment/production")
178
178
 
179
- Puppet::Resource::Catalog.any_instance.stubs(:code_id).returns('67890')
179
+ allow_any_instance_of(Puppet::Resource::Catalog).to receive(:code_id).and_return('67890')
180
180
 
181
181
  subject.call(request, response)
182
182
 
@@ -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'
@@ -104,7 +102,7 @@ describe Puppet::Network::HTTP::API do
104
102
 
105
103
  describe "when processing CA routes" do
106
104
  it "responds to v1 indirector requests" do
107
- Puppet::SSL::Certificate.indirection.stubs(:find).returns "foo"
105
+ allow(Puppet::SSL::Certificate.indirection).to receive(:find).and_return("foo")
108
106
  req = Puppet::Network::HTTP::Request.from_hash(:path => "#{ca_prefix}/v1/certificate/foo",
109
107
  :params => {:environment => "production"},
110
108
  :headers => {'accept' => "s"})
@@ -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
@@ -13,13 +12,13 @@ describe "http compression" do
13
12
  end
14
13
 
15
14
  def stubs_response_with(response, content_encoding, body)
16
- response.stubs(:[]).with('content-encoding').returns(content_encoding)
17
- response.stubs(:body).returns(body)
15
+ allow(response).to receive(:[]).with('content-encoding').and_return(content_encoding)
16
+ allow(response).to receive(:body).and_return(body)
18
17
  end
19
18
 
20
19
  describe "when zlib is not available" do
21
20
  before(:each) do
22
- Puppet.features.stubs(:zlib?).returns false
21
+ allow(Puppet.features).to receive(:zlib?).and_return(false)
23
22
 
24
23
  require 'puppet/network/http/compression'
25
24
  class HttpUncompressor
@@ -38,12 +37,12 @@ describe "http compression" do
38
37
  end
39
38
 
40
39
  it "should not tamper the body" do
41
- response = stub 'response', :body => data
40
+ response = double('response', :body => data)
42
41
  expect(@uncompressor.uncompress_body(response)).to eq(data)
43
42
  end
44
43
 
45
44
  it "should yield an identity uncompressor" do
46
- response = stub 'response'
45
+ response = double('response')
47
46
  @uncompressor.uncompress(response) { |u|
48
47
  expect(u).to be_instance_of(Puppet::Network::HTTP::Compression::IdentityAdapter)
49
48
  }
@@ -166,19 +165,19 @@ describe "http compression" do
166
165
 
167
166
  it "should close the underlying adapter" do
168
167
  stubs_response_with(response, 'identity', data)
169
- adapter = stub_everything 'adapter'
170
- Puppet::Network::HTTP::Compression::IdentityAdapter.expects(:new).returns(adapter)
168
+ adapter = double('adapter')
169
+ expect(Puppet::Network::HTTP::Compression::IdentityAdapter).to receive(:new).and_return(adapter)
171
170
 
172
- adapter.expects(:close)
171
+ expect(adapter).to receive(:close)
173
172
  uncompressor.uncompress(response) { |u| }
174
173
  end
175
174
 
176
175
  it "should close the underlying adapter if the yielded block raises" do
177
176
  stubs_response_with(response, 'identity', data)
178
- adapter = stub_everything 'adapter'
179
- Puppet::Network::HTTP::Compression::IdentityAdapter.expects(:new).returns(adapter)
177
+ adapter = double('adapter')
178
+ expect(Puppet::Network::HTTP::Compression::IdentityAdapter).to receive(:new).and_return(adapter)
180
179
 
181
- adapter.expects(:close)
180
+ expect(adapter).to receive(:close)
182
181
  expect {
183
182
  uncompressor.uncompress(response) { |u| raise ArgumentError, "whoops" }
184
183
  }.to raise_error(ArgumentError, "whoops")
@@ -187,7 +186,7 @@ describe "http compression" do
187
186
 
188
187
  describe "zlib adapter" do
189
188
  it "should initialize the underlying inflater with gzip/zlib header parsing" do
190
- Zlib::Inflate.expects(:new).with(15+32)
189
+ expect(Zlib::Inflate).to receive(:new).with(15 + 32)
191
190
 
192
191
  Puppet::Network::HTTP::Compression::Active::ZlibAdapter.new
193
192
  end
@@ -200,7 +199,7 @@ describe "http compression" do
200
199
 
201
200
  it "should try a 'regular' inflater on Zlib::DataError" do
202
201
  inflater = Zlib::Inflate.new(15 + 32)
203
- inflater.expects(:inflate).raises(Zlib::DataError.new("not a zlib stream"))
202
+ expect(inflater).to receive(:inflate).and_raise(Zlib::DataError.new("not a zlib stream"))
204
203
  adapter = Puppet::Network::HTTP::Compression::Active::ZlibAdapter.new(inflater)
205
204
 
206
205
  expect(adapter.uncompress(compressed_zlib)).to eq(data)
@@ -208,25 +207,25 @@ describe "http compression" do
208
207
 
209
208
  it "should raise the error the second time" do
210
209
  inflater = Zlib::Inflate.new(15 + 32)
211
- inflater.expects(:inflate).raises(Zlib::DataError.new("not a zlib stream"))
210
+ expect(inflater).to receive(:inflate).and_raise(Zlib::DataError.new("not a zlib stream"))
212
211
  adapter = Puppet::Network::HTTP::Compression::Active::ZlibAdapter.new(inflater)
213
212
 
214
213
  expect { adapter.uncompress("this is not compressed data") }.to raise_error(Zlib::DataError, /incorrect header check/)
215
214
  end
216
215
 
217
216
  it "should finish and close the stream" do
218
- inflater = stub 'inflater'
219
- inflater.expects(:finish)
220
- inflater.expects(:close)
217
+ inflater = double('inflater')
218
+ expect(inflater).to receive(:finish)
219
+ expect(inflater).to receive(:close)
221
220
  adapter = Puppet::Network::HTTP::Compression::Active::ZlibAdapter.new(inflater)
222
221
 
223
222
  adapter.close
224
223
  end
225
224
 
226
225
  it "should close the stream even if finish raises" do
227
- inflater = stub 'inflater'
228
- inflater.expects(:finish).raises(Zlib::BufError)
229
- inflater.expects(:close)
226
+ inflater = double('inflater')
227
+ expect(inflater).to receive(:finish).and_raise(Zlib::BufError)
228
+ expect(inflater).to receive(:close)
230
229
 
231
230
  adapter = Puppet::Network::HTTP::Compression::Active::ZlibAdapter.new(inflater)
232
231
  expect {
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/network/http/connection'
4
3
 
@@ -70,7 +69,6 @@ describe Puppet::Network::HTTP::Connection do
70
69
  end
71
70
 
72
71
  def setup_connection(connection)
73
- connection.stubs(:start).raises(OpenSSL::SSL::SSLError.new(@fails_with))
74
72
  end
75
73
 
76
74
  def peer_certs
@@ -113,6 +111,12 @@ describe Puppet::Network::HTTP::Connection do
113
111
  WebMock.enable!
114
112
  end
115
113
 
114
+ before(:each) do
115
+ allow_any_instance_of(ConstantErrorValidator).to receive(:setup_connection) do |cev, connection|
116
+ allow(connection).to receive(:start).and_raise(OpenSSL::SSL::SSLError.new(cev.instance_variable_get(:@fails_with)))
117
+ end
118
+ end
119
+
116
120
  it "should provide a useful error message when one is available and certificate validation fails", :unless => Puppet.features.microsoft_windows? do
117
121
  connection = Puppet::Network::HTTP::Connection.new(
118
122
  host, port,
@@ -161,9 +165,9 @@ describe Puppet::Network::HTTP::Connection do
161
165
  host, port,
162
166
  :verify => NoProblemsValidator.new(cert))
163
167
 
164
- Net::HTTP.any_instance.stubs(:start)
165
- Net::HTTP.any_instance.stubs(:request).returns(httpok)
166
- Puppet::Network::HTTP::Pool.any_instance.stubs(:setsockopts)
168
+ allow_any_instance_of(Net::HTTP).to receive(:start)
169
+ allow_any_instance_of(Net::HTTP).to receive(:request).and_return(httpok)
170
+ allow_any_instance_of(Puppet::Network::HTTP::Pool).to receive(:setsockopts)
167
171
 
168
172
  connection.get('request')
169
173
  end
@@ -196,7 +200,7 @@ describe Puppet::Network::HTTP::Connection do
196
200
  let (:httpredirection) do
197
201
  response = Net::HTTPFound.new('1.1', 302, 'Moved Temporarily')
198
202
  response['location'] = "#{other_site.addr}/#{other_path}"
199
- response.stubs(:read_body).returns("This resource has moved")
203
+ allow(response).to receive(:read_body).and_return("This resource has moved")
200
204
  response
201
205
  end
202
206
 
@@ -206,24 +210,23 @@ describe Puppet::Network::HTTP::Connection do
206
210
  end
207
211
 
208
212
  it "should redirect to the final resource location" do
209
- http = stub('http')
210
- http.stubs(:request).returns(httpredirection).then.returns(httpok)
213
+ http = double('http')
214
+ allow(http).to receive(:request).and_return(httpredirection, httpok)
211
215
 
212
- seq = sequence('redirection')
213
216
  pool = Puppet.lookup(:http_pool)
214
- pool.expects(:with_connection).with(site, anything).yields(http).in_sequence(seq)
215
- pool.expects(:with_connection).with(other_site, anything).yields(http).in_sequence(seq)
217
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http).ordered
218
+ expect(pool).to receive(:with_connection).with(other_site, anything).and_yield(http).ordered
216
219
 
217
220
  conn = create_connection(site, :verify => verify)
218
221
  conn.get('/foo')
219
222
  end
220
223
 
221
224
  def expects_redirection(conn, &block)
222
- http = stub('http')
223
- http.stubs(:request).returns(httpredirection)
225
+ http = double('http')
226
+ allow(http).to receive(:request).and_return(httpredirection)
224
227
 
225
228
  pool = Puppet.lookup(:http_pool)
226
- pool.expects(:with_connection).with(site, anything).yields(http)
229
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http)
227
230
  pool
228
231
  end
229
232
 
@@ -237,7 +240,7 @@ describe Puppet::Network::HTTP::Connection do
237
240
  conn = create_connection(site, :verify => verify, :redirect_limit => 0)
238
241
 
239
242
  pool = expects_redirection(conn)
240
- pool.expects(:with_connection).with(other_site, anything).never
243
+ expect(pool).not_to receive(:with_connection).with(other_site, anything)
241
244
 
242
245
  expects_limit_exceeded(conn)
243
246
  end
@@ -246,7 +249,7 @@ describe Puppet::Network::HTTP::Connection do
246
249
  conn = create_connection(site, :verify => verify, :redirect_limit => 1)
247
250
 
248
251
  pool = expects_redirection(conn)
249
- pool.expects(:with_connection).with(other_site, anything).once
252
+ expect(pool).to receive(:with_connection).with(other_site, anything).once
250
253
 
251
254
  expects_limit_exceeded(conn)
252
255
  end
@@ -255,14 +258,14 @@ describe Puppet::Network::HTTP::Connection do
255
258
  conn = create_connection(site, :verify => verify, :redirect_limit => 3)
256
259
 
257
260
  pool = expects_redirection(conn)
258
- pool.expects(:with_connection).with(other_site, anything).times(3)
261
+ expect(pool).to receive(:with_connection).with(other_site, anything).exactly(3).times
259
262
 
260
263
  expects_limit_exceeded(conn)
261
264
  end
262
265
  end
263
266
 
264
267
  context "when response indicates an overloaded server" do
265
- let(:http) { stub('http') }
268
+ let(:http) { double('http') }
266
269
  let(:site) { Puppet::Network::HTTP::Site.new('http', 'my_server', 8140) }
267
270
  let(:verify) { Puppet::SSL::Validator.no_validator }
268
271
  let(:httpunavailable) { Net::HTTPServiceUnavailable.new('1.1', 503, 'Service Unavailable') }
@@ -281,10 +284,10 @@ describe Puppet::Network::HTTP::Connection do
281
284
  end
282
285
 
283
286
  it "should return a 503 response if Retry-After is not set" do
284
- http.stubs(:request).returns(httpunavailable)
287
+ allow(http).to receive(:request).and_return(httpunavailable)
285
288
 
286
289
  pool = Puppet.lookup(:http_pool)
287
- pool.expects(:with_connection).with(site, anything).yields(http)
290
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http)
288
291
 
289
292
  result = subject.get('/foo')
290
293
 
@@ -293,10 +296,10 @@ describe Puppet::Network::HTTP::Connection do
293
296
 
294
297
  it "should return a 503 response if Retry-After is not convertible to an Integer or RFC 2822 Date" do
295
298
  httpunavailable['Retry-After'] = 'foo'
296
- http.stubs(:request).returns(httpunavailable)
299
+ allow(http).to receive(:request).and_return(httpunavailable)
297
300
 
298
301
  pool = Puppet.lookup(:http_pool)
299
- pool.expects(:with_connection).with(site, anything).yields(http)
302
+ expect(pool).to receive(:with_connection).with(site, anything).and_yield(http)
300
303
 
301
304
  result = subject.get('/foo')
302
305
 
@@ -305,12 +308,12 @@ describe Puppet::Network::HTTP::Connection do
305
308
 
306
309
  it "should sleep and retry if Retry-After is an Integer" do
307
310
  httpunavailable['Retry-After'] = '42'
308
- http.stubs(:request).returns(httpunavailable).then.returns(httpok)
311
+ allow(http).to receive(:request).and_return(httpunavailable, httpok)
309
312
 
310
313
  pool = Puppet.lookup(:http_pool)
311
- pool.expects(:with_connection).with(site, anything).twice.yields(http)
314
+ expect(pool).to receive(:with_connection).with(site, anything).twice.and_yield(http)
312
315
 
313
- ::Kernel.expects(:sleep).with(42)
316
+ expect(::Kernel).to receive(:sleep).with(42)
314
317
 
315
318
  result = subject.get('/foo')
316
319
 
@@ -319,15 +322,15 @@ describe Puppet::Network::HTTP::Connection do
319
322
 
320
323
  it "should sleep and retry if Retry-After is an RFC 2822 Date" do
321
324
  httpunavailable['Retry-After'] = 'Wed, 13 Apr 2005 15:18:05 GMT'
322
- http.stubs(:request).returns(httpunavailable).then.returns(httpok)
325
+ allow(http).to receive(:request).and_return(httpunavailable, httpok)
323
326
 
324
327
  now = DateTime.new(2005, 4, 13, 8, 17, 5, '-07:00')
325
- DateTime.stubs(:now).returns(now)
328
+ allow(DateTime).to receive(:now).and_return(now)
326
329
 
327
330
  pool = Puppet.lookup(:http_pool)
328
- pool.expects(:with_connection).with(site, anything).twice.yields(http)
331
+ expect(pool).to receive(:with_connection).with(site, anything).twice.and_yield(http)
329
332
 
330
- ::Kernel.expects(:sleep).with(60)
333
+ expect(::Kernel).to receive(:sleep).with(60)
331
334
 
332
335
  result = subject.get('/foo')
333
336
 
@@ -336,13 +339,13 @@ describe Puppet::Network::HTTP::Connection do
336
339
 
337
340
  it "should sleep for no more than the Puppet runinterval" do
338
341
  httpunavailable['Retry-After'] = '60'
339
- http.stubs(:request).returns(httpunavailable).then.returns(httpok)
342
+ allow(http).to receive(:request).and_return(httpunavailable, httpok)
340
343
  Puppet[:runinterval] = 30
341
344
 
342
345
  pool = Puppet.lookup(:http_pool)
343
- pool.expects(:with_connection).with(site, anything).twice.yields(http)
346
+ expect(pool).to receive(:with_connection).with(site, anything).twice.and_yield(http)
344
347
 
345
- ::Kernel.expects(:sleep).with(30)
348
+ expect(::Kernel).to receive(:sleep).with(30)
346
349
 
347
350
  subject.get('/foo')
348
351
  end
@@ -379,17 +382,17 @@ describe Puppet::Network::HTTP::Connection do
379
382
  end
380
383
 
381
384
  def expect_request_with_basic_auth
382
- Net::HTTP.any_instance.expects(:request).with do |request|
385
+ expect_any_instance_of(Net::HTTP).to receive(:request) do |_, request|
383
386
  expect(request['authorization']).to match(/^Basic/)
384
- end.returns(httpok)
387
+ end.and_return(httpok)
385
388
  end
386
389
 
387
390
  it "sets HTTP User-Agent header" do
388
391
  puppet_ua = "Puppet/#{Puppet.version} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_PLATFORM})"
389
392
 
390
- Net::HTTP.any_instance.expects(:request).with do |request|
393
+ expect_any_instance_of(Net::HTTP).to receive(:request) do |_, request|
391
394
  expect(request['User-Agent']).to eq(puppet_ua)
392
- end.returns(httpok)
395
+ end.and_return(httpok)
393
396
 
394
397
  subject.get('/path')
395
398
  end