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
  require 'puppet/network/http/rack' if Puppet.features.rack?
4
3
 
@@ -16,27 +15,27 @@ describe "Puppet::Network::HTTP::Rack", :if => Puppet.features.rack? do
16
15
 
17
16
  it "should create a Request object" do
18
17
  request = Rack::Request.new(@env)
19
- Rack::Request.expects(:new).returns request
18
+ expect(Rack::Request).to receive(:new).and_return(request)
20
19
  @linted.call(@env)
21
20
  end
22
21
 
23
22
  it "should create a Response object" do
24
- Rack::Response.expects(:new).returns stub_everything
23
+ expect(Rack::Response).to receive(:new).and_return(double('rack response', :[]= => nil, :status= => nil, :write => nil, :finish => nil))
25
24
  @app.call(@env) # can't lint when Rack::Response is a stub
26
25
  end
27
26
 
28
27
  it "should let RackREST process the request" do
29
- Puppet::Network::HTTP::RackREST.any_instance.expects(:process).once
28
+ expect_any_instance_of(Puppet::Network::HTTP::RackREST).to receive(:process).once
30
29
  @linted.call(@env)
31
30
  end
32
31
 
33
32
  it "should catch unhandled exceptions from RackREST" do
34
- Puppet::Network::HTTP::RackREST.any_instance.expects(:process).raises(ArgumentError, 'test error')
33
+ expect_any_instance_of(Puppet::Network::HTTP::RackREST).to receive(:process).and_raise(ArgumentError, 'test error')
35
34
  expect { @linted.call(@env) }.not_to raise_error
36
35
  end
37
36
 
38
37
  it "should finish() the Response" do
39
- Rack::Response.any_instance.expects(:finish).once
38
+ expect_any_instance_of(Rack::Response).to receive(:finish).once
40
39
  @app.call(@env) # can't lint when finish is a stub
41
40
  end
42
41
  end
@@ -1,5 +1,3 @@
1
- #! /usr/bin/env ruby
2
-
3
1
  require 'spec_helper'
4
2
  require 'puppet_spec/network'
5
3
  require 'puppet/network/http'
@@ -1,5 +1,3 @@
1
- #! /usr/bin/env ruby
2
-
3
1
  require 'spec_helper'
4
2
  require 'puppet_spec/files'
5
3
  require 'puppet_spec/handler'
@@ -17,14 +15,14 @@ describe Puppet::Network::HTTP::Response do
17
15
 
18
16
  context "when passed a response body" do
19
17
  it "passes the status code and body to the handler" do
20
- handler.expects(:set_response).with(response, body_utf8, 200)
18
+ expect(handler).to receive(:set_response).with(response, body_utf8, 200)
21
19
 
22
20
  subject.respond_with(200, 'application/json', body_utf8)
23
21
  end
24
22
 
25
23
  it "accepts a File body" do
26
24
  file = tmpfile('response_spec')
27
- handler.expects(:set_response).with(response, file, 200)
25
+ expect(handler).to receive(:set_response).with(response, file, 200)
28
26
 
29
27
  subject.respond_with(200, 'application/octet-stream', file)
30
28
  end
@@ -32,14 +30,14 @@ describe Puppet::Network::HTTP::Response do
32
30
 
33
31
  context "when passed a content type" do
34
32
  it "accepts a mime string" do
35
- handler.expects(:set_content_type).with(response, 'application/json; charset=utf-8')
33
+ expect(handler).to receive(:set_content_type).with(response, 'application/json; charset=utf-8')
36
34
 
37
35
  subject.respond_with(200, 'application/json', body_utf8)
38
36
  end
39
37
 
40
38
  it "accepts a format object" do
41
39
  formatter = Puppet::Network::FormatHandler.format(:json)
42
- handler.expects(:set_content_type).with(response, 'application/json; charset=utf-8')
40
+ expect(handler).to receive(:set_content_type).with(response, 'application/json; charset=utf-8')
43
41
 
44
42
  subject.respond_with(200, formatter, body_utf8)
45
43
  end
@@ -51,7 +49,7 @@ describe Puppet::Network::HTTP::Response do
51
49
  body_binary = [0xDEADCAFE].pack('L')
52
50
 
53
51
  formatter = Puppet::Network::FormatHandler.format(:binary)
54
- handler.expects(:set_content_type).with(response, 'application/octet-stream')
52
+ expect(handler).to receive(:set_content_type).with(response, 'application/octet-stream')
55
53
 
56
54
  subject.respond_with(200, formatter, body_binary)
57
55
  end
@@ -63,14 +61,14 @@ describe Puppet::Network::HTTP::Response do
63
61
  it "sets the charset to UTF-8 for content already in that format" do
64
62
  body_pem = "BEGIN CERTIFICATE".encode('UTF-8')
65
63
 
66
- handler.expects(:set_content_type).with(response, 'text/plain; charset=utf-8')
64
+ expect(handler).to receive(:set_content_type).with(response, 'text/plain; charset=utf-8')
67
65
 
68
66
  subject.respond_with(200, formatter, body_pem)
69
67
  end
70
68
 
71
69
  it "encodes the content to UTF-8 for content not already in UTF-8" do
72
- handler.expects(:set_content_type).with(response, 'text/plain; charset=utf-8')
73
- handler.expects(:set_response).with(response, body_shift_jis.encode('utf-8'), 200)
70
+ expect(handler).to receive(:set_content_type).with(response, 'text/plain; charset=utf-8')
71
+ expect(handler).to receive(:set_response).with(response, body_shift_jis.encode('utf-8'), 200)
74
72
 
75
73
  subject.respond_with(200, formatter, body_shift_jis)
76
74
  end
@@ -86,14 +84,14 @@ describe Puppet::Network::HTTP::Response do
86
84
  let(:formatter) { Puppet::Network::FormatHandler.format(:json) }
87
85
 
88
86
  it "sets the charset to UTF-8 for content already in that format" do
89
- handler.expects(:set_content_type).with(response, 'application/json; charset=utf-8')
87
+ expect(handler).to receive(:set_content_type).with(response, 'application/json; charset=utf-8')
90
88
 
91
89
  subject.respond_with(200, formatter, body_utf8)
92
90
  end
93
91
 
94
92
  it "encodes the content to UTF-8 for content not already in UTF-8" do
95
- handler.expects(:set_content_type).with(response, 'application/json; charset=utf-8')
96
- handler.expects(:set_response).with(response, body_shift_jis.encode('utf-8'), 200)
93
+ expect(handler).to receive(:set_content_type).with(response, 'application/json; charset=utf-8')
94
+ expect(handler).to receive(:set_response).with(response, body_shift_jis.encode('utf-8'), 200)
97
95
 
98
96
  subject.respond_with(200, formatter, body_shift_jis)
99
97
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/indirector_testing'
4
3
 
@@ -1,10 +1,9 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/network/http'
5
4
 
6
5
  describe Puppet::Network::HTTP::Session do
7
- let(:connection) { stub('connection') }
6
+ let(:connection) { double('connection') }
8
7
 
9
8
  def create_session(connection, expiration_time = nil)
10
9
  expiration_time ||= Time.now + 60 * 60
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/network/http'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/network/http'
4
3
  require 'webrick'
@@ -11,20 +10,20 @@ describe Puppet::Network::HTTP::WEBrickREST do
11
10
 
12
11
  describe "when receiving a request" do
13
12
  before do
14
- @request = stub('webrick http request', :query => {},
15
- :query_string => 'environment=production',
16
- :peeraddr => %w{eh boo host ip},
17
- :request_method => 'GET',
18
- :client_cert => nil)
19
- @response = mock('webrick http response')
20
- @model_class = stub('indirected model class')
21
- @webrick = stub('webrick http server', :mount => true, :[] => {})
22
- Puppet::Indirector::Indirection.stubs(:model).with(:foo).returns(@model_class)
13
+ @request = double('webrick http request', :query => {},
14
+ :query_string => 'environment=production',
15
+ :peeraddr => %w{eh boo host ip},
16
+ :request_method => 'GET',
17
+ :client_cert => nil)
18
+ @response = double('webrick http response')
19
+ @model_class = double('indirected model class')
20
+ @webrick = double('webrick http server', :mount => true, :[] => {})
21
+ allow(Puppet::Indirector::Indirection).to receive(:model).with(:foo).and_return(@model_class)
23
22
  @handler = Puppet::Network::HTTP::WEBrickREST.new(@webrick)
24
23
  end
25
24
 
26
25
  it "should delegate its :service method to its :process method" do
27
- @handler.expects(:process).with(@request, @response).returns "stuff"
26
+ expect(@handler).to receive(:process).with(@request, @response).and_return("stuff")
28
27
  expect(@handler.service(@request, @response)).to eq("stuff")
29
28
  end
30
29
 
@@ -32,7 +31,7 @@ describe Puppet::Network::HTTP::WEBrickREST do
32
31
  let(:fake_request) { {"Foo" => "bar", "BAZ" => "bam" } }
33
32
 
34
33
  it "should iterate over the request object using #each" do
35
- fake_request.expects(:each)
34
+ expect(fake_request).to receive(:each)
36
35
  @handler.headers(fake_request)
37
36
  end
38
37
 
@@ -44,48 +43,48 @@ describe Puppet::Network::HTTP::WEBrickREST do
44
43
 
45
44
  describe "when using the Handler interface" do
46
45
  it "should use the request method as the http method" do
47
- @request.expects(:request_method).returns "FOO"
46
+ expect(@request).to receive(:request_method).and_return("FOO")
48
47
  expect(@handler.http_method(@request)).to eq("FOO")
49
48
  end
50
49
 
51
50
  it "should return the request path as the path" do
52
- @request.expects(:path).returns "/foo/bar"
51
+ expect(@request).to receive(:path).and_return("/foo/bar")
53
52
  expect(@handler.path(@request)).to eq("/foo/bar")
54
53
  end
55
54
 
56
55
  it "should return the request body as the body" do
57
- @request.stubs(:request_method).returns "POST"
58
- @request.expects(:body).returns "my body"
56
+ allow(@request).to receive(:request_method).and_return("POST")
57
+ expect(@request).to receive(:body).and_return("my body")
59
58
  expect(@handler.body(@request)).to eq("my body")
60
59
  end
61
60
 
62
61
  it "should set the response's 'content-type' header when setting the content type" do
63
- @response.expects(:[]=).with("content-type", "text/html")
62
+ expect(@response).to receive(:[]=).with("content-type", "text/html")
64
63
  @handler.set_content_type(@response, "text/html")
65
64
  end
66
65
 
67
66
  it "should set the status and body on the response when setting the response for a successful query" do
68
- @response.expects(:status=).with 200
69
- @response.expects(:body=).with "mybody"
67
+ expect(@response).to receive(:status=).with(200)
68
+ expect(@response).to receive(:body=).with("mybody")
70
69
 
71
70
  @handler.set_response(@response, "mybody", 200)
72
71
  end
73
72
 
74
73
  it "serves a file" do
75
- stat = stub 'stat', :size => 100
76
- @file = stub 'file', :stat => stat, :path => "/tmp/path"
77
- @file.stubs(:is_a?).with(File).returns(true)
74
+ stat = double('stat', :size => 100)
75
+ @file = double('file', :stat => stat, :path => "/tmp/path")
76
+ allow(@file).to receive(:is_a?).with(File).and_return(true)
78
77
 
79
- @response.expects(:[]=).with('content-length', 100)
80
- @response.expects(:status=).with 200
81
- @response.expects(:body=).with @file
78
+ expect(@response).to receive(:[]=).with('content-length', 100)
79
+ expect(@response).to receive(:status=).with(200)
80
+ expect(@response).to receive(:body=).with(@file)
82
81
 
83
82
  @handler.set_response(@response, @file, 200)
84
83
  end
85
84
 
86
85
  it "should set the status and message on the response when setting the response for a failed query" do
87
- @response.expects(:status=).with 400
88
- @response.expects(:body=).with "mybody"
86
+ expect(@response).to receive(:status=).with(400)
87
+ expect(@response).to receive(:body=).with("mybody")
89
88
 
90
89
  @handler.set_response(@response, "mybody", 400)
91
90
  end
@@ -98,7 +97,7 @@ describe Puppet::Network::HTTP::WEBrickREST do
98
97
  end
99
98
 
100
99
  def a_request_querying(query_data)
101
- @request.expects(:query).returns(query_of(query_data))
100
+ expect(@request).to receive(:query).and_return(query_of(query_data))
102
101
  @request
103
102
  end
104
103
 
@@ -110,7 +109,7 @@ describe Puppet::Network::HTTP::WEBrickREST do
110
109
 
111
110
  it "has no parameters when there is no query string" do
112
111
  only_server_side_information = [:authenticated, :ip, :node]
113
- @request.stubs(:query).returns(nil)
112
+ allow(@request).to receive(:query).and_return(nil)
114
113
 
115
114
  result = @handler.params(@request)
116
115
 
@@ -118,8 +117,8 @@ describe Puppet::Network::HTTP::WEBrickREST do
118
117
  end
119
118
 
120
119
  it "should prefer duplicate params from the body over the query string" do
121
- @request.stubs(:request_method).returns "PUT"
122
- @request.stubs(:query).returns(WEBrick::HTTPUtils.parse_query("foo=bar&environment=posted_env"))
120
+ allow(@request).to receive(:request_method).and_return("PUT")
121
+ allow(@request).to receive(:query).and_return(WEBrick::HTTPUtils.parse_query("foo=bar&environment=posted_env"))
123
122
  expect(@handler.params(@request)[:environment]).to eq("posted_env")
124
123
  end
125
124
 
@@ -178,7 +177,7 @@ describe Puppet::Network::HTTP::WEBrickREST do
178
177
 
179
178
  it "should not allow clients to set the node via the request parameters" do
180
179
  request = a_request_querying("node" => "foo")
181
- @handler.stubs(:resolve_node)
180
+ allow(@handler).to receive(:resolve_node)
182
181
 
183
182
  expect(@handler.params(request)[:node]).to be_nil
184
183
  end
@@ -190,39 +189,39 @@ describe Puppet::Network::HTTP::WEBrickREST do
190
189
  end
191
190
 
192
191
  it "should pass the client's ip address to model find" do
193
- @request.stubs(:peeraddr).returns(%w{noidea dunno hostname ipaddress})
192
+ allow(@request).to receive(:peeraddr).and_return(%w{noidea dunno hostname ipaddress})
194
193
  expect(@handler.params(@request)[:ip]).to eq("ipaddress")
195
194
  end
196
195
 
197
196
  it "should set 'authenticated' to true if a certificate is present" do
198
- cert = stub 'cert', :subject => [%w{CN host.domain.com}]
199
- @request.stubs(:client_cert).returns cert
197
+ cert = double('cert', :subject => [%w{CN host.domain.com}])
198
+ allow(@request).to receive(:client_cert).and_return(cert)
200
199
  expect(@handler.params(@request)[:authenticated]).to be_truthy
201
200
  end
202
201
 
203
202
  it "should set 'authenticated' to false if no certificate is present" do
204
- @request.stubs(:client_cert).returns nil
203
+ allow(@request).to receive(:client_cert).and_return(nil)
205
204
  expect(@handler.params(@request)[:authenticated]).to be_falsey
206
205
  end
207
206
 
208
207
  it "should pass the client's certificate name to model method if a certificate is present" do
209
- @request.stubs(:client_cert).returns(certificate_with_subject("/CN=host.domain.com"))
208
+ allow(@request).to receive(:client_cert).and_return(certificate_with_subject("/CN=host.domain.com"))
210
209
 
211
210
  expect(@handler.params(@request)[:node]).to eq("host.domain.com")
212
211
  end
213
212
 
214
213
  it "should resolve the node name with an ip address look-up if no certificate is present" do
215
- @request.stubs(:client_cert).returns nil
214
+ allow(@request).to receive(:client_cert).and_return(nil)
216
215
 
217
- @handler.expects(:resolve_node).returns(:resolved_node)
216
+ expect(@handler).to receive(:resolve_node).and_return(:resolved_node)
218
217
 
219
218
  expect(@handler.params(@request)[:node]).to eq(:resolved_node)
220
219
  end
221
220
 
222
221
  it "should resolve the node name with an ip address look-up if CN parsing fails" do
223
- @request.stubs(:client_cert).returns(certificate_with_subject("/C=company"))
222
+ allow(@request).to receive(:client_cert).and_return(certificate_with_subject("/C=company"))
224
223
 
225
- @handler.expects(:resolve_node).returns(:resolved_node)
224
+ expect(@handler).to receive(:resolve_node).and_return(:resolved_node)
226
225
 
227
226
  expect(@handler.params(@request)[:node]).to eq(:resolved_node)
228
227
  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/network/http/webrick'
@@ -17,34 +16,34 @@ describe Puppet::Network::HTTP::WEBrick do
17
16
  let(:server) { Puppet::Network::HTTP::WEBrick.new }
18
17
  let(:localcacert) { make_absolute("/ca/crt") }
19
18
  let(:ssl_server_ca_auth) { make_absolute("/ca/ssl_server_auth_file") }
20
- let(:key) { stub 'key', :content => "mykey" }
21
- let(:cert) { stub 'cert', :content => "mycert" }
22
- let(:host) { stub 'host', :key => key, :certificate => cert, :name => "yay", :ssl_store => "mystore" }
19
+ let(:key) { double('key', :content => "mykey") }
20
+ let(:cert) { double('cert', :content => "mycert") }
21
+ let(:host) { double('host', :key => key, :certificate => cert, :name => "yay", :ssl_store => "mystore") }
23
22
 
24
23
  let(:mock_ssl_context) do
25
- stub('ssl_context', :ciphers= => nil)
24
+ double('ssl_context', :ciphers= => nil)
26
25
  end
27
26
 
28
- let(:socket) { mock('socket') }
27
+ let(:socket) { double('socket') }
29
28
  let(:mock_webrick) do
30
- server = stub('webrick',
29
+ server = double('webrick',
31
30
  :[] => {},
32
31
  :listeners => [],
33
32
  :status => :Running,
34
33
  :mount => nil,
35
34
  :shutdown => nil,
36
35
  :ssl_context => mock_ssl_context)
37
- server.stubs(:start).yields(socket)
38
- IO.stubs(:select).with([socket], nil, nil, anything).returns(true)
39
- socket.stubs(:accept)
40
- server.stubs(:run).with(socket)
36
+ allow(server).to receive(:start).and_yield(socket)
37
+ allow(IO).to receive(:select).with([socket], nil, nil, anything).and_return(true)
38
+ allow(socket).to receive(:accept)
39
+ allow(server).to receive(:run).with(socket)
41
40
  server
42
41
  end
43
42
 
44
43
  before :each do
45
- WEBrick::HTTPServer.stubs(:new).returns(mock_webrick)
46
- Puppet::SSL::Certificate.indirection.stubs(:find).with('ca').returns cert
47
- Puppet::SSL::Host.stubs(:localhost).returns host
44
+ allow(WEBrick::HTTPServer).to receive(:new).and_return(mock_webrick)
45
+ allow(Puppet::SSL::Certificate.indirection).to receive(:find).with('ca').and_return(cert)
46
+ allow(Puppet::SSL::Host).to receive(:localhost).and_return(host)
48
47
  end
49
48
 
50
49
  describe "when turning on listening" do
@@ -54,37 +53,35 @@ describe Puppet::Network::HTTP::WEBrick do
54
53
  end
55
54
 
56
55
  it "should tell webrick to listen on the specified address and port" do
57
- WEBrick::HTTPServer.expects(:new).with(
58
- has_entries(:Port => 31337, :BindAddress => "127.0.0.1")
59
- ).returns(mock_webrick)
56
+ expect(WEBrick::HTTPServer).to receive(:new).with(
57
+ hash_including(:Port => 31337, :BindAddress => "127.0.0.1")
58
+ ).and_return(mock_webrick)
60
59
  server.listen(address, port)
61
60
  end
62
61
 
63
62
  it "should not perform reverse lookups" do
64
- WEBrick::HTTPServer.expects(:new).with(
65
- has_entry(:DoNotReverseLookup => true)
66
- ).returns(mock_webrick)
67
- BasicSocket.expects(:do_not_reverse_lookup=).with(true)
63
+ expect(WEBrick::HTTPServer).to receive(:new).with(
64
+ hash_including(:DoNotReverseLookup => true)
65
+ ).and_return(mock_webrick)
66
+ expect(BasicSocket).to receive(:do_not_reverse_lookup=).with(true)
68
67
 
69
68
  server.listen(address, port)
70
69
  end
71
70
 
72
71
  it "should configure a logger for webrick" do
73
- server.expects(:setup_logger).returns(:Logger => :mylogger)
72
+ expect(server).to receive(:setup_logger).and_return(:Logger => :mylogger)
74
73
 
75
- WEBrick::HTTPServer.expects(:new).with {|args|
76
- args[:Logger] == :mylogger
77
- }.returns(mock_webrick)
74
+ expect(WEBrick::HTTPServer).to receive(:new) do |args|
75
+ expect(args[:Logger]).to eq(:mylogger)
76
+ end.and_return(mock_webrick)
78
77
 
79
78
  server.listen(address, port)
80
79
  end
81
80
 
82
81
  it "should configure SSL for webrick" do
83
- server.expects(:setup_ssl).returns(:Ssl => :testing, :Other => :yay)
82
+ expect(server).to receive(:setup_ssl).and_return(:Ssl => :testing, :Other => :yay)
84
83
 
85
- WEBrick::HTTPServer.expects(:new).with {|args|
86
- args[:Ssl] == :testing and args[:Other] == :yay
87
- }.returns(mock_webrick)
84
+ expect(WEBrick::HTTPServer).to receive(:new).with(hash_including(:Ssl => :testing, :Other => :yay)).and_return(mock_webrick)
88
85
 
89
86
  server.listen(address, port)
90
87
  end
@@ -95,7 +92,7 @@ describe Puppet::Network::HTTP::WEBrick do
95
92
  end
96
93
 
97
94
  it "is passed a yet to be accepted socket" do
98
- socket.expects(:accept)
95
+ expect(socket).to receive(:accept)
99
96
 
100
97
  server.listen(address, port)
101
98
  server.unlisten
@@ -104,7 +101,7 @@ describe Puppet::Network::HTTP::WEBrick do
104
101
  describe "when the REST protocol is requested" do
105
102
  it "should register the REST handler at /" do
106
103
  # We don't care about the options here.
107
- mock_webrick.expects(:mount).with("/", Puppet::Network::HTTP::WEBrickREST, anything)
104
+ expect(mock_webrick).to receive(:mount).with("/", Puppet::Network::HTTP::WEBrickREST)
108
105
 
109
106
  server.listen(address, port)
110
107
  end
@@ -117,7 +114,7 @@ describe Puppet::Network::HTTP::WEBrick do
117
114
  end
118
115
 
119
116
  it "should order webrick server to stop" do
120
- mock_webrick.expects(:shutdown)
117
+ expect(mock_webrick).to receive(:shutdown)
121
118
  server.listen(address, port)
122
119
  server.unlisten
123
120
  end
@@ -133,14 +130,14 @@ describe Puppet::Network::HTTP::WEBrick do
133
130
  let(:server) { Puppet::Network::HTTP::WEBrick.new }
134
131
 
135
132
  before :each do
136
- Puppet.settings.stubs(:use)
137
- @filehandle = stub 'handle', :fcntl => nil, :sync= => nil
133
+ allow(Puppet.settings).to receive(:use)
134
+ @filehandle = double('handle', :fcntl => nil, :sync= => nil)
138
135
 
139
- File.stubs(:open).returns @filehandle
136
+ allow(File).to receive(:open).and_return(@filehandle)
140
137
  end
141
138
 
142
139
  it "should use the settings for :main, :ssl, and :application" do
143
- Puppet.settings.expects(:use).with(:main, :ssl, :application)
140
+ expect(Puppet.settings).to receive(:use).with(:main, :ssl, :application)
144
141
 
145
142
  server.setup_logger
146
143
  end
@@ -149,7 +146,7 @@ describe Puppet::Network::HTTP::WEBrick do
149
146
  log = make_absolute("/master/log")
150
147
  Puppet[:masterhttplog] = log
151
148
 
152
- File.expects(:open).with(log, "a+:UTF-8").returns @filehandle
149
+ expect(File).to receive(:open).with(log, "a+:UTF-8").and_return(@filehandle)
153
150
 
154
151
  server.setup_logger
155
152
  end
@@ -157,45 +154,45 @@ describe Puppet::Network::HTTP::WEBrick do
157
154
  describe "and creating the logging filehandle" do
158
155
  it "should set the close-on-exec flag if supported" do
159
156
  if defined? Fcntl::FD_CLOEXEC
160
- @filehandle.expects(:fcntl).with(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
157
+ expect(@filehandle).to receive(:fcntl).with(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
161
158
  else
162
- @filehandle.expects(:fcntl).never
159
+ expect(@filehandle).not_to receive(:fcntl)
163
160
  end
164
161
 
165
162
  server.setup_logger
166
163
  end
167
164
 
168
165
  it "should sync the filehandle" do
169
- @filehandle.expects(:sync=).with(true)
166
+ expect(@filehandle).to receive(:sync=).with(true)
170
167
 
171
168
  server.setup_logger
172
169
  end
173
170
  end
174
171
 
175
172
  it "should create a new WEBrick::Log instance with the open filehandle" do
176
- WEBrick::Log.expects(:new).with(@filehandle)
173
+ expect(WEBrick::Log).to receive(:new).with(@filehandle)
177
174
 
178
175
  server.setup_logger
179
176
  end
180
177
 
181
178
  it "should set debugging if the current loglevel is :debug" do
182
- Puppet::Util::Log.expects(:level).returns :debug
179
+ expect(Puppet::Util::Log).to receive(:level).and_return(:debug)
183
180
 
184
- WEBrick::Log.expects(:new).with { |handle, debug| debug == WEBrick::Log::DEBUG }
181
+ expect(WEBrick::Log).to receive(:new).with(anything, WEBrick::Log::DEBUG)
185
182
 
186
183
  server.setup_logger
187
184
  end
188
185
 
189
186
  it "should return the logger as the main log" do
190
- logger = mock 'logger'
191
- WEBrick::Log.expects(:new).returns logger
187
+ logger = double('logger')
188
+ expect(WEBrick::Log).to receive(:new).and_return(logger)
192
189
 
193
190
  expect(server.setup_logger[:Logger]).to eq(logger)
194
191
  end
195
192
 
196
193
  it "should return the logger as the access log using both the Common and Referer log format" do
197
- logger = mock 'logger'
198
- WEBrick::Log.expects(:new).returns logger
194
+ logger = double('logger')
195
+ expect(WEBrick::Log).to receive(:new).and_return(logger)
199
196
 
200
197
  expect(server.setup_logger[:AccessLog]).to eq([
201
198
  [logger, WEBrick::AccessLog::COMMON_LOG_FORMAT],
@@ -206,8 +203,8 @@ describe Puppet::Network::HTTP::WEBrick do
206
203
 
207
204
  describe "when configuring ssl" do
208
205
  it "should use the key from the localhost SSL::Host instance" do
209
- Puppet::SSL::Host.expects(:localhost).returns host
210
- host.expects(:key).returns key
206
+ expect(Puppet::SSL::Host).to receive(:localhost).and_return(host)
207
+ expect(host).to receive(:key).and_return(key)
211
208
 
212
209
  expect(server.setup_ssl[:SSLPrivateKey]).to eq("mykey")
213
210
  end
@@ -217,7 +214,7 @@ describe Puppet::Network::HTTP::WEBrick do
217
214
  end
218
215
 
219
216
  it "should fail if no CA certificate can be found" do
220
- Puppet::SSL::Certificate.indirection.stubs(:find).with('ca').returns nil
217
+ allow(Puppet::SSL::Certificate.indirection).to receive(:find).with('ca').and_return(nil)
221
218
 
222
219
  expect { server.setup_ssl }.to raise_error(Puppet::Error, /Could not find CA certificate/)
223
220
  end
@@ -262,7 +259,7 @@ describe Puppet::Network::HTTP::WEBrick do
262
259
  end
263
260
 
264
261
  it "should add an x509 store" do
265
- host.expects(:ssl_store).returns "mystore"
262
+ expect(host).to receive(:ssl_store).and_return("mystore")
266
263
 
267
264
  expect(server.setup_ssl[:SSLCertificateStore]).to eq("mystore")
268
265
  end
@@ -272,7 +269,7 @@ describe Puppet::Network::HTTP::WEBrick do
272
269
  end
273
270
 
274
271
  it "specifies the allowable ciphers" do
275
- mock_ssl_context.expects(:ciphers=).with(server.class::CIPHERS)
272
+ expect(mock_ssl_context).to receive(:ciphers=).with(server.class::CIPHERS)
276
273
 
277
274
  server.create_server('localhost', '8888')
278
275
  end