puppet 6.0.7-x86-mingw32 → 6.0.8-x86-mingw32

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

Potentially problematic release.


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

Files changed (632) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +4 -8
  4. data/lib/puppet/application/device.rb +99 -83
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/configurer.rb +5 -4
  7. data/lib/puppet/defaults.rb +31 -11
  8. data/lib/puppet/indirector/request.rb +26 -15
  9. data/lib/puppet/network/http/connection.rb +15 -7
  10. data/lib/puppet/transaction/event_manager.rb +1 -5
  11. data/lib/puppet/type/file/source.rb +0 -1
  12. data/lib/puppet/util/connection.rb +15 -6
  13. data/lib/puppet/util/http_proxy.rb +3 -2
  14. data/lib/puppet/version.rb +1 -1
  15. data/locales/puppet.pot +99 -40
  16. data/man/man5/puppet.conf.5 +8 -8
  17. data/man/man8/puppet-agent.8 +1 -1
  18. data/man/man8/puppet-apply.8 +1 -1
  19. data/man/man8/puppet-catalog.8 +1 -1
  20. data/man/man8/puppet-config.8 +1 -1
  21. data/man/man8/puppet-describe.8 +1 -1
  22. data/man/man8/puppet-device.8 +1 -1
  23. data/man/man8/puppet-doc.8 +1 -1
  24. data/man/man8/puppet-epp.8 +1 -1
  25. data/man/man8/puppet-facts.8 +1 -1
  26. data/man/man8/puppet-filebucket.8 +1 -1
  27. data/man/man8/puppet-generate.8 +1 -1
  28. data/man/man8/puppet-help.8 +1 -1
  29. data/man/man8/puppet-key.8 +1 -1
  30. data/man/man8/puppet-lookup.8 +1 -1
  31. data/man/man8/puppet-man.8 +1 -1
  32. data/man/man8/puppet-module.8 +1 -1
  33. data/man/man8/puppet-node.8 +1 -1
  34. data/man/man8/puppet-parser.8 +1 -1
  35. data/man/man8/puppet-plugin.8 +1 -1
  36. data/man/man8/puppet-report.8 +1 -1
  37. data/man/man8/puppet-resource.8 +1 -1
  38. data/man/man8/puppet-script.8 +1 -1
  39. data/man/man8/puppet-ssl.8 +1 -1
  40. data/man/man8/puppet-status.8 +1 -1
  41. data/man/man8/puppet.8 +2 -2
  42. data/spec/integration/agent/logging_spec.rb +5 -7
  43. data/spec/integration/application/apply_spec.rb +18 -16
  44. data/spec/integration/application/doc_spec.rb +1 -2
  45. data/spec/integration/application/lookup_spec.rb +5 -5
  46. data/spec/integration/configurer_spec.rb +5 -6
  47. data/spec/integration/defaults_spec.rb +5 -6
  48. data/spec/integration/directory_environments_spec.rb +1 -1
  49. data/spec/integration/faces/config_spec.rb +3 -4
  50. data/spec/integration/faces/documentation_spec.rb +0 -1
  51. data/spec/integration/faces/plugin_spec.rb +1 -1
  52. data/spec/integration/file_bucket/file_spec.rb +2 -4
  53. data/spec/integration/file_serving/content_spec.rb +0 -1
  54. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  55. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  56. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  57. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  58. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  59. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  60. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  61. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  62. data/spec/integration/network/authconfig_spec.rb +23 -24
  63. data/spec/integration/network/formats_spec.rb +0 -1
  64. data/spec/integration/node/environment_spec.rb +0 -1
  65. data/spec/integration/node/facts_spec.rb +9 -10
  66. data/spec/integration/node_spec.rb +6 -7
  67. data/spec/integration/parser/catalog_spec.rb +1 -5
  68. data/spec/integration/parser/collection_spec.rb +1 -2
  69. data/spec/integration/parser/compiler_spec.rb +6 -6
  70. data/spec/integration/parser/scope_spec.rb +1 -1
  71. data/spec/integration/parser/undef_param_spec.rb +1 -1
  72. data/spec/integration/provider/service/init_spec.rb +4 -5
  73. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  74. data/spec/integration/provider/service/windows_spec.rb +1 -2
  75. data/spec/integration/reference/providers_spec.rb +1 -2
  76. data/spec/integration/reports_spec.rb +1 -2
  77. data/spec/integration/resource/catalog_spec.rb +14 -17
  78. data/spec/integration/resource/type_collection_spec.rb +4 -5
  79. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  80. data/spec/integration/ssl/host_spec.rb +1 -2
  81. data/spec/integration/ssl/key_spec.rb +0 -1
  82. data/spec/integration/test/test_helper_spec.rb +0 -1
  83. data/spec/integration/transaction/report_spec.rb +6 -11
  84. data/spec/integration/transaction_spec.rb +18 -19
  85. data/spec/integration/type/exec_spec.rb +0 -1
  86. data/spec/integration/type/file_spec.rb +13 -14
  87. data/spec/integration/type/package_spec.rb +19 -23
  88. data/spec/integration/type/tidy_spec.rb +1 -2
  89. data/spec/integration/type_spec.rb +0 -1
  90. data/spec/integration/util/autoload_spec.rb +1 -2
  91. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  92. data/spec/integration/util/settings_spec.rb +0 -1
  93. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  94. data/spec/integration/util/windows/principal_spec.rb +0 -1
  95. data/spec/integration/util/windows/process_spec.rb +4 -6
  96. data/spec/integration/util/windows/registry_spec.rb +41 -51
  97. data/spec/integration/util/windows/security_spec.rb +2 -4
  98. data/spec/integration/util/windows/user_spec.rb +18 -20
  99. data/spec/integration/util_spec.rb +4 -7
  100. data/spec/lib/puppet_spec/compiler.rb +1 -1
  101. data/spec/lib/puppet_spec/files.rb +0 -1
  102. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  103. data/spec/lib/puppet_spec/scope.rb +1 -2
  104. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  105. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  106. data/spec/shared_behaviours/file_serving.rb +6 -8
  107. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  108. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  109. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  110. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  111. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  112. data/spec/spec_helper.rb +10 -1
  113. data/spec/unit/agent/disabler_spec.rb +4 -5
  114. data/spec/unit/agent/locker_spec.rb +12 -13
  115. data/spec/unit/agent_spec.rb +80 -85
  116. data/spec/unit/application/agent_spec.rb +88 -93
  117. data/spec/unit/application/apply_spec.rb +82 -83
  118. data/spec/unit/application/config_spec.rb +0 -1
  119. data/spec/unit/application/describe_spec.rb +6 -7
  120. data/spec/unit/application/device_spec.rb +395 -419
  121. data/spec/unit/application/doc_spec.rb +44 -46
  122. data/spec/unit/application/face_base_spec.rb +61 -62
  123. data/spec/unit/application/facts_spec.rb +3 -4
  124. data/spec/unit/application/filebucket_spec.rb +66 -74
  125. data/spec/unit/application/indirection_base_spec.rb +8 -6
  126. data/spec/unit/application/lookup_spec.rb +26 -26
  127. data/spec/unit/application/resource_spec.rb +42 -48
  128. data/spec/unit/application/ssl_spec.rb +3 -3
  129. data/spec/unit/application_spec.rb +82 -92
  130. data/spec/unit/capability_spec.rb +6 -6
  131. data/spec/unit/certificate_factory_spec.rb +3 -5
  132. data/spec/unit/configurer/downloader_spec.rb +20 -21
  133. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  134. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  135. data/spec/unit/configurer_spec.rb +189 -192
  136. data/spec/unit/confine/exists_spec.rb +17 -15
  137. data/spec/unit/confine/false_spec.rb +5 -6
  138. data/spec/unit/confine/feature_spec.rb +7 -5
  139. data/spec/unit/confine/true_spec.rb +5 -6
  140. data/spec/unit/confine/variable_spec.rb +14 -15
  141. data/spec/unit/confine_collection_spec.rb +28 -29
  142. data/spec/unit/confine_spec.rb +13 -14
  143. data/spec/unit/confiner_spec.rb +10 -11
  144. data/spec/unit/context/trusted_information_spec.rb +1 -1
  145. data/spec/unit/daemon_spec.rb +35 -36
  146. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  147. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  148. data/spec/unit/datatypes_spec.rb +3 -4
  149. data/spec/unit/defaults_spec.rb +18 -13
  150. data/spec/unit/environments_spec.rb +7 -7
  151. data/spec/unit/etc_spec.rb +30 -32
  152. data/spec/unit/external/pson_spec.rb +0 -1
  153. data/spec/unit/face/catalog_spec.rb +0 -1
  154. data/spec/unit/face/config_spec.rb +31 -35
  155. data/spec/unit/face/epp_face_spec.rb +3 -4
  156. data/spec/unit/face/facts_spec.rb +5 -6
  157. data/spec/unit/face/generate_spec.rb +4 -5
  158. data/spec/unit/face/help_spec.rb +7 -8
  159. data/spec/unit/face/key_spec.rb +0 -1
  160. data/spec/unit/face/man_spec.rb +1 -2
  161. data/spec/unit/face/module/install_spec.rb +3 -5
  162. data/spec/unit/face/module/list_spec.rb +2 -12
  163. data/spec/unit/face/module/search_spec.rb +11 -9
  164. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  165. data/spec/unit/face/node_spec.rb +23 -24
  166. data/spec/unit/face/parser_spec.rb +3 -3
  167. data/spec/unit/face/plugin_spec.rb +36 -9
  168. data/spec/unit/face/status_spec.rb +0 -1
  169. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  170. data/spec/unit/file_bucket/file_spec.rb +0 -2
  171. data/spec/unit/file_serving/base_spec.rb +14 -15
  172. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  173. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  174. data/spec/unit/file_serving/content_spec.rb +10 -11
  175. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  176. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  177. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  178. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  179. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  180. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  181. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  182. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  183. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  184. data/spec/unit/file_serving/mount_spec.rb +0 -1
  185. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  186. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  187. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  188. data/spec/unit/file_system_spec.rb +2 -2
  189. data/spec/unit/forge/errors_spec.rb +1 -1
  190. data/spec/unit/forge/forge_spec.rb +13 -14
  191. data/spec/unit/forge/module_release_spec.rb +18 -18
  192. data/spec/unit/forge/repository_spec.rb +29 -30
  193. data/spec/unit/forge_spec.rb +15 -11
  194. data/spec/unit/functions/binary_file_spec.rb +3 -3
  195. data/spec/unit/functions/contain_spec.rb +0 -2
  196. data/spec/unit/functions/defined_spec.rb +0 -1
  197. data/spec/unit/functions/epp_spec.rb +2 -2
  198. data/spec/unit/functions/find_file_spec.rb +7 -7
  199. data/spec/unit/functions/include_spec.rb +0 -4
  200. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  201. data/spec/unit/functions/lookup_spec.rb +1 -2
  202. data/spec/unit/functions/module_directory_spec.rb +12 -12
  203. data/spec/unit/functions/require_spec.rb +0 -3
  204. data/spec/unit/functions/shared.rb +5 -8
  205. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  206. data/spec/unit/functions4_spec.rb +9 -10
  207. data/spec/unit/gettext/config_spec.rb +4 -4
  208. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  209. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  210. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  211. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  212. data/spec/unit/hiera_puppet_spec.rb +20 -20
  213. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  214. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  215. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  216. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  217. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  218. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  219. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  220. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  221. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  222. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  223. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  224. data/spec/unit/indirector/envelope_spec.rb +1 -2
  225. data/spec/unit/indirector/exec_spec.rb +4 -5
  226. data/spec/unit/indirector/face_spec.rb +9 -9
  227. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  228. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  229. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  230. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  231. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  232. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  233. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  234. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  235. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  236. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  237. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  238. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  239. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  240. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  241. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  242. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  243. data/spec/unit/indirector/file_server_spec.rb +87 -87
  244. data/spec/unit/indirector/indirection_spec.rb +242 -226
  245. data/spec/unit/indirector/json_spec.rb +7 -9
  246. data/spec/unit/indirector/key/file_spec.rb +21 -22
  247. data/spec/unit/indirector/memory_spec.rb +6 -7
  248. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  249. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  250. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  251. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  252. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  253. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  254. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  255. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  256. data/spec/unit/indirector/none_spec.rb +5 -5
  257. data/spec/unit/indirector/plain_spec.rb +7 -8
  258. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  259. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  260. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  261. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  262. data/spec/unit/indirector/request_spec.rb +11 -12
  263. data/spec/unit/indirector/resource/ral_spec.rb +46 -54
  264. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  265. data/spec/unit/indirector/rest_spec.rb +113 -110
  266. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  267. data/spec/unit/indirector/status/local_spec.rb +0 -1
  268. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  269. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  270. data/spec/unit/indirector/terminus_spec.rb +27 -27
  271. data/spec/unit/indirector/yaml_spec.rb +5 -6
  272. data/spec/unit/indirector_spec.rb +1 -2
  273. data/spec/unit/info_service_spec.rb +1 -1
  274. data/spec/unit/interface/action_builder_spec.rb +0 -1
  275. data/spec/unit/interface/action_manager_spec.rb +0 -1
  276. data/spec/unit/interface/action_spec.rb +2 -3
  277. data/spec/unit/interface/documentation_spec.rb +0 -1
  278. data/spec/unit/interface/face_collection_spec.rb +19 -12
  279. data/spec/unit/interface_spec.rb +3 -3
  280. data/spec/unit/man_spec.rb +3 -4
  281. data/spec/unit/module_spec.rb +46 -51
  282. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  283. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  284. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  285. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  286. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  287. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  288. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  289. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  290. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  291. data/spec/unit/module_tool/tar_spec.rb +12 -13
  292. data/spec/unit/module_tool_spec.rb +7 -12
  293. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  294. data/spec/unit/network/authconfig_spec.rb +17 -18
  295. data/spec/unit/network/authorization_spec.rb +4 -5
  296. data/spec/unit/network/authstore_spec.rb +0 -1
  297. data/spec/unit/network/format_handler_spec.rb +0 -1
  298. data/spec/unit/network/format_spec.rb +9 -10
  299. data/spec/unit/network/format_support_spec.rb +28 -29
  300. data/spec/unit/network/formats_spec.rb +4 -5
  301. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  302. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  303. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  304. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  305. data/spec/unit/network/http/api_spec.rb +0 -2
  306. data/spec/unit/network/http/compression_spec.rb +21 -22
  307. data/spec/unit/network/http/connection_spec.rb +41 -36
  308. data/spec/unit/network/http/factory_spec.rb +5 -6
  309. data/spec/unit/network/http/handler_spec.rb +9 -18
  310. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  311. data/spec/unit/network/http/pool_spec.rb +28 -29
  312. data/spec/unit/network/http/request_spec.rb +0 -2
  313. data/spec/unit/network/http/response_spec.rb +11 -13
  314. data/spec/unit/network/http/route_spec.rb +0 -1
  315. data/spec/unit/network/http/session_spec.rb +1 -2
  316. data/spec/unit/network/http/site_spec.rb +0 -1
  317. data/spec/unit/network/http_pool_spec.rb +18 -9
  318. data/spec/unit/network/http_spec.rb +0 -1
  319. data/spec/unit/network/resolver_spec.rb +25 -26
  320. data/spec/unit/network/rights_spec.rb +52 -53
  321. data/spec/unit/node/environment_spec.rb +14 -15
  322. data/spec/unit/node/facts_spec.rb +5 -7
  323. data/spec/unit/node_spec.rb +4 -10
  324. data/spec/unit/other/selinux_spec.rb +0 -1
  325. data/spec/unit/parameter/boolean_spec.rb +1 -2
  326. data/spec/unit/parameter/package_options_spec.rb +1 -2
  327. data/spec/unit/parameter/path_spec.rb +0 -1
  328. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  329. data/spec/unit/parameter/value_spec.rb +0 -1
  330. data/spec/unit/parameter_spec.rb +9 -9
  331. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  332. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  333. data/spec/unit/parser/compiler_spec.rb +84 -96
  334. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  335. data/spec/unit/parser/files_spec.rb +0 -1
  336. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  337. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  338. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  339. data/spec/unit/parser/functions/file_spec.rb +13 -14
  340. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  341. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  342. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  343. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  344. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  345. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  346. data/spec/unit/parser/functions/split_spec.rb +0 -1
  347. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  348. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  349. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  350. data/spec/unit/parser/functions/template_spec.rb +13 -13
  351. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  352. data/spec/unit/parser/functions_spec.rb +6 -7
  353. data/spec/unit/parser/relationship_spec.rb +0 -1
  354. data/spec/unit/parser/resource_spec.rb +42 -42
  355. data/spec/unit/parser/scope_spec.rb +39 -35
  356. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  357. data/spec/unit/parser/type_loader_spec.rb +17 -19
  358. data/spec/unit/pops/adaptable_spec.rb +0 -1
  359. data/spec/unit/pops/benchmark_spec.rb +0 -1
  360. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  361. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  362. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  363. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  364. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  365. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  366. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  367. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  368. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  371. data/spec/unit/pops/factory_spec.rb +3 -4
  372. data/spec/unit/pops/issues_spec.rb +19 -20
  373. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  374. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  375. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  376. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  377. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  378. data/spec/unit/pops/migration_spec.rb +3 -5
  379. data/spec/unit/pops/model/model_spec.rb +0 -1
  380. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  381. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  382. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  383. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  384. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  385. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  386. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  387. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  388. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  389. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  390. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  391. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  392. data/spec/unit/pops/pn_spec.rb +0 -1
  393. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  394. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  395. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  396. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  397. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  398. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  399. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  400. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  401. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  402. data/spec/unit/pops/visitor_spec.rb +0 -1
  403. data/spec/unit/property/boolean_spec.rb +1 -1
  404. data/spec/unit/property/ensure_spec.rb +0 -1
  405. data/spec/unit/property/keyvalue_spec.rb +32 -34
  406. data/spec/unit/property/list_spec.rb +26 -27
  407. data/spec/unit/property/ordered_list_spec.rb +10 -14
  408. data/spec/unit/property_spec.rb +42 -43
  409. data/spec/unit/provider/aix_object_spec.rb +47 -45
  410. data/spec/unit/provider/command_spec.rb +9 -9
  411. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  412. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  413. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  414. data/spec/unit/provider/exec_spec.rb +0 -1
  415. data/spec/unit/provider/file/posix_spec.rb +22 -24
  416. data/spec/unit/provider/file/windows_spec.rb +15 -17
  417. data/spec/unit/provider/group/aix_spec.rb +3 -2
  418. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  419. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  420. data/spec/unit/provider/group/pw_spec.rb +11 -11
  421. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  422. data/spec/unit/provider/ldap_spec.rb +61 -62
  423. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  424. data/spec/unit/provider/nameservice_spec.rb +38 -40
  425. data/spec/unit/provider/package/aix_spec.rb +15 -15
  426. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  427. data/spec/unit/provider/package/apt_spec.rb +44 -27
  428. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  429. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  430. data/spec/unit/provider/package/base_spec.rb +4 -4
  431. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  432. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  433. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  434. data/spec/unit/provider/package/gem_spec.rb +51 -43
  435. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  436. data/spec/unit/provider/package/macports_spec.rb +46 -42
  437. data/spec/unit/provider/package/nim_spec.rb +30 -39
  438. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  439. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  440. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  441. data/spec/unit/provider/package/pip_spec.rb +71 -72
  442. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  443. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  444. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  445. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  446. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  447. data/spec/unit/provider/package/portage_spec.rb +70 -74
  448. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  449. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  450. data/spec/unit/provider/package/sun_spec.rb +16 -18
  451. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  452. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  453. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  454. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  455. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  456. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  457. data/spec/unit/provider/package/windows_spec.rb +36 -32
  458. data/spec/unit/provider/package/yum_spec.rb +7 -7
  459. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  460. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  461. data/spec/unit/provider/service/base_spec.rb +4 -5
  462. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  463. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  464. data/spec/unit/provider/service/debian_spec.rb +38 -38
  465. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  466. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  467. data/spec/unit/provider/service/init_spec.rb +53 -52
  468. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  469. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  470. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  471. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  472. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  473. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  474. data/spec/unit/provider/service/runit_spec.rb +29 -27
  475. data/spec/unit/provider/service/smf_spec.rb +74 -66
  476. data/spec/unit/provider/service/src_spec.rb +46 -47
  477. data/spec/unit/provider/service/systemd_spec.rb +104 -113
  478. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  479. data/spec/unit/provider/service/windows_spec.rb +33 -41
  480. data/spec/unit/provider/user/aix_spec.rb +31 -31
  481. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  482. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  483. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  484. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  485. data/spec/unit/provider/user/pw_spec.rb +37 -35
  486. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  487. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  488. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  489. data/spec/unit/provider_spec.rb +35 -35
  490. data/spec/unit/puppet_pal_2pec.rb +4 -5
  491. data/spec/unit/puppet_pal_spec.rb +0 -1
  492. data/spec/unit/puppet_spec.rb +6 -7
  493. data/spec/unit/relationship_spec.rb +0 -1
  494. data/spec/unit/reports/http_spec.rb +21 -23
  495. data/spec/unit/reports/store_spec.rb +3 -4
  496. data/spec/unit/reports_spec.rb +12 -14
  497. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  498. data/spec/unit/resource/catalog_spec.rb +72 -68
  499. data/spec/unit/resource/status_spec.rb +6 -8
  500. data/spec/unit/resource/type_collection_spec.rb +17 -18
  501. data/spec/unit/resource/type_spec.rb +34 -35
  502. data/spec/unit/resource_spec.rb +36 -32
  503. data/spec/unit/rest/client_spec.rb +58 -27
  504. data/spec/unit/rest/route_spec.rb +5 -5
  505. data/spec/unit/scheduler/job_spec.rb +0 -1
  506. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  507. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  508. data/spec/unit/settings/array_setting_spec.rb +1 -1
  509. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  510. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  511. data/spec/unit/settings/config_file_spec.rb +0 -1
  512. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  513. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  514. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  515. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  516. data/spec/unit/settings/file_setting_spec.rb +44 -46
  517. data/spec/unit/settings/path_setting_spec.rb +1 -2
  518. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  519. data/spec/unit/settings/string_setting_spec.rb +14 -15
  520. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  521. data/spec/unit/settings/value_translator_spec.rb +0 -1
  522. data/spec/unit/settings_spec.rb +228 -235
  523. data/spec/unit/ssl/base_spec.rb +14 -15
  524. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  525. data/spec/unit/ssl/certificate_spec.rb +23 -25
  526. data/spec/unit/ssl/digest_spec.rb +0 -1
  527. data/spec/unit/ssl/host_spec.rb +166 -149
  528. data/spec/unit/ssl/key_spec.rb +30 -31
  529. data/spec/unit/ssl/validator_spec.rb +38 -39
  530. data/spec/unit/task_spec.rb +44 -45
  531. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  532. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  533. data/spec/unit/transaction/event_spec.rb +16 -15
  534. data/spec/unit/transaction/persistence_spec.rb +16 -17
  535. data/spec/unit/transaction/report_spec.rb +11 -12
  536. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  537. data/spec/unit/transaction_spec.rb +100 -101
  538. data/spec/unit/type/component_spec.rb +0 -1
  539. data/spec/unit/type/exec_spec.rb +60 -56
  540. data/spec/unit/type/file/checksum_spec.rb +9 -10
  541. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  542. data/spec/unit/type/file/content_spec.rb +58 -61
  543. data/spec/unit/type/file/ctime_spec.rb +0 -1
  544. data/spec/unit/type/file/ensure_spec.rb +12 -13
  545. data/spec/unit/type/file/group_spec.rb +5 -7
  546. data/spec/unit/type/file/mode_spec.rb +4 -6
  547. data/spec/unit/type/file/mtime_spec.rb +0 -1
  548. data/spec/unit/type/file/owner_spec.rb +6 -8
  549. data/spec/unit/type/file/selinux_spec.rb +17 -19
  550. data/spec/unit/type/file/source_spec.rb +104 -101
  551. data/spec/unit/type/file/type_spec.rb +0 -1
  552. data/spec/unit/type/file_spec.rb +195 -185
  553. data/spec/unit/type/filebucket_spec.rb +4 -5
  554. data/spec/unit/type/group_spec.rb +6 -8
  555. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  556. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  557. data/spec/unit/type/package_spec.rb +56 -57
  558. data/spec/unit/type/resources_spec.rb +72 -74
  559. data/spec/unit/type/schedule_spec.rb +24 -26
  560. data/spec/unit/type/service_spec.rb +48 -48
  561. data/spec/unit/type/stage_spec.rb +0 -1
  562. data/spec/unit/type/tidy_spec.rb +61 -62
  563. data/spec/unit/type/user_spec.rb +24 -25
  564. data/spec/unit/type/whit_spec.rb +0 -1
  565. data/spec/unit/type_spec.rb +55 -54
  566. data/spec/unit/util/at_fork_spec.rb +18 -19
  567. data/spec/unit/util/autoload_spec.rb +55 -56
  568. data/spec/unit/util/backups_spec.rb +34 -35
  569. data/spec/unit/util/character_encoding_spec.rb +5 -5
  570. data/spec/unit/util/checksums_spec.rb +38 -39
  571. data/spec/unit/util/colors_spec.rb +1 -2
  572. data/spec/unit/util/command_line_spec.rb +24 -25
  573. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  574. data/spec/unit/util/diff_spec.rb +7 -8
  575. data/spec/unit/util/errors_spec.rb +0 -1
  576. data/spec/unit/util/execution_spec.rb +185 -161
  577. data/spec/unit/util/execution_stub_spec.rb +0 -1
  578. data/spec/unit/util/feature_spec.rb +21 -14
  579. data/spec/unit/util/filetype_spec.rb +49 -49
  580. data/spec/unit/util/http_proxy_spec.rb +12 -12
  581. data/spec/unit/util/inifile_spec.rb +26 -31
  582. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  583. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  584. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  585. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  586. data/spec/unit/util/lockfile_spec.rb +0 -1
  587. data/spec/unit/util/log/destinations_spec.rb +30 -33
  588. data/spec/unit/util/log_spec.rb +35 -36
  589. data/spec/unit/util/logging_spec.rb +58 -72
  590. data/spec/unit/util/metric_spec.rb +0 -1
  591. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  592. data/spec/unit/util/multi_match_spec.rb +0 -1
  593. data/spec/unit/util/network_device/config_spec.rb +0 -1
  594. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  595. data/spec/unit/util/network_device_spec.rb +7 -9
  596. data/spec/unit/util/package_spec.rb +0 -1
  597. data/spec/unit/util/pidlock_spec.rb +21 -22
  598. data/spec/unit/util/plist_spec.rb +40 -33
  599. data/spec/unit/util/posix_spec.rb +54 -51
  600. data/spec/unit/util/rdoc_spec.rb +9 -10
  601. data/spec/unit/util/reference_spec.rb +0 -1
  602. data/spec/unit/util/resource_template_spec.rb +20 -20
  603. data/spec/unit/util/retry_action_spec.rb +7 -8
  604. data/spec/unit/util/rubygems_spec.rb +7 -8
  605. data/spec/unit/util/run_mode_spec.rb +3 -4
  606. data/spec/unit/util/selinux_spec.rb +79 -72
  607. data/spec/unit/util/splayer_spec.rb +8 -9
  608. data/spec/unit/util/ssl_spec.rb +0 -1
  609. data/spec/unit/util/storage_spec.rb +3 -4
  610. data/spec/unit/util/suidmanager_spec.rb +45 -54
  611. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  612. data/spec/unit/util/tag_set_spec.rb +0 -1
  613. data/spec/unit/util/tagging_spec.rb +0 -1
  614. data/spec/unit/util/terminal_spec.rb +9 -10
  615. data/spec/unit/util/user_attr_spec.rb +1 -2
  616. data/spec/unit/util/warnings_spec.rb +3 -4
  617. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  618. data/spec/unit/util/watcher_spec.rb +51 -21
  619. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  620. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  621. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  622. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  623. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  624. data/spec/unit/util/windows/file_spec.rb +0 -1
  625. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  626. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  627. data/spec/unit/util/windows/service_spec.rb +66 -68
  628. data/spec/unit/util/windows/sid_spec.rb +11 -13
  629. data/spec/unit/util/windows/string_spec.rb +0 -1
  630. data/spec/unit/util_spec.rb +55 -57
  631. data/spec/unit/version_spec.rb +6 -6
  632. metadata +2 -2
@@ -16,8 +16,8 @@ describe Puppet::Rest::Client do
16
16
  ConstantErrorValidator.new(
17
17
  error_string: 'foo'))
18
18
 
19
- http.expects(:get_content).with(uri.to_s, query: nil, header: nil)
20
- .raises(OpenSSL::OpenSSLError.new('certificate verify failed'))
19
+ expect(http).to receive(:get_content).with(uri.to_s, query: nil, header: nil)
20
+ .and_raise(OpenSSL::OpenSSLError.new('certificate verify failed'))
21
21
  expect{ client.get(uri) }.to raise_error do |error|
22
22
  expect(error).to be_a(Puppet::Error)
23
23
  expect(error.message).to include('foo')
@@ -30,8 +30,8 @@ describe Puppet::Rest::Client do
30
30
  client.instance_variable_set(:@verifier,
31
31
  ConstantErrorValidator.new(
32
32
  peer_certs: [cert]))
33
- http.expects(:get_content).with(uri.to_s, query: nil, header: nil)
34
- .raises(OpenSSL::OpenSSLError.new('hostname does not match with server certificate'))
33
+ expect(http).to receive(:get_content).with(uri.to_s, query: nil, header: nil)
34
+ .and_raise(OpenSSL::OpenSSLError.new('hostname does not match with server certificate'))
35
35
  expect { client.get(uri) }.to raise_error do |error|
36
36
  expect(error).to be_a(Puppet::Error)
37
37
  expect(error.message).to include("Server hostname 'foo.com' did not match")
@@ -40,58 +40,89 @@ describe Puppet::Rest::Client do
40
40
  end
41
41
 
42
42
  it 're-raises errors it does not understand' do
43
- http.expects(:get_content).with(uri.to_s, query: nil, header: nil)
44
- .raises(OpenSSL::OpenSSLError.new('other ssl error'))
43
+ expect(http).to receive(:get_content).with(uri.to_s, query: nil, header: nil)
44
+ .and_raise(OpenSSL::OpenSSLError.new('other ssl error'))
45
45
  expect{ client.get(uri) }.to raise_error do |error|
46
46
  expect(error).to be_a(OpenSSL::OpenSSLError)
47
47
  expect(error.message).to include('other ssl error')
48
48
  end
49
-
50
49
  end
51
50
  end
52
51
 
53
52
  context 'when creating a new client' do
54
- let(:ssl_store) { mock('store') }
55
- let(:ssl_config) { stub_everything('ssl config') }
56
- let(:http) { stub_everything('http', :ssl_config => ssl_config) }
53
+ let(:ssl_store) { double('store') }
54
+ let(:ssl_config) do
55
+ double(
56
+ 'ssl config',
57
+ :cert_store= => nil,
58
+ :verify_callback= => nil,
59
+ :verify_mode= => nil,
60
+ )
61
+ end
62
+ let(:http) do
63
+ double(
64
+ 'http',
65
+ :connect_timeout= => nil,
66
+ :receive_timeout= => nil,
67
+ :ssl_config => ssl_config,
68
+ :tcp_keepalive= => nil,
69
+ :transparent_gzip_decompression= => nil,
70
+ )
71
+ end
57
72
 
58
73
  it 'initializes itself with basic defaults' do
59
- HTTPClient.expects(:new).returns(http)
60
- OpenSSL::X509::Store.stubs(:new).returns(ssl_store)
74
+ expect(HTTPClient).to receive(:new).and_return(http)
75
+ allow(OpenSSL::X509::Store).to receive(:new).and_return(ssl_store)
61
76
  # Configure connection with HTTP settings
62
77
  Puppet[:http_read_timeout] = 120
63
78
  Puppet[:http_connect_timeout] = 10
64
79
  Puppet[:http_debug] = true
65
80
 
66
- http.expects(:connect_timeout=).with(10)
67
- http.expects(:receive_timeout=).with(120)
68
- http.expects(:debug_dev=).with($stderr)
81
+ expect(http).to receive(:connect_timeout=).with(10)
82
+ expect(http).to receive(:receive_timeout=).with(120)
83
+ expect(http).to receive(:debug_dev=).with($stderr)
69
84
 
70
85
  # Configure verify mode with SSL settings
71
- ssl_config.expects(:cert_store=).with(ssl_store)
86
+ expect(ssl_config).to receive(:cert_store=).with(ssl_store)
72
87
  Puppet[:ssl_client_ca_auth] = '/fake/path'
73
88
  Puppet[:hostcert] = '/fake/cert/path'
74
- ssl_config.expects(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
89
+ expect(ssl_config).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
75
90
 
76
91
  Puppet::Rest::Client.new(ssl_context: Puppet::Rest::SSLContext.new(OpenSSL::SSL::VERIFY_NONE))
77
92
  end
78
93
 
79
94
  it 'uses a given client and SSL store when provided' do
80
- ssl_config.expects(:cert_store=).with(ssl_store)
95
+ expect(ssl_config).to receive(:cert_store=).with(ssl_store)
81
96
  Puppet::Rest::Client.new(client: http,
82
97
  ssl_context: Puppet::Rest::SSLContext.new(OpenSSL::SSL::VERIFY_PEER, ssl_store))
83
98
  end
84
99
 
85
100
  it 'configures a receive timeout when provided' do
86
- http.expects(:receive_timeout=).with(10)
101
+ expect(http).to receive(:receive_timeout=).with(10)
87
102
  Puppet::Rest::Client.new(ssl_context: Puppet::Rest::SSLContext.new(OpenSSL::SSL::VERIFY_NONE),
88
103
  client: http, receive_timeout: 10)
89
104
  end
90
105
  end
91
106
 
92
- context 'when making requests' do
93
- let(:ssl_config) { stub_everything('ssl config') }
94
- let(:http) { stub_everything('http', :ssl_config => ssl_config) }
107
+ context 'when making requests', focus: true do
108
+ let(:ssl_config) do
109
+ double(
110
+ 'ssl config',
111
+ :cert_store= => nil,
112
+ :verify_callback= => nil,
113
+ :verify_mode= => nil,
114
+ )
115
+ end
116
+ let(:http) do
117
+ double(
118
+ 'http',
119
+ :connect_timeout= => nil,
120
+ :receive_timeout= => nil,
121
+ :ssl_config => ssl_config,
122
+ :tcp_keepalive= => nil,
123
+ :transparent_gzip_decompression= => nil,
124
+ )
125
+ end
95
126
  let(:client) { Puppet::Rest::Client.new(ssl_context: Puppet::Rest::SSLContext.new(OpenSSL::SSL::VERIFY_NONE), client: http) }
96
127
  let(:url) { 'https://myserver.com:555/data' }
97
128
 
@@ -101,15 +132,15 @@ describe Puppet::Rest::Client do
101
132
  header = { 'Accept' => 'text/plain' }
102
133
  response_string = ''
103
134
  chunk_processing = lambda { |chunk| response_string = chunk }
104
- http.expects(:get_content).with(url, { query: query, header: header }).yields('response')
135
+ expect(http).to receive(:get_content).with(url, { query: query, header: header }).and_yield('response')
105
136
  client.get(url, query: query, header: header, &chunk_processing)
106
137
  expect(response_string).to eq('response')
107
138
  end
108
139
 
109
140
  it 'throws an exception when the response to the GET is not OK' do
110
- fake_response = mock('resp', :status => HTTP::Status::BAD_REQUEST)
111
- http.expects(:get_content).with(url, query: nil, header: nil)
112
- .raises(HTTPClient::BadResponseError.new('failed request', fake_response))
141
+ fake_response = double('resp', :status => HTTP::Status::BAD_REQUEST)
142
+ expect(http).to receive(:get_content).with(url, query: nil, header: nil)
143
+ .and_raise(HTTPClient::BadResponseError.new('failed request', fake_response))
113
144
  expect { client.get(url) }.to raise_error do |error|
114
145
  expect(error.message).to eq('failed request')
115
146
  expect(error.response).to be_a(Puppet::Rest::Response)
@@ -125,7 +156,7 @@ describe Puppet::Rest::Client do
125
156
  body = 'send to server'
126
157
  query = { 'environment' => 'production' }
127
158
  header = { 'Accept' => 'text/plain' }
128
- http.expects(:put).with(url, { body: body, query: query, header: header })
159
+ expect(http).to receive(:put).with(url, { body: body, query: query, header: header })
129
160
  client.put(url, body: body, query: query, header: header)
130
161
  end
131
162
 
@@ -4,7 +4,7 @@ require 'puppet/rest/route'
4
4
 
5
5
  describe Puppet::Rest::Route do
6
6
  describe '#with_base_url'do
7
- let(:dns_resolver) { stub_everything('dns resolver') }
7
+ let(:dns_resolver) { double('dns resolver') }
8
8
 
9
9
  context 'when not using SRV records' do
10
10
  before :each do
@@ -81,8 +81,8 @@ describe Puppet::Rest::Route do
81
81
  Puppet.settings[:use_srv_records] = true
82
82
  Puppet.settings[:srv_domain] = 'example.com'
83
83
 
84
- @dns_mock = mock('dns')
85
- Resolv::DNS.expects(:new).returns(@dns_mock)
84
+ @dns_mock = double('dns')
85
+ expect(Resolv::DNS).to receive(:new).and_return(@dns_mock)
86
86
 
87
87
  @port = 7502
88
88
  @target = 'example.com'
@@ -90,9 +90,9 @@ describe Puppet::Rest::Route do
90
90
  record.instance_variable_set(:@ttl, 10)
91
91
  @srv_records = [record]
92
92
 
93
- @dns_mock.expects(:getresources).
93
+ expect(@dns_mock).to receive(:getresources).
94
94
  with("_x-puppet-test_service._tcp.example.com", Resolv::DNS::Resource::IN::SRV).
95
- returns(@srv_records)
95
+ and_return(@srv_records)
96
96
  end
97
97
 
98
98
  it "yields a URL using the server and port from the SRV record" do
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/scheduler'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/scheduler'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/scheduler'
4
3
 
@@ -29,7 +28,7 @@ describe Puppet::Scheduler::SplayJob do
29
28
 
30
29
  it "is not immediately ready if splayed" do
31
30
  job.start_time = start_time
32
- job.expects(:splay).returns(6)
31
+ expect(job).to receive(:splay).and_return(6)
33
32
  expect(job.ready?(start_time)).not_to be
34
33
  end
35
34
  end
@@ -4,7 +4,7 @@ require 'puppet/settings'
4
4
  require 'puppet/settings/array_setting'
5
5
 
6
6
  describe Puppet::Settings::ArraySetting do
7
- subject { described_class.new(:settings => stub('settings'), :desc => "test") }
7
+ subject { described_class.new(:settings => double('settings'), :desc => "test") }
8
8
 
9
9
  it "is of type :array" do
10
10
  expect(subject.type).to eq :array
@@ -6,11 +6,11 @@ require 'puppet/type/file'
6
6
 
7
7
  describe Puppet::Settings::AutosignSetting do
8
8
  let(:settings) do
9
- s = stub('settings')
10
- s.stubs(:[]).with(:mkusers).returns true
11
- s.stubs(:[]).with(:user).returns 'puppet'
12
- s.stubs(:[]).with(:group).returns 'puppet'
13
- s.stubs(:[]).with(:manage_internal_file_permissions).returns true
9
+ s = double('settings')
10
+ allow(s).to receive(:[]).with(:mkusers).and_return(true)
11
+ allow(s).to receive(:[]).with(:user).and_return('puppet')
12
+ allow(s).to receive(:[]).with(:group).and_return('puppet')
13
+ allow(s).to receive(:[]).with(:manage_internal_file_permissions).and_return(true)
14
14
  s
15
15
  end
16
16
 
@@ -74,9 +74,9 @@ describe Puppet::Settings::AutosignSetting do
74
74
  describe "converting the setting to a resource" do
75
75
  it "converts the file path to a file resource", :if => !Puppet::Util::Platform.windows? do
76
76
  path = File.expand_path('/path/to/autosign.conf')
77
- settings.stubs(:value).with('autosign', nil, false).returns(path)
78
- Puppet::FileSystem.stubs(:exist?).with(path).returns true
79
- Puppet.features.expects(:root?).returns(true)
77
+ allow(settings).to receive(:value).with('autosign', nil, false).and_return(path)
78
+ allow(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
79
+ expect(Puppet.features).to receive(:root?).and_return(true)
80
80
 
81
81
  setting.mode = '0664'
82
82
  setting.owner = 'service'
@@ -92,7 +92,7 @@ describe Puppet::Settings::AutosignSetting do
92
92
  end
93
93
 
94
94
  it "returns nil when the setting is a boolean" do
95
- settings.stubs(:value).with('autosign', nil, false).returns 'true'
95
+ allow(settings).to receive(:value).with('autosign', nil, false).and_return('true')
96
96
 
97
97
  setting.mode = '0664'
98
98
  setting.owner = 'service'
@@ -4,7 +4,7 @@ require 'puppet/settings'
4
4
  require 'puppet/settings/certificate_revocation_setting'
5
5
 
6
6
  describe Puppet::Settings::CertificateRevocationSetting do
7
- subject { described_class.new(:settings => stub('settings'), :desc => "test") }
7
+ subject { described_class.new(:settings => double('settings'), :desc => "test") }
8
8
 
9
9
  it "is of type :certificate_revocation" do
10
10
  expect(subject.type).to eq :certificate_revocation
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby -S rspec
2
1
  require 'spec_helper'
3
2
  require 'puppet/settings/config_file'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/settings'
@@ -15,18 +14,14 @@ describe Puppet::Settings::DirectorySetting do
15
14
 
16
15
  describe "when being converted to a resource" do
17
16
  before do
18
- @settings = mock 'settings'
17
+ @settings = double('settings')
19
18
  @dir = Puppet::Settings::DirectorySetting.new(
20
19
  :settings => @settings, :desc => "eh", :name => :mydir, :section => "mysect")
21
- @settings.stubs(:value).with(:mydir).returns @basepath
20
+ allow(@settings).to receive(:value).with(:mydir).and_return(@basepath)
22
21
  end
23
22
 
24
23
  it "should return :directory as its type" do
25
24
  expect(@dir.type).to eq(:directory)
26
25
  end
27
-
28
-
29
-
30
26
  end
31
27
  end
32
-
@@ -1,11 +1,10 @@
1
- #!/usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/settings'
5
4
  require 'puppet/settings/duration_setting'
6
5
 
7
6
  describe Puppet::Settings::DurationSetting do
8
- subject { described_class.new(:settings => mock('settings'), :desc => "test") }
7
+ subject { described_class.new(:settings => double('settings'), :desc => "test") }
9
8
 
10
9
  describe "when munging the setting" do
11
10
  it "should return the same value if given an integer" do
@@ -19,7 +19,7 @@ describe Puppet::Settings::EnumSetting do
19
19
  end
20
20
 
21
21
  def enum_setting_allowing(*values)
22
- Puppet::Settings::EnumSetting.new(:settings => mock('settings'),
22
+ Puppet::Settings::EnumSetting.new(:settings => double('settings'),
23
23
  :name => "testing",
24
24
  :desc => "description of testing",
25
25
  :values => values)
@@ -5,14 +5,14 @@ describe Puppet::Settings::EnvironmentConf do
5
5
 
6
6
  def setup_environment_conf(config, conf_hash)
7
7
  conf_hash.each do |setting,value|
8
- config.expects(:setting).with(setting).returns(
9
- mock('setting', :value => value)
8
+ expect(config).to receive(:setting).with(setting).and_return(
9
+ double('setting', :value => value)
10
10
  )
11
11
  end
12
12
  end
13
13
 
14
14
  context "with config" do
15
- let(:config) { stub('config') }
15
+ let(:config) { double('config') }
16
16
  let(:envconf) { Puppet::Settings::EnvironmentConf.new("/some/direnv", config, ["/global/modulepath"]) }
17
17
 
18
18
  it "reads a modulepath from config and does not include global_module_path" do
@@ -91,12 +91,10 @@ describe Puppet::Settings::EnvironmentConf do
91
91
  end
92
92
 
93
93
  describe "with disable_per_environment_manifest" do
94
-
95
- let(:config) { stub('config') }
94
+ let(:config) { double('config') }
96
95
  let(:envconf) { Puppet::Settings::EnvironmentConf.new("/some/direnv", config, ["/global/modulepath"]) }
97
96
 
98
97
  context "set true" do
99
-
100
98
  before(:each) do
101
99
  Puppet[:default_manifest] = File.expand_path('/default/manifest')
102
100
  Puppet[:disable_per_environment_manifest] = true
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/settings'
@@ -19,13 +18,13 @@ describe Puppet::Settings::FileSetting do
19
18
  :service_group_available? => false
20
19
  }.merge(wanted_values)
21
20
 
22
- settings = mock("settings")
21
+ settings = double("settings")
23
22
 
24
- settings.stubs(:[]).with(:user).returns real_values[:user]
25
- settings.stubs(:[]).with(:group).returns real_values[:group]
26
- settings.stubs(:[]).with(:mkusers).returns real_values[:mkusers]
27
- settings.stubs(:service_user_available?).returns real_values[:service_user_available?]
28
- settings.stubs(:service_group_available?).returns real_values[:service_group_available?]
23
+ allow(settings).to receive(:[]).with(:user).and_return(real_values[:user])
24
+ allow(settings).to receive(:[]).with(:group).and_return(real_values[:group])
25
+ allow(settings).to receive(:[]).with(:mkusers).and_return(real_values[:mkusers])
26
+ allow(settings).to receive(:service_user_available?).and_return(real_values[:service_user_available?])
27
+ allow(settings).to receive(:service_group_available?).and_return(real_values[:service_group_available?])
29
28
 
30
29
  settings
31
30
  end
@@ -120,16 +119,16 @@ describe Puppet::Settings::FileSetting do
120
119
  end
121
120
 
122
121
  it "should be able to be converted into a resource" do
123
- expect(FileSetting.new(:settings => mock("settings"), :desc => "eh")).to respond_to(:to_resource)
122
+ expect(FileSetting.new(:settings => double("settings"), :desc => "eh")).to respond_to(:to_resource)
124
123
  end
125
124
 
126
125
  describe "when being converted to a resource" do
127
126
  before do
128
127
  @basepath = make_absolute("/somepath")
129
- @settings = mock 'settings'
128
+ @settings = double('settings')
130
129
  @file = Puppet::Settings::FileSetting.new(:settings => @settings, :desc => "eh", :name => :myfile, :section => "mysect")
131
- @file.stubs(:create_files?).returns true
132
- @settings.stubs(:value).with(:myfile, nil, false).returns @basepath
130
+ allow(@file).to receive(:create_files?).and_return(true)
131
+ allow(@settings).to receive(:value).with(:myfile, nil, false).and_return(@basepath)
133
132
  end
134
133
 
135
134
  it "should return :file as its type" do
@@ -137,29 +136,29 @@ describe Puppet::Settings::FileSetting do
137
136
  end
138
137
 
139
138
  it "should skip non-existent files if 'create_files' is not enabled" do
140
- @file.expects(:create_files?).returns false
141
- @file.expects(:type).returns :file
142
- Puppet::FileSystem.expects(:exist?).with(@basepath).returns false
139
+ expect(@file).to receive(:create_files?).and_return(false)
140
+ expect(@file).to receive(:type).and_return(:file)
141
+ expect(Puppet::FileSystem).to receive(:exist?).with(@basepath).and_return(false)
143
142
  expect(@file.to_resource).to be_nil
144
143
  end
145
144
 
146
145
  it "should manage existent files even if 'create_files' is not enabled" do
147
- @file.expects(:create_files?).returns false
148
- @file.expects(:type).returns :file
149
- Puppet::FileSystem.stubs(:exist?)
150
- Puppet::FileSystem.expects(:exist?).with(@basepath).returns true
146
+ expect(@file).to receive(:create_files?).and_return(false)
147
+ expect(@file).to receive(:type).and_return(:file)
148
+ allow(Puppet::FileSystem).to receive(:exist?)
149
+ expect(Puppet::FileSystem).to receive(:exist?).with(@basepath).and_return(true)
151
150
  expect(@file.to_resource).to be_instance_of(Puppet::Resource)
152
151
  end
153
152
 
154
153
  describe "on POSIX systems", :if => Puppet.features.posix? do
155
154
  it "should skip files in /dev" do
156
- @settings.stubs(:value).with(:myfile, nil, false).returns "/dev/file"
155
+ allow(@settings).to receive(:value).with(:myfile, nil, false).and_return("/dev/file")
157
156
  expect(@file.to_resource).to be_nil
158
157
  end
159
158
  end
160
159
 
161
160
  it "should skip files whose paths are not strings" do
162
- @settings.stubs(:value).with(:myfile, nil, false).returns :foo
161
+ allow(@settings).to receive(:value).with(:myfile, nil, false).and_return(:foo)
163
162
  expect(@file.to_resource).to be_nil
164
163
  end
165
164
 
@@ -176,7 +175,7 @@ describe Puppet::Settings::FileSetting do
176
175
  end
177
176
 
178
177
  it "should fully qualified returned files if necessary (#795)" do
179
- @settings.stubs(:value).with(:myfile, nil, false).returns "myfile"
178
+ allow(@settings).to receive(:value).with(:myfile, nil, false).and_return("myfile")
180
179
  path = File.expand_path('myfile')
181
180
  expect(@file.to_resource.title).to eq(path)
182
181
  end
@@ -198,82 +197,81 @@ describe Puppet::Settings::FileSetting do
198
197
  it "should not set the mode on a the file if manage_internal_file_permissions is disabled" do
199
198
  Puppet[:manage_internal_file_permissions] = false
200
199
 
201
- @file.stubs(:mode).returns(0755)
200
+ allow(@file).to receive(:mode).and_return(0755)
202
201
 
203
202
  expect(@file.to_resource[:mode]).to eq(nil)
204
203
  end
205
204
 
206
205
  it "should set the owner if running as root and the owner is provided" do
207
206
  Puppet[:manage_internal_file_permissions] = true
208
- Puppet.features.expects(:root?).returns true
209
- Puppet::Util::Platform.stubs(:windows?).returns false
210
- @file.stubs(:owner).returns "foo"
207
+ expect(Puppet.features).to receive(:root?).and_return(true)
208
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
209
+ allow(@file).to receive(:owner).and_return("foo")
211
210
 
212
211
  expect(@file.to_resource[:owner]).to eq("foo")
213
212
  end
214
213
 
215
214
  it "should not set the owner if manage_internal_file_permissions is disabled" do
216
215
  Puppet[:manage_internal_file_permissions] = false
217
- Puppet.features.stubs(:root?).returns true
218
- @file.stubs(:owner).returns "foo"
216
+ allow(Puppet.features).to receive(:root?).and_return(true)
217
+ allow(@file).to receive(:owner).and_return("foo")
219
218
 
220
219
  expect(@file.to_resource[:owner]).to eq(nil)
221
220
  end
222
221
 
223
222
  it "should set the group if running as root and the group is provided" do
224
223
  Puppet[:manage_internal_file_permissions] = true
225
- Puppet.features.expects(:root?).returns true
226
- Puppet::Util::Platform.stubs(:windows?).returns false
227
- @file.stubs(:group).returns "foo"
224
+ expect(Puppet.features).to receive(:root?).and_return(true)
225
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
226
+ allow(@file).to receive(:group).and_return("foo")
228
227
 
229
228
  expect(@file.to_resource[:group]).to eq("foo")
230
229
  end
231
230
 
232
231
  it "should not set the group if manage_internal_file_permissions is disabled" do
233
232
  Puppet[:manage_internal_file_permissions] = false
234
- Puppet.features.stubs(:root?).returns true
235
- @file.stubs(:group).returns "foo"
233
+ allow(Puppet.features).to receive(:root?).and_return(true)
234
+ allow(@file).to receive(:group).and_return("foo")
236
235
 
237
236
  expect(@file.to_resource[:group]).to eq(nil)
238
237
  end
239
238
 
240
-
241
239
  it "should not set owner if not running as root" do
242
240
  Puppet[:manage_internal_file_permissions] = true
243
- Puppet.features.expects(:root?).returns false
244
- Puppet::Util::Platform.stubs(:windows?).returns false
245
- @file.stubs(:owner).returns "foo"
241
+ expect(Puppet.features).to receive(:root?).and_return(false)
242
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
243
+ allow(@file).to receive(:owner).and_return("foo")
246
244
 
247
245
  expect(@file.to_resource[:owner]).to be_nil
248
246
  end
249
247
 
250
248
  it "should not set group if not running as root" do
251
249
  Puppet[:manage_internal_file_permissions] = true
252
- Puppet.features.expects(:root?).returns false
253
- Puppet::Util::Platform.stubs(:windows?).returns false
254
- @file.stubs(:group).returns "foo"
250
+ expect(Puppet.features).to receive(:root?).and_return(false)
251
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
252
+ allow(@file).to receive(:group).and_return("foo")
255
253
 
256
254
  expect(@file.to_resource[:group]).to be_nil
257
255
  end
258
256
 
259
257
  describe "on Microsoft Windows systems" do
260
258
  before :each do
261
- Puppet::Util::Platform.stubs(:windows?).returns true
259
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
262
260
  end
263
261
 
264
262
  it "should not set owner" do
265
- @file.stubs(:owner).returns "foo"
263
+ allow(@file).to receive(:owner).and_return("foo")
266
264
  expect(@file.to_resource[:owner]).to be_nil
267
265
  end
268
266
 
269
267
  it "should not set group" do
270
- @file.stubs(:group).returns "foo"
268
+ allow(@file).to receive(:group).and_return("foo")
271
269
  expect(@file.to_resource[:group]).to be_nil
272
270
  end
273
271
  end
274
272
 
275
273
  it "should set :ensure to the file type" do
276
- @file.expects(:type).returns :directory
274
+ expect(@file).to receive(:type).and_return(:directory)
277
275
  expect(@file.to_resource[:ensure]).to eq(:directory)
278
276
  end
279
277
 
@@ -286,7 +284,7 @@ describe Puppet::Settings::FileSetting do
286
284
  end
287
285
 
288
286
  it "should tag the resource with the settings section" do
289
- @file.expects(:section).returns "mysect"
287
+ expect(@file).to receive(:section).and_return("mysect")
290
288
  expect(@file.to_resource).to be_tagged("mysect")
291
289
  end
292
290
 
@@ -305,7 +303,7 @@ describe Puppet::Settings::FileSetting do
305
303
 
306
304
  describe "#munge" do
307
305
  it 'does not expand the path of the special value :memory: so we can set dblocation to an in-memory database' do
308
- filesetting = FileSetting.new(:settings => mock("settings"), :desc => "eh")
306
+ filesetting = FileSetting.new(:settings => double("settings"), :desc => "eh")
309
307
  expect(filesetting.munge(':memory:')).to eq(':memory:')
310
308
  end
311
309
  end
@@ -316,7 +314,7 @@ describe Puppet::Settings::FileSetting do
316
314
  end
317
315
 
318
316
  let(:setting) do
319
- settings = mock("settings", :value => path)
317
+ settings = double("settings", :value => path)
320
318
  FileSetting.new(:name => :mysetting, :desc => "creates a file", :settings => settings)
321
319
  end
322
320