puppet 6.4.0-x64-mingw32 → 6.4.1-x64-mingw32

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

Potentially problematic release.


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

Files changed (646) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +7 -11
  4. data/lib/puppet/application/device.rb +97 -82
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/application/ssl.rb +2 -2
  7. data/lib/puppet/configurer.rb +5 -4
  8. data/lib/puppet/defaults.rb +33 -11
  9. data/lib/puppet/indirector/request.rb +28 -15
  10. data/lib/puppet/ssl.rb +1 -1
  11. data/lib/puppet/ssl/certificate.rb +1 -1
  12. data/lib/puppet/ssl/error.rb +1 -1
  13. data/lib/puppet/ssl/host.rb +0 -47
  14. data/lib/puppet/ssl/ssl_provider.rb +2 -2
  15. data/lib/puppet/ssl/state_machine.rb +16 -17
  16. data/lib/puppet/ssl/validator/default_validator.rb +4 -4
  17. data/lib/puppet/ssl/verifier.rb +1 -1
  18. data/lib/puppet/transaction/event_manager.rb +1 -5
  19. data/lib/puppet/util/connection.rb +15 -8
  20. data/lib/puppet/util/monkey_patches.rb +20 -1
  21. data/lib/puppet/version.rb +1 -1
  22. data/locales/puppet.pot +135 -68
  23. data/man/man5/puppet.conf.5 +9 -9
  24. data/man/man8/puppet-agent.8 +1 -1
  25. data/man/man8/puppet-apply.8 +1 -1
  26. data/man/man8/puppet-catalog.8 +1 -1
  27. data/man/man8/puppet-config.8 +1 -1
  28. data/man/man8/puppet-describe.8 +1 -1
  29. data/man/man8/puppet-device.8 +1 -1
  30. data/man/man8/puppet-doc.8 +1 -1
  31. data/man/man8/puppet-epp.8 +1 -1
  32. data/man/man8/puppet-facts.8 +1 -1
  33. data/man/man8/puppet-filebucket.8 +1 -1
  34. data/man/man8/puppet-generate.8 +1 -1
  35. data/man/man8/puppet-help.8 +1 -1
  36. data/man/man8/puppet-key.8 +1 -1
  37. data/man/man8/puppet-lookup.8 +1 -1
  38. data/man/man8/puppet-man.8 +1 -1
  39. data/man/man8/puppet-module.8 +1 -1
  40. data/man/man8/puppet-node.8 +1 -1
  41. data/man/man8/puppet-parser.8 +1 -1
  42. data/man/man8/puppet-plugin.8 +1 -1
  43. data/man/man8/puppet-report.8 +1 -1
  44. data/man/man8/puppet-resource.8 +1 -1
  45. data/man/man8/puppet-script.8 +1 -1
  46. data/man/man8/puppet-ssl.8 +1 -1
  47. data/man/man8/puppet-status.8 +1 -1
  48. data/man/man8/puppet.8 +2 -2
  49. data/spec/integration/agent/logging_spec.rb +5 -7
  50. data/spec/integration/application/apply_spec.rb +18 -16
  51. data/spec/integration/application/doc_spec.rb +1 -2
  52. data/spec/integration/application/lookup_spec.rb +5 -5
  53. data/spec/integration/configurer_spec.rb +5 -6
  54. data/spec/integration/defaults_spec.rb +5 -6
  55. data/spec/integration/directory_environments_spec.rb +1 -1
  56. data/spec/integration/faces/config_spec.rb +3 -4
  57. data/spec/integration/faces/documentation_spec.rb +0 -1
  58. data/spec/integration/faces/plugin_spec.rb +1 -1
  59. data/spec/integration/file_bucket/file_spec.rb +2 -4
  60. data/spec/integration/file_serving/content_spec.rb +0 -1
  61. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  62. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  63. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  64. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  65. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  66. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  67. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  68. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  69. data/spec/integration/network/authconfig_spec.rb +23 -24
  70. data/spec/integration/network/formats_spec.rb +0 -1
  71. data/spec/integration/network/http_pool_spec.rb +3 -3
  72. data/spec/integration/node/environment_spec.rb +0 -1
  73. data/spec/integration/node/facts_spec.rb +9 -10
  74. data/spec/integration/node_spec.rb +6 -7
  75. data/spec/integration/parser/catalog_spec.rb +1 -5
  76. data/spec/integration/parser/collection_spec.rb +1 -2
  77. data/spec/integration/parser/compiler_spec.rb +6 -6
  78. data/spec/integration/parser/scope_spec.rb +1 -1
  79. data/spec/integration/parser/undef_param_spec.rb +1 -1
  80. data/spec/integration/provider/service/init_spec.rb +4 -5
  81. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  82. data/spec/integration/provider/service/windows_spec.rb +1 -2
  83. data/spec/integration/reference/providers_spec.rb +1 -2
  84. data/spec/integration/reports_spec.rb +1 -2
  85. data/spec/integration/resource/catalog_spec.rb +14 -17
  86. data/spec/integration/resource/type_collection_spec.rb +4 -5
  87. data/spec/integration/rest/client_spec.rb +1 -1
  88. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  89. data/spec/integration/ssl/host_spec.rb +1 -2
  90. data/spec/integration/ssl/key_spec.rb +0 -1
  91. data/spec/integration/test/test_helper_spec.rb +0 -1
  92. data/spec/integration/transaction/report_spec.rb +6 -11
  93. data/spec/integration/transaction_spec.rb +18 -19
  94. data/spec/integration/type/exec_spec.rb +0 -1
  95. data/spec/integration/type/file_spec.rb +13 -14
  96. data/spec/integration/type/package_spec.rb +19 -23
  97. data/spec/integration/type/tidy_spec.rb +1 -2
  98. data/spec/integration/type_spec.rb +0 -1
  99. data/spec/integration/util/autoload_spec.rb +1 -2
  100. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  101. data/spec/integration/util/settings_spec.rb +0 -1
  102. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  103. data/spec/integration/util/windows/principal_spec.rb +0 -1
  104. data/spec/integration/util/windows/process_spec.rb +4 -6
  105. data/spec/integration/util/windows/registry_spec.rb +41 -51
  106. data/spec/integration/util/windows/security_spec.rb +2 -4
  107. data/spec/integration/util/windows/user_spec.rb +18 -20
  108. data/spec/integration/util_spec.rb +4 -7
  109. data/spec/lib/puppet_spec/compiler.rb +1 -1
  110. data/spec/lib/puppet_spec/files.rb +0 -1
  111. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  112. data/spec/lib/puppet_spec/scope.rb +1 -2
  113. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  114. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  115. data/spec/shared_behaviours/file_serving.rb +6 -8
  116. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  117. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  118. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  119. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  120. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  121. data/spec/spec_helper.rb +10 -1
  122. data/spec/unit/agent/disabler_spec.rb +4 -5
  123. data/spec/unit/agent/locker_spec.rb +12 -13
  124. data/spec/unit/agent_spec.rb +80 -85
  125. data/spec/unit/application/agent_spec.rb +88 -94
  126. data/spec/unit/application/apply_spec.rb +82 -83
  127. data/spec/unit/application/config_spec.rb +0 -1
  128. data/spec/unit/application/describe_spec.rb +6 -7
  129. data/spec/unit/application/device_spec.rb +379 -384
  130. data/spec/unit/application/doc_spec.rb +44 -46
  131. data/spec/unit/application/face_base_spec.rb +61 -62
  132. data/spec/unit/application/facts_spec.rb +3 -4
  133. data/spec/unit/application/filebucket_spec.rb +66 -74
  134. data/spec/unit/application/indirection_base_spec.rb +8 -6
  135. data/spec/unit/application/lookup_spec.rb +26 -26
  136. data/spec/unit/application/resource_spec.rb +42 -48
  137. data/spec/unit/application/ssl_spec.rb +9 -9
  138. data/spec/unit/application_spec.rb +82 -92
  139. data/spec/unit/capability_spec.rb +6 -6
  140. data/spec/unit/certificate_factory_spec.rb +3 -5
  141. data/spec/unit/configurer/downloader_spec.rb +20 -21
  142. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  143. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  144. data/spec/unit/configurer_spec.rb +189 -192
  145. data/spec/unit/confine/exists_spec.rb +17 -15
  146. data/spec/unit/confine/false_spec.rb +5 -6
  147. data/spec/unit/confine/feature_spec.rb +7 -5
  148. data/spec/unit/confine/true_spec.rb +5 -6
  149. data/spec/unit/confine/variable_spec.rb +14 -15
  150. data/spec/unit/confine_collection_spec.rb +28 -29
  151. data/spec/unit/confine_spec.rb +13 -14
  152. data/spec/unit/confiner_spec.rb +10 -11
  153. data/spec/unit/context/trusted_information_spec.rb +1 -1
  154. data/spec/unit/daemon_spec.rb +35 -36
  155. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  156. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  157. data/spec/unit/datatypes_spec.rb +3 -4
  158. data/spec/unit/defaults_spec.rb +18 -13
  159. data/spec/unit/environments_spec.rb +7 -7
  160. data/spec/unit/etc_spec.rb +30 -32
  161. data/spec/unit/external/pson_spec.rb +0 -1
  162. data/spec/unit/face/catalog_spec.rb +0 -1
  163. data/spec/unit/face/config_spec.rb +31 -35
  164. data/spec/unit/face/epp_face_spec.rb +3 -4
  165. data/spec/unit/face/facts_spec.rb +5 -6
  166. data/spec/unit/face/generate_spec.rb +4 -5
  167. data/spec/unit/face/help_spec.rb +7 -8
  168. data/spec/unit/face/key_spec.rb +0 -1
  169. data/spec/unit/face/man_spec.rb +1 -2
  170. data/spec/unit/face/module/install_spec.rb +3 -5
  171. data/spec/unit/face/module/list_spec.rb +2 -12
  172. data/spec/unit/face/module/search_spec.rb +11 -9
  173. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  174. data/spec/unit/face/node_spec.rb +23 -24
  175. data/spec/unit/face/parser_spec.rb +3 -3
  176. data/spec/unit/face/plugin_spec.rb +36 -9
  177. data/spec/unit/face/status_spec.rb +0 -1
  178. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  179. data/spec/unit/file_bucket/file_spec.rb +0 -2
  180. data/spec/unit/file_serving/base_spec.rb +14 -15
  181. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  182. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  183. data/spec/unit/file_serving/content_spec.rb +10 -11
  184. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  185. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  186. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  187. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  188. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  189. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  190. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  191. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  192. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  193. data/spec/unit/file_serving/mount_spec.rb +0 -1
  194. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  195. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  196. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  197. data/spec/unit/file_system_spec.rb +4 -4
  198. data/spec/unit/forge/errors_spec.rb +1 -1
  199. data/spec/unit/forge/forge_spec.rb +13 -14
  200. data/spec/unit/forge/module_release_spec.rb +18 -18
  201. data/spec/unit/forge/repository_spec.rb +29 -30
  202. data/spec/unit/forge_spec.rb +15 -11
  203. data/spec/unit/functions/binary_file_spec.rb +3 -3
  204. data/spec/unit/functions/contain_spec.rb +0 -2
  205. data/spec/unit/functions/defined_spec.rb +0 -1
  206. data/spec/unit/functions/epp_spec.rb +2 -2
  207. data/spec/unit/functions/find_file_spec.rb +7 -7
  208. data/spec/unit/functions/include_spec.rb +0 -4
  209. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  210. data/spec/unit/functions/lookup_spec.rb +1 -2
  211. data/spec/unit/functions/module_directory_spec.rb +12 -12
  212. data/spec/unit/functions/require_spec.rb +0 -3
  213. data/spec/unit/functions/shared.rb +5 -8
  214. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  215. data/spec/unit/functions4_spec.rb +9 -10
  216. data/spec/unit/gettext/config_spec.rb +4 -4
  217. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  218. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  219. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  220. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  221. data/spec/unit/hiera_puppet_spec.rb +20 -20
  222. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  223. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  224. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  225. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  226. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  227. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  228. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  229. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  230. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  231. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  232. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  233. data/spec/unit/indirector/envelope_spec.rb +1 -2
  234. data/spec/unit/indirector/exec_spec.rb +4 -5
  235. data/spec/unit/indirector/face_spec.rb +9 -9
  236. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  237. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  238. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  239. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  240. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  241. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  242. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  243. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  244. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  245. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  246. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  247. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  248. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  249. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  250. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  251. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  252. data/spec/unit/indirector/file_server_spec.rb +87 -87
  253. data/spec/unit/indirector/indirection_spec.rb +242 -226
  254. data/spec/unit/indirector/json_spec.rb +7 -9
  255. data/spec/unit/indirector/key/file_spec.rb +21 -22
  256. data/spec/unit/indirector/memory_spec.rb +6 -7
  257. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  258. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  259. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  260. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  261. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  262. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  263. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  264. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  265. data/spec/unit/indirector/none_spec.rb +5 -5
  266. data/spec/unit/indirector/plain_spec.rb +7 -8
  267. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  268. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  269. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  270. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  271. data/spec/unit/indirector/request_spec.rb +11 -12
  272. data/spec/unit/indirector/resource/ral_spec.rb +47 -54
  273. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  274. data/spec/unit/indirector/rest_spec.rb +113 -110
  275. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  276. data/spec/unit/indirector/status/local_spec.rb +0 -1
  277. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  278. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  279. data/spec/unit/indirector/terminus_spec.rb +27 -27
  280. data/spec/unit/indirector/yaml_spec.rb +5 -6
  281. data/spec/unit/indirector_spec.rb +1 -2
  282. data/spec/unit/info_service_spec.rb +1 -1
  283. data/spec/unit/interface/action_builder_spec.rb +0 -1
  284. data/spec/unit/interface/action_manager_spec.rb +0 -1
  285. data/spec/unit/interface/action_spec.rb +2 -3
  286. data/spec/unit/interface/documentation_spec.rb +0 -1
  287. data/spec/unit/interface/face_collection_spec.rb +19 -12
  288. data/spec/unit/interface_spec.rb +3 -3
  289. data/spec/unit/man_spec.rb +3 -4
  290. data/spec/unit/module_spec.rb +46 -51
  291. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  292. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  293. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  294. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  295. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  296. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  297. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  298. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  299. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  300. data/spec/unit/module_tool/tar_spec.rb +12 -13
  301. data/spec/unit/module_tool_spec.rb +7 -12
  302. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  303. data/spec/unit/network/authconfig_spec.rb +17 -18
  304. data/spec/unit/network/authorization_spec.rb +4 -5
  305. data/spec/unit/network/authstore_spec.rb +0 -1
  306. data/spec/unit/network/format_handler_spec.rb +0 -1
  307. data/spec/unit/network/format_spec.rb +9 -10
  308. data/spec/unit/network/format_support_spec.rb +28 -29
  309. data/spec/unit/network/formats_spec.rb +4 -5
  310. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  311. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  312. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  313. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  314. data/spec/unit/network/http/api_spec.rb +0 -2
  315. data/spec/unit/network/http/compression_spec.rb +21 -22
  316. data/spec/unit/network/http/connection_spec.rb +35 -35
  317. data/spec/unit/network/http/factory_spec.rb +5 -6
  318. data/spec/unit/network/http/handler_spec.rb +9 -18
  319. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  320. data/spec/unit/network/http/pool_spec.rb +33 -34
  321. data/spec/unit/network/http/request_spec.rb +0 -2
  322. data/spec/unit/network/http/response_spec.rb +11 -13
  323. data/spec/unit/network/http/route_spec.rb +0 -1
  324. data/spec/unit/network/http/session_spec.rb +2 -3
  325. data/spec/unit/network/http/site_spec.rb +0 -1
  326. data/spec/unit/network/http_pool_spec.rb +19 -10
  327. data/spec/unit/network/http_spec.rb +0 -1
  328. data/spec/unit/network/resolver_spec.rb +25 -26
  329. data/spec/unit/network/rights_spec.rb +52 -53
  330. data/spec/unit/node/environment_spec.rb +14 -15
  331. data/spec/unit/node/facts_spec.rb +5 -7
  332. data/spec/unit/node_spec.rb +4 -10
  333. data/spec/unit/other/selinux_spec.rb +0 -1
  334. data/spec/unit/parameter/boolean_spec.rb +1 -2
  335. data/spec/unit/parameter/package_options_spec.rb +1 -2
  336. data/spec/unit/parameter/path_spec.rb +0 -1
  337. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  338. data/spec/unit/parameter/value_spec.rb +0 -1
  339. data/spec/unit/parameter_spec.rb +9 -9
  340. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  341. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  342. data/spec/unit/parser/compiler_spec.rb +84 -96
  343. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  344. data/spec/unit/parser/files_spec.rb +0 -1
  345. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  346. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  347. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  348. data/spec/unit/parser/functions/file_spec.rb +13 -14
  349. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  350. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  351. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  352. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  353. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  354. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  355. data/spec/unit/parser/functions/split_spec.rb +0 -1
  356. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  357. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  358. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  359. data/spec/unit/parser/functions/template_spec.rb +13 -13
  360. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  361. data/spec/unit/parser/functions_spec.rb +6 -7
  362. data/spec/unit/parser/relationship_spec.rb +0 -1
  363. data/spec/unit/parser/resource_spec.rb +42 -42
  364. data/spec/unit/parser/scope_spec.rb +39 -35
  365. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  366. data/spec/unit/parser/type_loader_spec.rb +17 -19
  367. data/spec/unit/pops/adaptable_spec.rb +0 -1
  368. data/spec/unit/pops/benchmark_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  371. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  372. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  373. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  374. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  375. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  376. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  377. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  378. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  379. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  380. data/spec/unit/pops/factory_spec.rb +3 -4
  381. data/spec/unit/pops/issues_spec.rb +19 -20
  382. data/spec/unit/pops/loaders/loader_spec.rb +9 -5
  383. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  384. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  385. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  386. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  387. data/spec/unit/pops/migration_spec.rb +3 -5
  388. data/spec/unit/pops/model/model_spec.rb +0 -1
  389. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  390. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  391. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  392. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  393. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  394. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  395. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  396. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  397. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  398. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  399. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  400. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  401. data/spec/unit/pops/pn_spec.rb +0 -1
  402. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  403. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  404. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  405. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  406. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  407. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  408. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  409. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  410. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  411. data/spec/unit/pops/visitor_spec.rb +0 -1
  412. data/spec/unit/property/boolean_spec.rb +1 -1
  413. data/spec/unit/property/ensure_spec.rb +0 -1
  414. data/spec/unit/property/keyvalue_spec.rb +32 -34
  415. data/spec/unit/property/list_spec.rb +26 -27
  416. data/spec/unit/property/ordered_list_spec.rb +10 -14
  417. data/spec/unit/property_spec.rb +42 -43
  418. data/spec/unit/provider/aix_object_spec.rb +47 -45
  419. data/spec/unit/provider/command_spec.rb +9 -9
  420. data/spec/unit/provider/exec/posix_spec.rb +8 -9
  421. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  422. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  423. data/spec/unit/provider/exec_spec.rb +0 -1
  424. data/spec/unit/provider/file/posix_spec.rb +22 -24
  425. data/spec/unit/provider/file/windows_spec.rb +15 -17
  426. data/spec/unit/provider/group/aix_spec.rb +3 -2
  427. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  428. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  429. data/spec/unit/provider/group/pw_spec.rb +11 -11
  430. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  431. data/spec/unit/provider/ldap_spec.rb +61 -62
  432. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  433. data/spec/unit/provider/nameservice_spec.rb +38 -40
  434. data/spec/unit/provider/package/aix_spec.rb +15 -15
  435. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  436. data/spec/unit/provider/package/apt_spec.rb +44 -27
  437. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  438. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  439. data/spec/unit/provider/package/base_spec.rb +4 -4
  440. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  441. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  442. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  443. data/spec/unit/provider/package/gem_spec.rb +51 -43
  444. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  445. data/spec/unit/provider/package/macports_spec.rb +46 -42
  446. data/spec/unit/provider/package/nim_spec.rb +30 -39
  447. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  448. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  449. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  450. data/spec/unit/provider/package/pip_spec.rb +71 -72
  451. data/spec/unit/provider/package/pkg_spec.rb +113 -114
  452. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  453. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  454. data/spec/unit/provider/package/pkgng_spec.rb +21 -22
  455. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  456. data/spec/unit/provider/package/portage_spec.rb +71 -75
  457. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  458. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  459. data/spec/unit/provider/package/sun_spec.rb +16 -18
  460. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  461. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  462. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  463. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  464. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  465. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  466. data/spec/unit/provider/package/windows_spec.rb +36 -32
  467. data/spec/unit/provider/package/yum_spec.rb +7 -7
  468. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  469. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  470. data/spec/unit/provider/service/base_spec.rb +4 -5
  471. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  472. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  473. data/spec/unit/provider/service/debian_spec.rb +38 -38
  474. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  475. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  476. data/spec/unit/provider/service/init_spec.rb +53 -52
  477. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  478. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  479. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  480. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  481. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  482. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  483. data/spec/unit/provider/service/runit_spec.rb +29 -27
  484. data/spec/unit/provider/service/smf_spec.rb +74 -66
  485. data/spec/unit/provider/service/src_spec.rb +46 -47
  486. data/spec/unit/provider/service/systemd_spec.rb +113 -122
  487. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  488. data/spec/unit/provider/service/windows_spec.rb +33 -41
  489. data/spec/unit/provider/user/aix_spec.rb +31 -31
  490. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  491. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  492. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  493. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  494. data/spec/unit/provider/user/pw_spec.rb +37 -35
  495. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  496. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  497. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  498. data/spec/unit/provider_spec.rb +35 -35
  499. data/spec/unit/puppet_pal_2pec.rb +4 -5
  500. data/spec/unit/puppet_pal_spec.rb +0 -1
  501. data/spec/unit/puppet_spec.rb +6 -7
  502. data/spec/unit/relationship_spec.rb +0 -1
  503. data/spec/unit/reports/http_spec.rb +22 -24
  504. data/spec/unit/reports/store_spec.rb +3 -4
  505. data/spec/unit/reports_spec.rb +12 -14
  506. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  507. data/spec/unit/resource/catalog_spec.rb +72 -68
  508. data/spec/unit/resource/status_spec.rb +6 -8
  509. data/spec/unit/resource/type_collection_spec.rb +17 -18
  510. data/spec/unit/resource/type_spec.rb +34 -35
  511. data/spec/unit/resource_spec.rb +36 -32
  512. data/spec/unit/rest/client_spec.rb +56 -25
  513. data/spec/unit/rest/route_spec.rb +5 -5
  514. data/spec/unit/scheduler/job_spec.rb +0 -1
  515. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  516. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  517. data/spec/unit/settings/array_setting_spec.rb +1 -1
  518. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  519. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  520. data/spec/unit/settings/config_file_spec.rb +0 -1
  521. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  522. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  523. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  524. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  525. data/spec/unit/settings/file_setting_spec.rb +44 -46
  526. data/spec/unit/settings/path_setting_spec.rb +1 -2
  527. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  528. data/spec/unit/settings/string_setting_spec.rb +14 -15
  529. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  530. data/spec/unit/settings/value_translator_spec.rb +0 -1
  531. data/spec/unit/settings_spec.rb +228 -235
  532. data/spec/unit/ssl/base_spec.rb +14 -15
  533. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  534. data/spec/unit/ssl/certificate_spec.rb +23 -25
  535. data/spec/unit/ssl/digest_spec.rb +0 -1
  536. data/spec/unit/ssl/host_spec.rb +147 -130
  537. data/spec/unit/ssl/key_spec.rb +30 -31
  538. data/spec/unit/ssl/ssl_provider_spec.rb +24 -24
  539. data/spec/unit/ssl/state_machine_spec.rb +50 -58
  540. data/spec/unit/ssl/validator_spec.rb +43 -54
  541. data/spec/unit/ssl/verifier_spec.rb +10 -10
  542. data/spec/unit/task_spec.rb +44 -45
  543. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  544. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  545. data/spec/unit/transaction/event_spec.rb +16 -15
  546. data/spec/unit/transaction/persistence_spec.rb +16 -17
  547. data/spec/unit/transaction/report_spec.rb +11 -12
  548. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  549. data/spec/unit/transaction_spec.rb +100 -101
  550. data/spec/unit/type/component_spec.rb +0 -1
  551. data/spec/unit/type/exec_spec.rb +60 -56
  552. data/spec/unit/type/file/checksum_spec.rb +9 -10
  553. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  554. data/spec/unit/type/file/content_spec.rb +58 -61
  555. data/spec/unit/type/file/ctime_spec.rb +0 -1
  556. data/spec/unit/type/file/ensure_spec.rb +12 -13
  557. data/spec/unit/type/file/group_spec.rb +5 -7
  558. data/spec/unit/type/file/mode_spec.rb +4 -6
  559. data/spec/unit/type/file/mtime_spec.rb +0 -1
  560. data/spec/unit/type/file/owner_spec.rb +6 -8
  561. data/spec/unit/type/file/selinux_spec.rb +17 -19
  562. data/spec/unit/type/file/source_spec.rb +104 -101
  563. data/spec/unit/type/file/type_spec.rb +0 -1
  564. data/spec/unit/type/file_spec.rb +195 -185
  565. data/spec/unit/type/filebucket_spec.rb +4 -5
  566. data/spec/unit/type/group_spec.rb +6 -8
  567. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  568. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  569. data/spec/unit/type/package_spec.rb +56 -57
  570. data/spec/unit/type/resources_spec.rb +72 -74
  571. data/spec/unit/type/schedule_spec.rb +24 -26
  572. data/spec/unit/type/service_spec.rb +49 -49
  573. data/spec/unit/type/stage_spec.rb +0 -1
  574. data/spec/unit/type/tidy_spec.rb +61 -62
  575. data/spec/unit/type/user_spec.rb +24 -25
  576. data/spec/unit/type/whit_spec.rb +0 -1
  577. data/spec/unit/type_spec.rb +55 -54
  578. data/spec/unit/util/at_fork_spec.rb +18 -19
  579. data/spec/unit/util/autoload_spec.rb +55 -56
  580. data/spec/unit/util/backups_spec.rb +34 -35
  581. data/spec/unit/util/character_encoding_spec.rb +5 -5
  582. data/spec/unit/util/checksums_spec.rb +38 -39
  583. data/spec/unit/util/colors_spec.rb +1 -2
  584. data/spec/unit/util/command_line_spec.rb +24 -25
  585. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  586. data/spec/unit/util/diff_spec.rb +7 -8
  587. data/spec/unit/util/errors_spec.rb +0 -1
  588. data/spec/unit/util/execution_spec.rb +185 -161
  589. data/spec/unit/util/execution_stub_spec.rb +0 -1
  590. data/spec/unit/util/feature_spec.rb +23 -14
  591. data/spec/unit/util/filetype_spec.rb +49 -49
  592. data/spec/unit/util/http_proxy_spec.rb +12 -12
  593. data/spec/unit/util/inifile_spec.rb +26 -31
  594. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  595. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  596. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  597. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  598. data/spec/unit/util/lockfile_spec.rb +0 -1
  599. data/spec/unit/util/log/destinations_spec.rb +30 -33
  600. data/spec/unit/util/log_spec.rb +35 -36
  601. data/spec/unit/util/logging_spec.rb +58 -72
  602. data/spec/unit/util/metric_spec.rb +0 -1
  603. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  604. data/spec/unit/util/multi_match_spec.rb +0 -1
  605. data/spec/unit/util/network_device/config_spec.rb +0 -1
  606. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  607. data/spec/unit/util/network_device_spec.rb +7 -9
  608. data/spec/unit/util/package_spec.rb +0 -1
  609. data/spec/unit/util/pidlock_spec.rb +21 -22
  610. data/spec/unit/util/plist_spec.rb +40 -33
  611. data/spec/unit/util/posix_spec.rb +54 -51
  612. data/spec/unit/util/rdoc_spec.rb +9 -10
  613. data/spec/unit/util/reference_spec.rb +0 -1
  614. data/spec/unit/util/resource_template_spec.rb +20 -20
  615. data/spec/unit/util/retry_action_spec.rb +7 -8
  616. data/spec/unit/util/rubygems_spec.rb +7 -8
  617. data/spec/unit/util/run_mode_spec.rb +3 -4
  618. data/spec/unit/util/selinux_spec.rb +79 -72
  619. data/spec/unit/util/splayer_spec.rb +8 -9
  620. data/spec/unit/util/ssl_spec.rb +0 -1
  621. data/spec/unit/util/storage_spec.rb +3 -4
  622. data/spec/unit/util/suidmanager_spec.rb +45 -54
  623. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  624. data/spec/unit/util/tag_set_spec.rb +0 -1
  625. data/spec/unit/util/tagging_spec.rb +0 -1
  626. data/spec/unit/util/terminal_spec.rb +9 -10
  627. data/spec/unit/util/user_attr_spec.rb +1 -2
  628. data/spec/unit/util/warnings_spec.rb +3 -4
  629. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  630. data/spec/unit/util/watcher_spec.rb +51 -21
  631. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  632. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  633. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  634. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  635. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  636. data/spec/unit/util/windows/file_spec.rb +0 -1
  637. data/spec/unit/util/windows/root_certs_spec.rb +1 -2
  638. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  639. data/spec/unit/util/windows/service_spec.rb +66 -68
  640. data/spec/unit/util/windows/sid_spec.rb +11 -13
  641. data/spec/unit/util/windows/string_spec.rb +0 -1
  642. data/spec/unit/util_spec.rb +55 -57
  643. data/spec/unit/version_spec.rb +6 -6
  644. data/spec/unit/x509/cert_provider_spec.rb +14 -14
  645. data/spec/unit/x509/pem_store_spec.rb +5 -5
  646. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet_spec/compiler'
4
3
  require 'matchers/resource'
@@ -11,14 +10,14 @@ describe Puppet::Resource::Catalog::Compiler do
11
10
  let(:node) { Puppet::Node.new(node_name)}
12
11
 
13
12
  before do
14
- Facter.stubs(:to_hash).returns({})
13
+ allow(Facter).to receive(:to_hash).and_return({})
15
14
  end
16
15
 
17
16
  describe "when initializing" do
18
17
  before do
19
- Puppet.expects(:version).returns(1)
20
- Facter.expects(:value).with('fqdn').returns("my.server.com")
21
- Facter.expects(:value).with('ipaddress').returns("my.ip.address")
18
+ expect(Puppet).to receive(:version).and_return(1)
19
+ expect(Facter).to receive(:value).with('fqdn').and_return("my.server.com")
20
+ expect(Facter).to receive(:value).with('ipaddress').and_return("my.ip.address")
22
21
  end
23
22
 
24
23
  it "should gather data about itself" do
@@ -30,7 +29,7 @@ describe Puppet::Resource::Catalog::Compiler do
30
29
  Puppet::Node.indirection.save(Puppet::Node.new("node1"))
31
30
  Puppet::Node.indirection.save(Puppet::Node.new("node2"))
32
31
 
33
- compiler.stubs(:compile)
32
+ allow(compiler).to receive(:compile)
34
33
 
35
34
  compiler.find(Puppet::Indirector::Request.new(:catalog, :find, 'node1', nil, :node => 'node1'))
36
35
  compiler.find(Puppet::Indirector::Request.new(:catalog, :find, 'node2', nil, :node => 'node2'))
@@ -39,71 +38,71 @@ describe Puppet::Resource::Catalog::Compiler do
39
38
 
40
39
  describe "when finding catalogs" do
41
40
  before do
42
- Facter.stubs(:value).returns("whatever")
41
+ allow(Facter).to receive(:value).and_return("whatever")
43
42
 
44
- node.stubs(:merge)
45
- Puppet::Node.indirection.stubs(:find).returns(node)
43
+ allow(node).to receive(:merge)
44
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node)
46
45
  @request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil, :node => node_name)
47
46
  end
48
47
 
49
48
  it "should directly use provided nodes for a local request" do
50
- Puppet::Node.indirection.expects(:find).never
51
- compiler.expects(:compile).with(node, anything)
52
- @request.stubs(:options).returns(:use_node => node)
53
- @request.stubs(:remote?).returns(false)
49
+ expect(Puppet::Node.indirection).not_to receive(:find)
50
+ expect(compiler).to receive(:compile).with(node, anything)
51
+ allow(@request).to receive(:options).and_return(:use_node => node)
52
+ allow(@request).to receive(:remote?).and_return(false)
54
53
  compiler.find(@request)
55
54
  end
56
55
 
57
56
  it "rejects a provided node if the request is remote" do
58
- @request.stubs(:options).returns(:use_node => node)
59
- @request.stubs(:remote?).returns(true)
57
+ allow(@request).to receive(:options).and_return(:use_node => node)
58
+ allow(@request).to receive(:remote?).and_return(true)
60
59
  expect {
61
60
  compiler.find(@request)
62
61
  }.to raise_error Puppet::Error, /invalid option use_node/i
63
62
  end
64
63
 
65
64
  it "should use the authenticated node name if no request key is provided" do
66
- @request.stubs(:key).returns(nil)
67
- Puppet::Node.indirection.expects(:find).with(node_name, anything).returns(node)
68
- compiler.expects(:compile).with(node, anything)
65
+ allow(@request).to receive(:key).and_return(nil)
66
+ expect(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
67
+ expect(compiler).to receive(:compile).with(node, anything)
69
68
  compiler.find(@request)
70
69
  end
71
70
 
72
71
  it "should use the provided node name by default" do
73
- @request.expects(:key).returns "my_node"
72
+ expect(@request).to receive(:key).and_return("my_node")
74
73
 
75
- Puppet::Node.indirection.expects(:find).with("my_node", anything).returns node
76
- compiler.expects(:compile).with(node, anything)
74
+ expect(Puppet::Node.indirection).to receive(:find).with("my_node", anything).and_return(node)
75
+ expect(compiler).to receive(:compile).with(node, anything)
77
76
  compiler.find(@request)
78
77
  end
79
78
 
80
79
  it "should fail if no node is passed and none can be found" do
81
- Puppet::Node.indirection.stubs(:find).with(node_name, anything).returns(nil)
80
+ allow(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(nil)
82
81
  expect { compiler.find(@request) }.to raise_error(ArgumentError)
83
82
  end
84
83
 
85
84
  it "should fail intelligently when searching for a node raises an exception" do
86
- Puppet::Node.indirection.stubs(:find).with(node_name, anything).raises "eh"
85
+ allow(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_raise("eh")
87
86
  expect { compiler.find(@request) }.to raise_error(Puppet::Error)
88
87
  end
89
88
 
90
89
  it "should pass the found node to the compiler for compiling" do
91
- Puppet::Node.indirection.expects(:find).with(node_name, anything).returns(node)
92
- Puppet::Parser::Compiler.expects(:compile).with(node, anything)
90
+ expect(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
91
+ expect(Puppet::Parser::Compiler).to receive(:compile).with(node, anything)
93
92
  compiler.find(@request)
94
93
  end
95
94
 
96
95
  it "should pass node containing percent character to the compiler" do
97
96
  node_with_percent_character = Puppet::Node.new "%6de"
98
- Puppet::Node.indirection.stubs(:find).returns(node_with_percent_character)
99
- Puppet::Parser::Compiler.expects(:compile).with(node_with_percent_character, anything)
97
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node_with_percent_character)
98
+ expect(Puppet::Parser::Compiler).to receive(:compile).with(node_with_percent_character, anything)
100
99
  compiler.find(@request)
101
100
  end
102
101
 
103
102
  it "should extract any facts from the request" do
104
- Puppet::Node.indirection.expects(:find).with(node_name, anything).returns node
105
- compiler.expects(:extract_facts_from_request).with(@request)
106
- Puppet::Parser::Compiler.stubs(:compile)
103
+ expect(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
104
+ expect(compiler).to receive(:extract_facts_from_request).with(@request)
105
+ allow(Puppet::Parser::Compiler).to receive(:compile)
107
106
  compiler.find(@request)
108
107
  end
109
108
 
@@ -126,119 +125,119 @@ describe Puppet::Resource::Catalog::Compiler do
126
125
  end
127
126
 
128
127
  it "should return the results of compiling as the catalog" do
129
- Puppet::Node.indirection.stubs(:find).returns(node)
128
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node)
130
129
  catalog = Puppet::Resource::Catalog.new(node.name)
131
- Puppet::Parser::Compiler.stubs(:compile).returns catalog
130
+ allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
132
131
 
133
132
  expect(compiler.find(@request)).to equal(catalog)
134
133
  end
135
134
 
136
135
  it "passes the code_id from the request to the compiler" do
137
- Puppet::Node.indirection.stubs(:find).returns(node)
136
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node)
138
137
  code_id = 'b59e5df0578ef411f773ee6c33d8073c50e7b8fe'
139
138
  @request.options[:code_id] = code_id
140
139
 
141
- Puppet::Parser::Compiler.expects(:compile).with(anything, code_id)
140
+ expect(Puppet::Parser::Compiler).to receive(:compile).with(anything, code_id)
142
141
 
143
142
  compiler.find(@request)
144
143
  end
145
144
 
146
145
  it "returns a catalog with the code_id from the request" do
147
- Puppet::Node.indirection.stubs(:find).returns(node)
146
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node)
148
147
  code_id = 'b59e5df0578ef411f773ee6c33d8073c50e7b8fe'
149
148
  @request.options[:code_id] = code_id
150
149
 
151
150
  catalog = Puppet::Resource::Catalog.new(node.name, node.environment, code_id)
152
- Puppet::Parser::Compiler.stubs(:compile).returns catalog
151
+ allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
153
152
 
154
153
  expect(compiler.find(@request).code_id).to eq(code_id)
155
154
  end
156
155
 
157
156
  it "does not inline metadata when the static_catalog option is false" do
158
- Puppet::Node.indirection.stubs(:find).returns(node)
157
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node)
159
158
  @request.options[:static_catalog] = false
160
159
  @request.options[:code_id] = 'some_code_id'
161
- node.environment.stubs(:static_catalogs?).returns true
160
+ allow(node.environment).to receive(:static_catalogs?).and_return(true)
162
161
 
163
162
  catalog = Puppet::Resource::Catalog.new(node.name, node.environment)
164
- Puppet::Parser::Compiler.stubs(:compile).returns catalog
163
+ allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
165
164
 
166
- compiler.expects(:inline_metadata).never
165
+ expect(compiler).not_to receive(:inline_metadata)
167
166
  compiler.find(@request)
168
167
  end
169
168
 
170
169
  it "does not inline metadata when static_catalogs are disabled" do
171
- Puppet::Node.indirection.stubs(:find).returns(node)
170
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node)
172
171
  @request.options[:static_catalog] = true
173
172
  @request.options[:checksum_type] = 'md5'
174
173
  @request.options[:code_id] = 'some_code_id'
175
- node.environment.stubs(:static_catalogs?).returns false
174
+ allow(node.environment).to receive(:static_catalogs?).and_return(false)
176
175
 
177
176
  catalog = Puppet::Resource::Catalog.new(node.name, node.environment)
178
- Puppet::Parser::Compiler.stubs(:compile).returns catalog
177
+ allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
179
178
 
180
- compiler.expects(:inline_metadata).never
179
+ expect(compiler).not_to receive(:inline_metadata)
181
180
  compiler.find(@request)
182
181
  end
183
182
 
184
183
  it "does not inline metadata when code_id is not specified" do
185
- Puppet::Node.indirection.stubs(:find).returns(node)
184
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node)
186
185
  @request.options[:static_catalog] = true
187
186
  @request.options[:checksum_type] = 'md5'
188
- node.environment.stubs(:static_catalogs?).returns true
187
+ allow(node.environment).to receive(:static_catalogs?).and_return(true)
189
188
 
190
189
  catalog = Puppet::Resource::Catalog.new(node.name, node.environment)
191
- Puppet::Parser::Compiler.stubs(:compile).returns catalog
190
+ allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
192
191
 
193
- compiler.expects(:inline_metadata).never
192
+ expect(compiler).not_to receive(:inline_metadata)
194
193
  expect(compiler.find(@request)).to eq(catalog)
195
194
  end
196
195
 
197
196
  it "inlines metadata when the static_catalog option is true, static_catalogs are enabled, and a code_id is provided" do
198
- Puppet::Node.indirection.stubs(:find).returns(node)
197
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node)
199
198
  @request.options[:static_catalog] = true
200
199
  @request.options[:checksum_type] = 'sha256'
201
200
  @request.options[:code_id] = 'some_code_id'
202
- node.environment.stubs(:static_catalogs?).returns true
201
+ allow(node.environment).to receive(:static_catalogs?).and_return(true)
203
202
 
204
203
  catalog = Puppet::Resource::Catalog.new(node.name, node.environment)
205
- Puppet::Parser::Compiler.stubs(:compile).returns catalog
204
+ allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
206
205
 
207
- compiler.expects(:inline_metadata).with(catalog, :sha256).returns catalog
206
+ expect(compiler).to receive(:inline_metadata).with(catalog, :sha256).and_return(catalog)
208
207
  compiler.find(@request)
209
208
  end
210
209
 
211
210
  it "inlines metadata with the first common checksum type" do
212
- Puppet::Node.indirection.stubs(:find).returns(node)
211
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node)
213
212
  @request.options[:static_catalog] = true
214
213
  @request.options[:checksum_type] = 'atime.md5.sha256.mtime'
215
214
  @request.options[:code_id] = 'some_code_id'
216
- node.environment.stubs(:static_catalogs?).returns true
215
+ allow(node.environment).to receive(:static_catalogs?).and_return(true)
217
216
 
218
217
  catalog = Puppet::Resource::Catalog.new(node.name, node.environment)
219
- Puppet::Parser::Compiler.stubs(:compile).returns catalog
218
+ allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
220
219
 
221
- compiler.expects(:inline_metadata).with(catalog, :md5).returns catalog
220
+ expect(compiler).to receive(:inline_metadata).with(catalog, :md5).and_return(catalog)
222
221
  compiler.find(@request)
223
222
  end
224
223
 
225
224
  it "errors if checksum_type contains no shared checksum types" do
226
- Puppet::Node.indirection.stubs(:find).returns(node)
225
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node)
227
226
  @request.options[:static_catalog] = true
228
227
  @request.options[:checksum_type] = 'atime.md2'
229
228
  @request.options[:code_id] = 'some_code_id'
230
- node.environment.stubs(:static_catalogs?).returns true
229
+ allow(node.environment).to receive(:static_catalogs?).and_return(true)
231
230
 
232
231
  expect { compiler.find(@request) }.to raise_error Puppet::Error,
233
232
  "Unable to find a common checksum type between agent 'atime.md2' and master '[:sha256, :sha256lite, :md5, :md5lite, :sha1, :sha1lite, :sha512, :sha384, :sha224, :mtime, :ctime, :none]'."
234
233
  end
235
234
 
236
235
  it "errors if checksum_type contains no shared checksum types" do
237
- Puppet::Node.indirection.stubs(:find).returns(node)
236
+ allow(Puppet::Node.indirection).to receive(:find).and_return(node)
238
237
  @request.options[:static_catalog] = true
239
238
  @request.options[:checksum_type] = nil
240
239
  @request.options[:code_id] = 'some_code_id'
241
- node.environment.stubs(:static_catalogs?).returns true
240
+ allow(node.environment).to receive(:static_catalogs?).and_return(true)
242
241
 
243
242
  expect { compiler.find(@request) }.to raise_error Puppet::Error,
244
243
  "Unable to find a common checksum type between agent '' and master '[:sha256, :sha256lite, :md5, :md5lite, :sha1, :sha1lite, :sha512, :sha384, :sha224, :mtime, :ctime, :none]'."
@@ -248,7 +247,7 @@ describe Puppet::Resource::Catalog::Compiler do
248
247
  describe "when handling a request with facts" do
249
248
  before do
250
249
  Puppet::Node::Facts.indirection.terminus_class = :memory
251
- Facter.stubs(:value).returns "something"
250
+ allow(Facter).to receive(:value).and_return("something")
252
251
 
253
252
  @facts = Puppet::Node::Facts.new('hostname', "fact" => "value", "architecture" => "i386")
254
253
  end
@@ -317,7 +316,7 @@ describe Puppet::Resource::Catalog::Compiler do
317
316
  :transaction_uuid => request.options[:transaction_uuid],
318
317
  }
319
318
 
320
- Puppet::Node::Facts.indirection.expects(:save).with(equals(@facts), nil, options)
319
+ expect(Puppet::Node::Facts.indirection).to receive(:save).with(@facts, nil, options)
321
320
  compiler.find(request)
322
321
  end
323
322
 
@@ -329,7 +328,7 @@ describe Puppet::Resource::Catalog::Compiler do
329
328
  :transaction_uuid => request.options[:transaction_uuid],
330
329
  }
331
330
 
332
- Puppet::Node::Facts.indirection.expects(:save).with(equals(@facts), nil, options).never
331
+ expect(Puppet::Node::Facts.indirection).not_to receive(:save).with(@facts, nil, options)
333
332
  compiler.find(request)
334
333
  end
335
334
  end
@@ -337,53 +336,53 @@ describe Puppet::Resource::Catalog::Compiler do
337
336
 
338
337
  describe "when finding nodes" do
339
338
  it "should look node information up via the Node class with the provided key" do
340
- Facter.stubs(:value).returns("whatever")
339
+ allow(Facter).to receive(:value).and_return("whatever")
341
340
  request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil)
342
- compiler.stubs(:compile)
341
+ allow(compiler).to receive(:compile)
343
342
 
344
- Puppet::Node.indirection.expects(:find).with(node_name, anything).returns(node)
343
+ expect(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
345
344
 
346
345
  compiler.find(request)
347
346
  end
348
347
 
349
348
  it "should pass the transaction_uuid to the node indirection" do
350
349
  uuid = '793ff10d-89f8-4527-a645-3302cbc749f3'
351
- compiler.stubs(:compile)
350
+ allow(compiler).to receive(:compile)
352
351
  request = Puppet::Indirector::Request.new(:catalog, :find, node_name,
353
352
  nil, :transaction_uuid => uuid)
354
353
 
355
- Puppet::Node.indirection.expects(:find).with(
354
+ expect(Puppet::Node.indirection).to receive(:find).with(
356
355
  node_name,
357
- has_entries(:transaction_uuid => uuid)
358
- ).returns(node)
356
+ hash_including(:transaction_uuid => uuid)
357
+ ).and_return(node)
359
358
 
360
359
  compiler.find(request)
361
360
  end
362
361
 
363
362
  it "should pass the configured_environment to the node indirection" do
364
363
  environment = 'foo'
365
- compiler.stubs(:compile)
364
+ allow(compiler).to receive(:compile)
366
365
  request = Puppet::Indirector::Request.new(:catalog, :find, node_name,
367
366
  nil, :configured_environment => environment)
368
367
 
369
- Puppet::Node.indirection.expects(:find).with(
368
+ expect(Puppet::Node.indirection).to receive(:find).with(
370
369
  node_name,
371
- has_entries(:configured_environment => environment)
372
- ).returns(node)
370
+ hash_including(:configured_environment => environment)
371
+ ).and_return(node)
373
372
 
374
373
  compiler.find(request)
375
374
  end
376
375
 
377
376
  it "should pass a facts object from the original request facts to the node indirection" do
378
377
  facts = Puppet::Node::Facts.new("hostname", :afact => "avalue")
379
- compiler.expects(:extract_facts_from_request).returns(facts)
380
- compiler.expects(:save_facts_from_request)
378
+ expect(compiler).to receive(:extract_facts_from_request).and_return(facts)
379
+ expect(compiler).to receive(:save_facts_from_request)
381
380
 
382
381
  request = Puppet::Indirector::Request.new(:catalog, :find, "hostname",
383
382
  nil, :facts_format => "application/json",
384
383
  :facts => facts.render('json'))
385
384
 
386
- Puppet::Node.indirection.expects(:find).with("hostname", has_entries(:facts => facts)).returns(node)
385
+ expect(Puppet::Node.indirection).to receive(:find).with("hostname", hash_including(:facts => facts)).and_return(node)
387
386
 
388
387
  compiler.find(request)
389
388
  end
@@ -391,62 +390,61 @@ describe Puppet::Resource::Catalog::Compiler do
391
390
 
392
391
  describe "after finding nodes" do
393
392
  before do
394
- Puppet.expects(:version).returns(1)
395
- Facter.expects(:value).with('fqdn').returns("my.server.com")
396
- Facter.expects(:value).with('ipaddress').returns("my.ip.address")
393
+ expect(Puppet).to receive(:version).and_return(1)
394
+ expect(Facter).to receive(:value).with('fqdn').and_return("my.server.com")
395
+ expect(Facter).to receive(:value).with('ipaddress').and_return("my.ip.address")
397
396
  @request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil)
398
- compiler.stubs(:compile)
399
- Puppet::Node.indirection.stubs(:find).with(node_name, anything).returns(node)
397
+ allow(compiler).to receive(:compile)
398
+ allow(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
400
399
  end
401
400
 
402
401
  it "should add the server's Puppet version to the node's parameters as 'serverversion'" do
403
- node.expects(:merge).with { |args| args["serverversion"] == "1" }
402
+ expect(node).to receive(:merge).with(hash_including("serverversion" => "1"))
404
403
  compiler.find(@request)
405
404
  end
406
405
 
407
406
  it "should add the server's fqdn to the node's parameters as 'servername'" do
408
- node.expects(:merge).with { |args| args["servername"] == "my.server.com" }
407
+ expect(node).to receive(:merge).with(hash_including("servername" => "my.server.com"))
409
408
  compiler.find(@request)
410
409
  end
411
410
 
412
411
  it "should add the server's IP address to the node's parameters as 'serverip'" do
413
- node.expects(:merge).with { |args| args["serverip"] == "my.ip.address" }
412
+ expect(node).to receive(:merge).with(hash_including("serverip" => "my.ip.address"))
414
413
  compiler.find(@request)
415
414
  end
416
415
  end
417
416
 
418
417
  describe "when filtering resources" do
419
418
  before :each do
420
- Facter.stubs(:value)
421
- @catalog = stub_everything 'catalog'
422
- @catalog.stubs(:respond_to?).with(:filter).returns(true)
419
+ allow(Facter).to receive(:value)
420
+ @catalog = double('catalog')
421
+ allow(@catalog).to receive(:respond_to?).with(:filter).and_return(true)
423
422
  end
424
423
 
425
424
  it "should delegate to the catalog instance filtering" do
426
- @catalog.expects(:filter)
425
+ expect(@catalog).to receive(:filter)
427
426
  compiler.filter(@catalog)
428
427
  end
429
428
 
430
429
  it "should filter out virtual resources" do
431
- resource = mock 'resource', :virtual? => true
432
- @catalog.stubs(:filter).yields(resource)
430
+ resource = double('resource', :virtual? => true)
431
+ allow(@catalog).to receive(:filter).and_yield(resource)
433
432
 
434
433
  compiler.filter(@catalog)
435
434
  end
436
435
 
437
436
  it "should return the same catalog if it doesn't support filtering" do
438
- @catalog.stubs(:respond_to?).with(:filter).returns(false)
437
+ allow(@catalog).to receive(:respond_to?).with(:filter).and_return(false)
439
438
 
440
439
  expect(compiler.filter(@catalog)).to eq(@catalog)
441
440
  end
442
441
 
443
442
  it "should return the filtered catalog" do
444
- catalog = stub 'filtered catalog'
445
- @catalog.stubs(:filter).returns(catalog)
443
+ catalog = double('filtered catalog')
444
+ allow(@catalog).to receive(:filter).and_return(catalog)
446
445
 
447
446
  expect(compiler.filter(@catalog)).to eq(catalog)
448
447
  end
449
-
450
448
  end
451
449
 
452
450
  describe "when inlining metadata" do
@@ -461,33 +459,33 @@ describe Puppet::Resource::Catalog::Compiler do
461
459
  def stubs_resource_metadata(ftype, relative_path, full_path = nil)
462
460
  full_path ||= File.join(Puppet[:environmentpath], 'production', relative_path)
463
461
 
464
- metadata = stub 'metadata'
465
- metadata.stubs(:ftype).returns(ftype)
466
- metadata.stubs(:full_path).returns(full_path)
467
- metadata.stubs(:relative_path).returns(relative_path)
468
- metadata.stubs(:source).returns("puppet:///#{relative_path}")
469
- metadata.stubs(:source=)
470
- metadata.stubs(:content_uri=)
462
+ metadata = double('metadata')
463
+ allow(metadata).to receive(:ftype).and_return(ftype)
464
+ allow(metadata).to receive(:full_path).and_return(full_path)
465
+ allow(metadata).to receive(:relative_path).and_return(relative_path)
466
+ allow(metadata).to receive(:source).and_return("puppet:///#{relative_path}")
467
+ allow(metadata).to receive(:source=)
468
+ allow(metadata).to receive(:content_uri=)
471
469
 
472
470
  metadata
473
471
  end
474
472
 
475
473
  def stubs_file_metadata(checksum_type, sha, relative_path, full_path = nil)
476
474
  metadata = stubs_resource_metadata('file', relative_path, full_path)
477
- metadata.stubs(:checksum).returns("{#{checksum_type}}#{sha}")
478
- metadata.stubs(:checksum_type).returns(checksum_type)
475
+ allow(metadata).to receive(:checksum).and_return("{#{checksum_type}}#{sha}")
476
+ allow(metadata).to receive(:checksum_type).and_return(checksum_type)
479
477
  metadata
480
478
  end
481
479
 
482
480
  def stubs_link_metadata(relative_path, destination)
483
481
  metadata = stubs_resource_metadata('link', relative_path)
484
- metadata.stubs(:destination).returns(destination)
482
+ allow(metadata).to receive(:destination).and_return(destination)
485
483
  metadata
486
484
  end
487
485
 
488
486
  def stubs_directory_metadata(relative_path)
489
487
  metadata = stubs_resource_metadata('directory', relative_path)
490
- metadata.stubs(:relative_path).returns('.')
488
+ allow(metadata).to receive(:relative_path).and_return('.')
491
489
  metadata
492
490
  end
493
491
 
@@ -500,8 +498,8 @@ describe Puppet::Resource::Catalog::Compiler do
500
498
  MANIFEST
501
499
 
502
500
  metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/config_file.txt')
503
- metadata.expects(:source=).with(source)
504
- metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
501
+ expect(metadata).to receive(:source=).with(source)
502
+ expect(metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
505
503
 
506
504
  options = {
507
505
  :environment => catalog.environment_instance,
@@ -509,7 +507,7 @@ describe Puppet::Resource::Catalog::Compiler do
509
507
  :checksum_type => checksum_type.to_sym,
510
508
  :source_permissions => :ignore
511
509
  }
512
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, options).returns(metadata)
510
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, options).and_return(metadata)
513
511
 
514
512
  compiler.send(:inline_metadata, catalog, checksum_type)
515
513
 
@@ -528,8 +526,8 @@ describe Puppet::Resource::Catalog::Compiler do
528
526
  MANIFEST
529
527
 
530
528
  metadata = stubs_link_metadata('modules/mymodule/files/config_file.txt', '/tmp/some/absolute/path')
531
- metadata.expects(:source=).with(source)
532
- metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
529
+ expect(metadata).to receive(:source=).with(source)
530
+ expect(metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
533
531
 
534
532
  options = {
535
533
  :environment => catalog.environment_instance,
@@ -537,7 +535,7 @@ describe Puppet::Resource::Catalog::Compiler do
537
535
  :checksum_type => checksum_type.to_sym,
538
536
  :source_permissions => :use
539
537
  }
540
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, options).returns(metadata)
538
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, options).and_return(metadata)
541
539
 
542
540
  compiler.send(:inline_metadata, catalog, checksum_type)
543
541
 
@@ -568,7 +566,7 @@ describe Puppet::Resource::Catalog::Compiler do
568
566
  :source_permissions => default_file[:source_permissions]
569
567
  }
570
568
 
571
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, options).returns(metadata)
569
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, options).and_return(metadata)
572
570
 
573
571
  compiler.send(:inline_metadata, catalog, checksum_type)
574
572
  end
@@ -583,10 +581,10 @@ describe Puppet::Resource::Catalog::Compiler do
583
581
  MANIFEST
584
582
 
585
583
  metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/config_file.txt')
586
- metadata.expects(:source=).with(source)
587
- metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
588
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
589
- Puppet::FileServing::Metadata.indirection.expects(:find).with(alt_source, anything).returns(nil)
584
+ expect(metadata).to receive(:source=).with(source)
585
+ expect(metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
586
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
587
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(alt_source, anything).and_return(nil)
590
588
 
591
589
  compiler.send(:inline_metadata, catalog, checksum_type)
592
590
 
@@ -613,7 +611,7 @@ describe Puppet::Resource::Catalog::Compiler do
613
611
  :checksum_type => checksum_type.to_sym,
614
612
  :source_permissions => :ignore
615
613
  }
616
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, options).returns(metadata)
614
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, options).and_return(metadata)
617
615
 
618
616
  compiler.send(:inline_metadata, catalog, checksum_type)
619
617
 
@@ -634,11 +632,11 @@ describe Puppet::Resource::Catalog::Compiler do
634
632
  MANIFEST
635
633
 
636
634
  metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/config_file.txt')
637
- metadata.stubs(:source).returns(source)
635
+ allow(metadata).to receive(:source).and_return(source)
638
636
 
639
- metadata.expects(:content_uri=).with('puppet://myhost:8888/modules/mymodule/files/config_file.txt')
637
+ expect(metadata).to receive(:content_uri=).with('puppet://myhost:8888/modules/mymodule/files/config_file.txt')
640
638
 
641
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
639
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
642
640
 
643
641
  compiler.send(:inline_metadata, catalog, checksum_type)
644
642
  end
@@ -705,7 +703,7 @@ describe Puppet::Resource::Catalog::Compiler do
705
703
 
706
704
  full_path = File.join(Puppet[:codedir], "modules/mymodule/files/config_file.txt")
707
705
  metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/config_file.txt', full_path)
708
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
706
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
709
707
 
710
708
  compiler.send(:inline_metadata, catalog, checksum_type)
711
709
  expect(catalog.metadata).to be_empty
@@ -723,7 +721,7 @@ describe Puppet::Resource::Catalog::Compiler do
723
721
  MANIFEST
724
722
 
725
723
  metadata = stubs_file_metadata(checksum_type, checksum_value, 'secure/files/data.txt')
726
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
724
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
727
725
 
728
726
  compiler.send(:inline_metadata, catalog, checksum_type)
729
727
  expect(catalog.metadata).to be_empty
@@ -739,7 +737,7 @@ describe Puppet::Resource::Catalog::Compiler do
739
737
  MANIFEST
740
738
 
741
739
  metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/not_in_files/config_file.txt')
742
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
740
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
743
741
 
744
742
  compiler.send(:inline_metadata, catalog, checksum_type)
745
743
  expect(catalog.metadata).to be_empty
@@ -756,7 +754,7 @@ describe Puppet::Resource::Catalog::Compiler do
756
754
 
757
755
  # note empty module name "modules//files"
758
756
  metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules//files/config_file.txt')
759
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
757
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
760
758
 
761
759
  compiler.send(:inline_metadata, catalog, checksum_type)
762
760
  expect(catalog.metadata).to be_empty
@@ -776,9 +774,9 @@ describe Puppet::Resource::Catalog::Compiler do
776
774
 
777
775
  # See https://github.com/puppetlabs/control-repo/blob/508b9cc/site/profile/files/puppetmaster/update-classes.sh
778
776
  metadata = stubs_file_metadata(checksum_type, checksum_value, 'site/profile/files/puppetmaster/update-classes.sh')
779
- metadata.stubs(:source).returns(source)
777
+ allow(metadata).to receive(:source).and_return(source)
780
778
 
781
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
779
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
782
780
 
783
781
  compiler.send(:inline_metadata, catalog, checksum_type)
784
782
  expect(catalog.metadata[path]).to eq(metadata)
@@ -798,9 +796,9 @@ describe Puppet::Resource::Catalog::Compiler do
798
796
  MANIFEST
799
797
 
800
798
  metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/myfile')
801
- metadata.stubs(:source).returns(source)
799
+ allow(metadata).to receive(:source).and_return(source)
802
800
 
803
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
801
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
804
802
 
805
803
  compiler.send(:inline_metadata, catalog, checksum_type)
806
804
  expect(catalog.metadata[path]).to eq(metadata)
@@ -820,8 +818,8 @@ describe Puppet::Resource::Catalog::Compiler do
820
818
  }
821
819
  MANIFEST
822
820
 
823
- metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/directory')
824
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source_dir, anything).returns(metadata)
821
+ expect(metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/directory')
822
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source_dir, anything).and_return(metadata)
825
823
 
826
824
  compiler.send(:inline_metadata, catalog, checksum_type)
827
825
 
@@ -842,8 +840,8 @@ describe Puppet::Resource::Catalog::Compiler do
842
840
  }
843
841
  MANIFEST
844
842
 
845
- metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/directory')
846
- child_metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/directory/myfile.txt')
843
+ expect(metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/directory')
844
+ expect(child_metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/directory/myfile.txt')
847
845
 
848
846
  options = {
849
847
  :environment => catalog.environment_instance,
@@ -854,7 +852,7 @@ describe Puppet::Resource::Catalog::Compiler do
854
852
  :recurselimit => nil,
855
853
  :ignore => nil,
856
854
  }
857
- Puppet::FileServing::Metadata.indirection.expects(:search).with(source_dir, options).returns([metadata, child_metadata])
855
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source_dir, options).and_return([metadata, child_metadata])
858
856
 
859
857
  compiler.send(:inline_metadata, catalog, checksum_type)
860
858
 
@@ -885,7 +883,7 @@ describe Puppet::Resource::Catalog::Compiler do
885
883
  :recurselimit => 2,
886
884
  :ignore => 'foo.+',
887
885
  }
888
- Puppet::FileServing::Metadata.indirection.expects(:search).with(source_dir, options).returns([metadata, child_metadata])
886
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source_dir, options).and_return([metadata, child_metadata])
889
887
 
890
888
  compiler.send(:inline_metadata, catalog, checksum_type)
891
889
 
@@ -904,8 +902,8 @@ describe Puppet::Resource::Catalog::Compiler do
904
902
  }
905
903
  MANIFEST
906
904
 
907
- Puppet::FileServing::Metadata.indirection.expects(:search).with(source_dir, anything).returns([metadata, child_metadata])
908
- Puppet::FileServing::Metadata.indirection.expects(:search).with(alt_source_dir, anything).returns([metadata, child_metadata])
905
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source_dir, anything).and_return([metadata, child_metadata])
906
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(alt_source_dir, anything).and_return([metadata, child_metadata])
909
907
 
910
908
  compiler.send(:inline_metadata, catalog, checksum_type)
911
909
 
@@ -924,8 +922,8 @@ describe Puppet::Resource::Catalog::Compiler do
924
922
  }
925
923
  MANIFEST
926
924
 
927
- Puppet::FileServing::Metadata.indirection.expects(:search).with(source_dir, anything).returns(nil)
928
- Puppet::FileServing::Metadata.indirection.expects(:search).with(alt_source_dir, anything).returns([metadata, child_metadata])
925
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source_dir, anything).and_return(nil)
926
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(alt_source_dir, anything).and_return([metadata, child_metadata])
929
927
 
930
928
  compiler.send(:inline_metadata, catalog, checksum_type)
931
929
 
@@ -946,9 +944,9 @@ describe Puppet::Resource::Catalog::Compiler do
946
944
  MANIFEST
947
945
 
948
946
  metadata = stubs_directory_metadata('secure/files/data')
949
- metadata.stubs(:source).returns(source)
947
+ allow(metadata).to receive(:source).and_return(source)
950
948
 
951
- Puppet::FileServing::Metadata.indirection.expects(:search).with(source, anything).returns([metadata])
949
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source, anything).and_return([metadata])
952
950
 
953
951
  compiler.send(:inline_metadata, catalog, checksum_type)
954
952
  expect(catalog.metadata).to be_empty
@@ -967,7 +965,7 @@ describe Puppet::Resource::Catalog::Compiler do
967
965
  MANIFEST
968
966
 
969
967
  metadata = stubs_directory_metadata('modules/mymodule/not_in_files/directory')
970
- Puppet::FileServing::Metadata.indirection.expects(:search).with(source, anything).returns([metadata])
968
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source, anything).and_return([metadata])
971
969
 
972
970
  compiler.send(:inline_metadata, catalog, checksum_type)
973
971
  expect(catalog.metadata).to be_empty
@@ -988,12 +986,12 @@ describe Puppet::Resource::Catalog::Compiler do
988
986
 
989
987
  # See https://github.com/puppetlabs/control-repo/blob/508b9cc/site/profile/files/puppetmaster/update-classes.sh
990
988
  dir_metadata = stubs_directory_metadata('site/profile/files/puppetmaster')
991
- dir_metadata.stubs(:source).returns(source)
989
+ allow(dir_metadata).to receive(:source).and_return(source)
992
990
 
993
991
  child_metadata = stubs_file_metadata(checksum_type, checksum_value, './update-classes.sh')
994
- child_metadata.stubs(:source).returns("#{source}/update-classes.sh")
992
+ allow(child_metadata).to receive(:source).and_return("#{source}/update-classes.sh")
995
993
 
996
- Puppet::FileServing::Metadata.indirection.expects(:search).with(source, anything).returns([dir_metadata, child_metadata])
994
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source, anything).and_return([dir_metadata, child_metadata])
997
995
 
998
996
  compiler.send(:inline_metadata, catalog, checksum_type)
999
997
  expect(catalog.metadata).to be_empty
@@ -1012,12 +1010,12 @@ describe Puppet::Resource::Catalog::Compiler do
1012
1010
  MANIFEST
1013
1011
 
1014
1012
  dir_metadata = stubs_directory_metadata('modules/mymodule/files/directory')
1015
- dir_metadata.stubs(:source).returns(source)
1013
+ allow(dir_metadata).to receive(:source).and_return(source)
1016
1014
 
1017
1015
  child_metadata = stubs_file_metadata(checksum_type, checksum_value, './file')
1018
- child_metadata.stubs(:source).returns("#{source}/file")
1016
+ allow(child_metadata).to receive(:source).and_return("#{source}/file")
1019
1017
 
1020
- Puppet::FileServing::Metadata.indirection.expects(:search).with(source, anything).returns([dir_metadata, child_metadata])
1018
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source, anything).and_return([dir_metadata, child_metadata])
1021
1019
 
1022
1020
  compiler.send(:inline_metadata, catalog, checksum_type)
1023
1021
 
@@ -1046,7 +1044,7 @@ describe Puppet::Resource::Catalog::Compiler do
1046
1044
  MANIFEST
1047
1045
 
1048
1046
  metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/config_file.txt')
1049
- Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
1047
+ expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
1050
1048
 
1051
1049
  compiler.send(:inline_metadata, catalog, checksum_type)
1052
1050
  expect(catalog.metadata['c:/foo']).to eq(metadata)