puppet 6.0.7-universal-darwin → 6.0.8-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 (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
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/network/http'
4
3
 
@@ -1,11 +1,10 @@
1
- #!/usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/network/resolver'
4
3
 
5
4
  describe Puppet::Network::Resolver do
6
5
  before do
7
- @dns_mock_object = mock('dns')
8
- Resolv::DNS.stubs(:new).returns(@dns_mock_object)
6
+ @dns_mock_object = double('dns')
7
+ allow(Resolv::DNS).to receive(:new).and_return(@dns_mock_object)
9
8
 
10
9
  @rr_type = Resolv::DNS::Resource::IN::SRV
11
10
  @test_srv_domain = "domain.com"
@@ -31,7 +30,7 @@ describe Puppet::Network::Resolver do
31
30
 
32
31
  describe 'when the domain is not known' do
33
32
  before :each do
34
- @dns_mock_object.stubs(:getresources).returns(@test_records)
33
+ allow(@dns_mock_object).to receive(:getresources).and_return(@test_records)
35
34
  end
36
35
 
37
36
  describe 'because domain is nil' do
@@ -55,10 +54,10 @@ describe Puppet::Network::Resolver do
55
54
 
56
55
  it "should not yield anything" do
57
56
  # No records returned for a DNS entry without any SRV records
58
- @dns_mock_object.expects(:getresources).with(
57
+ expect(@dns_mock_object).to receive(:getresources).with(
59
58
  "_x-puppet._tcp.#{@test_a_hostname}",
60
59
  @rr_type
61
- ).returns([])
60
+ ).and_return([])
62
61
 
63
62
  resolver.each_srv_record(@test_a_hostname) do |hostname, port, remaining|
64
63
  raise Exception.new("host with no records passed block")
@@ -76,10 +75,10 @@ describe Puppet::Network::Resolver do
76
75
  2 => ["puppet4.domain.com"]
77
76
  }
78
77
 
79
- @dns_mock_object.expects(:getresources).with(
78
+ expect(@dns_mock_object).to receive(:getresources).with(
80
79
  "_x-puppet._tcp.#{@test_srv_domain}",
81
80
  @rr_type
82
- ).returns(@test_records)
81
+ ).and_return(@test_records)
83
82
 
84
83
  resolver.each_srv_record(@test_srv_domain) do |hostname, port|
85
84
  expected_priority = order.keys.min
@@ -104,15 +103,15 @@ describe Puppet::Network::Resolver do
104
103
  2 => ["puppet4.domain.com"]
105
104
  }
106
105
 
107
- @dns_mock_object.expects(:getresources).with(
106
+ expect(@dns_mock_object).to receive(:getresources).with(
108
107
  "_x-puppet-report._tcp.#{@test_srv_domain}",
109
108
  @rr_type
110
- ).returns([])
109
+ ).and_return([])
111
110
 
112
- @dns_mock_object.expects(:getresources).with(
111
+ expect(@dns_mock_object).to receive(:getresources).with(
113
112
  "_x-puppet._tcp.#{@test_srv_domain}",
114
113
  @rr_type
115
- ).returns(@test_records)
114
+ ).and_return(@test_records)
116
115
 
117
116
  resolver.each_srv_record(@test_srv_domain, :report) do |hostname, port|
118
117
  expected_priority = order.keys.min
@@ -145,15 +144,15 @@ describe Puppet::Network::Resolver do
145
144
  Resolv::DNS::Resource::IN::SRV.new(4, 1, 8140, "puppet4.bad.domain.com")
146
145
  ]
147
146
 
148
- @dns_mock_object.expects(:getresources).with(
147
+ expect(@dns_mock_object).to receive(:getresources).with(
149
148
  "_x-puppet-report._tcp.#{@test_srv_domain}",
150
149
  @rr_type
151
- ).returns(@test_records)
150
+ ).and_return(@test_records)
152
151
 
153
- @dns_mock_object.stubs(:getresources).with(
152
+ allow(@dns_mock_object).to receive(:getresources).with(
154
153
  "_x-puppet._tcp.#{@test_srv_domain}",
155
154
  @rr_type
156
- ).returns(bad_records)
155
+ ).and_return(bad_records)
157
156
 
158
157
  resolver.each_srv_record(@test_srv_domain, :report) do |hostname, port|
159
158
  expected_priority = order.keys.min
@@ -200,7 +199,7 @@ describe Puppet::Network::Resolver do
200
199
  end
201
200
 
202
201
  total_weight.times do |n|
203
- Kernel.expects(:rand).once.with(total_weight).returns(n)
202
+ expect(Kernel).to receive(:rand).once.with(total_weight).and_return(n)
204
203
  server = resolver.find_weighted_server(records)
205
204
  seen[server] += 1
206
205
  end
@@ -215,10 +214,10 @@ describe Puppet::Network::Resolver do
215
214
 
216
215
  describe "caching records" do
217
216
  it "should query DNS when no cache entry exists, then retrieve the cached value" do
218
- @dns_mock_object.expects(:getresources).with(
217
+ expect(@dns_mock_object).to receive(:getresources).with(
219
218
  "_x-puppet._tcp.#{@test_srv_domain}",
220
219
  @rr_type
221
- ).returns(@test_records).once
220
+ ).and_return(@test_records).once
222
221
 
223
222
  fetched_servers = []
224
223
  resolver.each_srv_record(@test_srv_domain) do |server, port|
@@ -226,7 +225,7 @@ describe Puppet::Network::Resolver do
226
225
  end
227
226
 
228
227
  cached_servers = []
229
- resolver.expects(:expired?).returns false
228
+ expect(resolver).to receive(:expired?).and_return(false)
230
229
  resolver.each_srv_record(@test_srv_domain) do |server, port|
231
230
  cached_servers << server
232
231
  end
@@ -242,10 +241,10 @@ describe Puppet::Network::Resolver do
242
241
  ttl_record2.instance_variable_set(:@ttl, 20)
243
242
  records = [ttl_record1, ttl_record2]
244
243
 
245
- @dns_mock_object.expects(:getresources).with(
244
+ expect(@dns_mock_object).to receive(:getresources).with(
246
245
  "_x-puppet._tcp.#{@test_srv_domain}",
247
246
  @rr_type
248
- ).returns(records)
247
+ ).and_return(records)
249
248
  end
250
249
 
251
250
  it "should save the shortest TTL among records for a service" do
@@ -259,7 +258,7 @@ describe Puppet::Network::Resolver do
259
258
  expect(server).to match(/puppet.*domain\.com/)
260
259
  end
261
260
 
262
- resolver.expects(:expired?).with(:puppet).returns false
261
+ expect(resolver).to receive(:expired?).with(:puppet).and_return(false)
263
262
  # Load from cache
264
263
  resolver.each_srv_record(@test_srv_domain) do |server, port|
265
264
  expect(server).to match(/puppet.*domain\.com/)
@@ -267,11 +266,11 @@ describe Puppet::Network::Resolver do
267
266
 
268
267
  new_record = Resolv::DNS::Resource::IN::SRV.new(0, 20, 8140, "new.domain.com")
269
268
  new_record.instance_variable_set(:@ttl, 10)
270
- @dns_mock_object.expects(:getresources).with(
269
+ expect(@dns_mock_object).to receive(:getresources).with(
271
270
  "_x-puppet._tcp.#{@test_srv_domain}",
272
271
  @rr_type
273
- ).returns([new_record])
274
- resolver.expects(:expired?).with(:puppet).returns true
272
+ ).and_return([new_record])
273
+ expect(resolver).to receive(:expired?).with(:puppet).and_return(true)
275
274
  # Refresh from DNS
276
275
  resolver.each_srv_record(@test_srv_domain) do |server, port|
277
276
  expect(server).to eq("new.domain.com")
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/network/rights'
@@ -118,58 +117,58 @@ describe Puppet::Network::Rights do
118
117
 
119
118
  describe "when checking if right is allowed" do
120
119
  before :each do
121
- @right.stubs(:right).returns(nil)
120
+ allow(@right).to receive(:right).and_return(nil)
122
121
 
123
- @pathacl = stub 'pathacl', :"<=>" => 1, :line => 0, :file => 'dummy'
124
- Puppet::Network::Rights::Right.stubs(:new).returns(@pathacl)
122
+ @pathacl = double('pathacl', :"<=>" => 1, :line => 0, :file => 'dummy')
123
+ allow(Puppet::Network::Rights::Right).to receive(:new).and_return(@pathacl)
125
124
  end
126
125
 
127
126
  it "should delegate to is_forbidden_and_why?" do
128
- @right.expects(:is_forbidden_and_why?).with("namespace", :node => "host.domain.com", :ip => "127.0.0.1").returns(nil)
127
+ expect(@right).to receive(:is_forbidden_and_why?).with("namespace", :node => "host.domain.com", :ip => "127.0.0.1").and_return(nil)
129
128
 
130
129
  @right.allowed?("namespace", "host.domain.com", "127.0.0.1")
131
130
  end
132
131
 
133
132
  it "should return true if is_forbidden_and_why? returns nil" do
134
- @right.stubs(:is_forbidden_and_why?).returns(nil)
133
+ allow(@right).to receive(:is_forbidden_and_why?).and_return(nil)
135
134
  expect(@right.allowed?("namespace", :args)).to be_truthy
136
135
  end
137
136
 
138
137
  it "should return false if is_forbidden_and_why? returns an AuthorizationError" do
139
- @right.stubs(:is_forbidden_and_why?).returns(Puppet::Network::AuthorizationError.new("forbidden"))
138
+ allow(@right).to receive(:is_forbidden_and_why?).and_return(Puppet::Network::AuthorizationError.new("forbidden"))
140
139
  expect(@right.allowed?("namespace", :args1, :args2)).to be_falsey
141
140
  end
142
141
 
143
142
  it "should pass the match? return to allowed?" do
144
143
  @right.newright("/path/to/there")
145
144
 
146
- @pathacl.expects(:match?).returns(:match)
147
- @pathacl.expects(:allowed?).with { |node,ip,h| h[:match] == :match }.returns(true)
145
+ expect(@pathacl).to receive(:match?).and_return(:match)
146
+ expect(@pathacl).to receive(:allowed?).with(anything, anything, hash_including(match: :match)).and_return(true)
148
147
 
149
148
  expect(@right.is_forbidden_and_why?("/path/to/there", {})).to eq(nil)
150
149
  end
151
150
 
152
151
  describe "with path acls" do
153
152
  before :each do
154
- @long_acl = stub 'longpathacl', :name => "/path/to/there", :line => 0, :file => 'dummy'
155
- Puppet::Network::Rights::Right.stubs(:new).with("/path/to/there", 0, nil).returns(@long_acl)
153
+ @long_acl = double('longpathacl', :name => "/path/to/there", :line => 0, :file => 'dummy')
154
+ allow(Puppet::Network::Rights::Right).to receive(:new).with("/path/to/there", 0, nil).and_return(@long_acl)
156
155
 
157
- @short_acl = stub 'shortpathacl', :name => "/path/to", :line => 0, :file => 'dummy'
158
- Puppet::Network::Rights::Right.stubs(:new).with("/path/to", 0, nil).returns(@short_acl)
156
+ @short_acl = double('shortpathacl', :name => "/path/to", :line => 0, :file => 'dummy')
157
+ allow(Puppet::Network::Rights::Right).to receive(:new).with("/path/to", 0, nil).and_return(@short_acl)
159
158
 
160
- @long_acl.stubs(:"<=>").with(@short_acl).returns(0)
161
- @short_acl.stubs(:"<=>").with(@long_acl).returns(0)
159
+ allow(@long_acl).to receive(:"<=>").with(@short_acl).and_return(0)
160
+ allow(@short_acl).to receive(:"<=>").with(@long_acl).and_return(0)
162
161
  end
163
162
 
164
163
  it "should select the first match" do
165
164
  @right.newright("/path/to", 0)
166
165
  @right.newright("/path/to/there", 0)
167
166
 
168
- @long_acl.stubs(:match?).returns(true)
169
- @short_acl.stubs(:match?).returns(true)
167
+ allow(@long_acl).to receive(:match?).and_return(true)
168
+ allow(@short_acl).to receive(:match?).and_return(true)
170
169
 
171
- @short_acl.expects(:allowed?).returns(true)
172
- @long_acl.expects(:allowed?).never
170
+ expect(@short_acl).to receive(:allowed?).and_return(true)
171
+ expect(@long_acl).not_to receive(:allowed?)
173
172
 
174
173
  expect(@right.is_forbidden_and_why?("/path/to/there/and/there", {})).to eq(nil)
175
174
  end
@@ -178,11 +177,11 @@ describe Puppet::Network::Rights do
178
177
  @right.newright("/path/to/there", 0, nil)
179
178
  @right.newright("/path/to", 0, nil)
180
179
 
181
- @long_acl.stubs(:match?).returns(true)
182
- @short_acl.stubs(:match?).returns(true)
180
+ allow(@long_acl).to receive(:match?).and_return(true)
181
+ allow(@short_acl).to receive(:match?).and_return(true)
183
182
 
184
- @long_acl.expects(:allowed?).returns(:dunno)
185
- @short_acl.expects(:allowed?).returns(true)
183
+ expect(@long_acl).to receive(:allowed?).and_return(:dunno)
184
+ expect(@short_acl).to receive(:allowed?).and_return(true)
186
185
 
187
186
  expect(@right.is_forbidden_and_why?("/path/to/there/and/there", {})).to eq(nil)
188
187
  end
@@ -191,11 +190,11 @@ describe Puppet::Network::Rights do
191
190
  @right.newright("/path/to/there", 0)
192
191
  @right.newright("/path/to", 0)
193
192
 
194
- @long_acl.stubs(:match?).returns(false)
195
- @short_acl.stubs(:match?).returns(true)
193
+ allow(@long_acl).to receive(:match?).and_return(false)
194
+ allow(@short_acl).to receive(:match?).and_return(true)
196
195
 
197
- @long_acl.expects(:allowed?).never
198
- @short_acl.expects(:allowed?).returns(true)
196
+ expect(@long_acl).not_to receive(:allowed?)
197
+ expect(@short_acl).to receive(:allowed?).and_return(true)
199
198
 
200
199
  expect(@right.is_forbidden_and_why?("/path/to/there/and/there", {})).to eq(nil)
201
200
  end
@@ -203,8 +202,8 @@ describe Puppet::Network::Rights do
203
202
  it "should not raise an AuthorizationError if allowed" do
204
203
  @right.newright("/path/to/there", 0)
205
204
 
206
- @long_acl.stubs(:match?).returns(true)
207
- @long_acl.stubs(:allowed?).returns(true)
205
+ allow(@long_acl).to receive(:match?).and_return(true)
206
+ allow(@long_acl).to receive(:allowed?).and_return(true)
208
207
 
209
208
  expect(@right.is_forbidden_and_why?("/path/to/there/and/there", {})).to eq(nil)
210
209
  end
@@ -212,8 +211,8 @@ describe Puppet::Network::Rights do
212
211
  it "should raise an AuthorizationError if the match is denied" do
213
212
  @right.newright("/path/to/there", 0, nil)
214
213
 
215
- @long_acl.stubs(:match?).returns(true)
216
- @long_acl.stubs(:allowed?).returns(false)
214
+ allow(@long_acl).to receive(:match?).and_return(true)
215
+ allow(@long_acl).to receive(:allowed?).and_return(false)
217
216
 
218
217
  expect(@right.is_forbidden_and_why?("/path/to/there", {})).to be_instance_of(Puppet::Network::AuthorizationError)
219
218
  end
@@ -225,25 +224,25 @@ describe Puppet::Network::Rights do
225
224
 
226
225
  describe "with regex acls" do
227
226
  before :each do
228
- @regex_acl1 = stub 'regex_acl1', :name => "/files/(.*)/myfile", :line => 0, :file => 'dummy'
229
- Puppet::Network::Rights::Right.stubs(:new).with("~ /files/(.*)/myfile", 0, nil).returns(@regex_acl1)
227
+ @regex_acl1 = double('regex_acl1', :name => "/files/(.*)/myfile", :line => 0, :file => 'dummy')
228
+ allow(Puppet::Network::Rights::Right).to receive(:new).with("~ /files/(.*)/myfile", 0, nil).and_return(@regex_acl1)
230
229
 
231
- @regex_acl2 = stub 'regex_acl2', :name => "/files/(.*)/myfile/", :line => 0, :file => 'dummy'
232
- Puppet::Network::Rights::Right.stubs(:new).with("~ /files/(.*)/myfile/", 0, nil).returns(@regex_acl2)
230
+ @regex_acl2 = double('regex_acl2', :name => "/files/(.*)/myfile/", :line => 0, :file => 'dummy')
231
+ allow(Puppet::Network::Rights::Right).to receive(:new).with("~ /files/(.*)/myfile/", 0, nil).and_return(@regex_acl2)
233
232
 
234
- @regex_acl1.stubs(:"<=>").with(@regex_acl2).returns(0)
235
- @regex_acl2.stubs(:"<=>").with(@regex_acl1).returns(0)
233
+ allow(@regex_acl1).to receive(:"<=>").with(@regex_acl2).and_return(0)
234
+ allow(@regex_acl2).to receive(:"<=>").with(@regex_acl1).and_return(0)
236
235
  end
237
236
 
238
237
  it "should select the first match" do
239
238
  @right.newright("~ /files/(.*)/myfile", 0)
240
239
  @right.newright("~ /files/(.*)/myfile/", 0)
241
240
 
242
- @regex_acl1.stubs(:match?).returns(true)
243
- @regex_acl2.stubs(:match?).returns(true)
241
+ allow(@regex_acl1).to receive(:match?).and_return(true)
242
+ allow(@regex_acl2).to receive(:match?).and_return(true)
244
243
 
245
- @regex_acl1.expects(:allowed?).returns(true)
246
- @regex_acl2.expects(:allowed?).never
244
+ expect(@regex_acl1).to receive(:allowed?).and_return(true)
245
+ expect(@regex_acl2).not_to receive(:allowed?)
247
246
 
248
247
  expect(@right.is_forbidden_and_why?("/files/repository/myfile/other", {})).to eq(nil)
249
248
  end
@@ -252,11 +251,11 @@ describe Puppet::Network::Rights do
252
251
  @right.newright("~ /files/(.*)/myfile", 0)
253
252
  @right.newright("~ /files/(.*)/myfile/", 0)
254
253
 
255
- @regex_acl1.stubs(:match?).returns(true)
256
- @regex_acl2.stubs(:match?).returns(true)
254
+ allow(@regex_acl1).to receive(:match?).and_return(true)
255
+ allow(@regex_acl2).to receive(:match?).and_return(true)
257
256
 
258
- @regex_acl1.expects(:allowed?).returns(:dunno)
259
- @regex_acl2.expects(:allowed?).returns(true)
257
+ expect(@regex_acl1).to receive(:allowed?).and_return(:dunno)
258
+ expect(@regex_acl2).to receive(:allowed?).and_return(true)
260
259
 
261
260
  expect(@right.is_forbidden_and_why?("/files/repository/myfile/other", {})).to eq(nil)
262
261
  end
@@ -265,11 +264,11 @@ describe Puppet::Network::Rights do
265
264
  @right.newright("~ /files/(.*)/myfile", 0)
266
265
  @right.newright("~ /files/(.*)/myfile/", 0)
267
266
 
268
- @regex_acl1.stubs(:match?).returns(false)
269
- @regex_acl2.stubs(:match?).returns(true)
267
+ allow(@regex_acl1).to receive(:match?).and_return(false)
268
+ allow(@regex_acl2).to receive(:match?).and_return(true)
270
269
 
271
- @regex_acl1.expects(:allowed?).never
272
- @regex_acl2.expects(:allowed?).returns(true)
270
+ expect(@regex_acl1).not_to receive(:allowed?)
271
+ expect(@regex_acl2).to receive(:allowed?).and_return(true)
273
272
 
274
273
  expect(@right.is_forbidden_and_why?("/files/repository/myfile/other", {})).to eq(nil)
275
274
  end
@@ -277,8 +276,8 @@ describe Puppet::Network::Rights do
277
276
  it "should not raise an AuthorizationError if allowed" do
278
277
  @right.newright("~ /files/(.*)/myfile", 0)
279
278
 
280
- @regex_acl1.stubs(:match?).returns(true)
281
- @regex_acl1.stubs(:allowed?).returns(true)
279
+ allow(@regex_acl1).to receive(:match?).and_return(true)
280
+ allow(@regex_acl1).to receive(:allowed?).and_return(true)
282
281
 
283
282
  expect(@right.is_forbidden_and_why?("/files/repository/myfile/other", {})).to eq(nil)
284
283
  end
@@ -425,13 +424,13 @@ describe Puppet::Network::Rights do
425
424
  end
426
425
 
427
426
  it "should interpolate allow/deny patterns with the given match" do
428
- @acl.expects(:interpolate).with(:match)
427
+ expect(@acl).to receive(:interpolate).with(:match)
429
428
 
430
429
  @acl.allowed?("me","127.0.0.1", { :method => :save, :match => :match, :authenticated => true })
431
430
  end
432
431
 
433
432
  it "should reset interpolation after the match" do
434
- @acl.expects(:reset_interpolation)
433
+ expect(@acl).to receive(:reset_interpolation)
435
434
 
436
435
  @acl.allowed?("me","127.0.0.1", { :method => :save, :match => :match, :authenticated => true })
437
436
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'tmpdir'
@@ -112,7 +111,7 @@ describe Puppet::Node::Environment do
112
111
 
113
112
  describe "when managing known resource types" do
114
113
  before do
115
- env.stubs(:perform_initial_import).returns(Puppet::Parser::AST::Hostclass.new(''))
114
+ allow(env).to receive(:perform_initial_import).and_return(Puppet::Parser::AST::Hostclass.new(''))
116
115
  end
117
116
 
118
117
  it "creates a resource type collection if none exists" do
@@ -124,13 +123,13 @@ describe Puppet::Node::Environment do
124
123
  end
125
124
 
126
125
  it "performs the initial import when creating a new collection" do
127
- env.expects(:perform_initial_import).returns(Puppet::Parser::AST::Hostclass.new(''))
126
+ expect(env).to receive(:perform_initial_import).and_return(Puppet::Parser::AST::Hostclass.new(''))
128
127
  env.known_resource_types
129
128
  end
130
129
 
131
130
  it "generates a new TypeCollection if the current one requires reparsing" do
132
131
  old_type_collection = env.known_resource_types
133
- old_type_collection.stubs(:parse_failed?).returns true
132
+ allow(old_type_collection).to receive(:parse_failed?).and_return(true)
134
133
 
135
134
  env.check_for_reparse
136
135
 
@@ -171,7 +170,7 @@ describe Puppet::Node::Environment do
171
170
  end
172
171
 
173
172
  context "when disable_per_environment_manifest is true" do
174
- let(:config) { mock('config') }
173
+ let(:config) { double('config') }
175
174
  let(:global_modulepath) { ["/global/modulepath"] }
176
175
  let(:envconf) { Puppet::Settings::EnvironmentConf.new("/some/direnv", config, global_modulepath) }
177
176
 
@@ -180,12 +179,12 @@ describe Puppet::Node::Environment do
180
179
  end
181
180
 
182
181
  def assert_manifest_conflict(expectation, envconf_manifest_value)
183
- config.expects(:setting).with(:manifest).returns(
184
- mock('setting', :value => envconf_manifest_value)
182
+ expect(config).to receive(:setting).with(:manifest).and_return(
183
+ double('setting', :value => envconf_manifest_value)
185
184
  )
186
185
  environment = Puppet::Node::Environment.create(:directory, [], '/default/manifests/site.pp')
187
186
  loader = Puppet::Environments::Static.new(environment)
188
- loader.stubs(:get_conf).returns(envconf)
187
+ allow(loader).to receive(:get_conf).and_return(envconf)
189
188
 
190
189
  Puppet.override(:environments => loader) do
191
190
  if expectation
@@ -404,7 +403,7 @@ describe Puppet::Node::Environment do
404
403
  it "creates modules with the correct environment" do
405
404
  PuppetSpec::Modules.generate_files('foo', first_modulepath)
406
405
 
407
- env.modules.each do |mod|
406
+ env.modules.each do |mod|
408
407
  expect(mod.environment).to eq(env)
409
408
  end
410
409
  end
@@ -419,7 +418,7 @@ describe Puppet::Node::Environment do
419
418
  }
420
419
  )
421
420
 
422
- Puppet.expects(:log_exception).with(is_a(Puppet::Module::MissingMetadata))
421
+ expect(Puppet).to receive(:log_exception).with(be_a(Puppet::Module::MissingMetadata))
423
422
 
424
423
  env.modules
425
424
  end
@@ -431,7 +430,7 @@ describe Puppet::Node::Environment do
431
430
  let(:loaders) { Puppet::Pops::Loaders.new(env) }
432
431
 
433
432
  before(:each) do
434
- Puppet::Parser::Compiler.any_instance.stubs(:loaders).returns(loaders)
433
+ allow_any_instance_of(Puppet::Parser::Compiler).to receive(:loaders).and_return(loaders)
435
434
  Puppet.push_context({:loaders => loaders, :current_environment => env})
436
435
  end
437
436
 
@@ -495,9 +494,9 @@ describe Puppet::Node::Environment do
495
494
 
496
495
  describe "managing module translations" do
497
496
  it "creates a new text domain the first time we try to use the text domain" do
498
- Puppet::GettextConfig.expects(:reset_text_domain).with(env.name)
499
- Puppet::ModuleTranslations.expects(:load_from_modulepath)
500
- Puppet::GettextConfig.expects(:clear_text_domain)
497
+ expect(Puppet::GettextConfig).to receive(:reset_text_domain).with(env.name)
498
+ expect(Puppet::ModuleTranslations).to receive(:load_from_modulepath)
499
+ expect(Puppet::GettextConfig).to receive(:clear_text_domain)
501
500
 
502
501
  env.with_text_domain do; end
503
502
  end
@@ -505,7 +504,7 @@ describe Puppet::Node::Environment do
505
504
  it "uses the existing text domain once it has been created" do
506
505
  env.with_text_domain do; end
507
506
 
508
- Puppet::GettextConfig.expects(:use_text_domain).with(env.name)
507
+ expect(Puppet::GettextConfig).to receive(:use_text_domain).with(env.name)
509
508
  env.with_text_domain do; end
510
509
  end
511
510