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

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

Potentially problematic release.


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

Files changed (632) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +4 -8
  4. data/lib/puppet/application/device.rb +99 -83
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/configurer.rb +5 -4
  7. data/lib/puppet/defaults.rb +31 -11
  8. data/lib/puppet/indirector/request.rb +26 -15
  9. data/lib/puppet/network/http/connection.rb +15 -7
  10. data/lib/puppet/transaction/event_manager.rb +1 -5
  11. data/lib/puppet/type/file/source.rb +0 -1
  12. data/lib/puppet/util/connection.rb +15 -6
  13. data/lib/puppet/util/http_proxy.rb +3 -2
  14. data/lib/puppet/version.rb +1 -1
  15. data/locales/puppet.pot +99 -40
  16. data/man/man5/puppet.conf.5 +8 -8
  17. data/man/man8/puppet-agent.8 +1 -1
  18. data/man/man8/puppet-apply.8 +1 -1
  19. data/man/man8/puppet-catalog.8 +1 -1
  20. data/man/man8/puppet-config.8 +1 -1
  21. data/man/man8/puppet-describe.8 +1 -1
  22. data/man/man8/puppet-device.8 +1 -1
  23. data/man/man8/puppet-doc.8 +1 -1
  24. data/man/man8/puppet-epp.8 +1 -1
  25. data/man/man8/puppet-facts.8 +1 -1
  26. data/man/man8/puppet-filebucket.8 +1 -1
  27. data/man/man8/puppet-generate.8 +1 -1
  28. data/man/man8/puppet-help.8 +1 -1
  29. data/man/man8/puppet-key.8 +1 -1
  30. data/man/man8/puppet-lookup.8 +1 -1
  31. data/man/man8/puppet-man.8 +1 -1
  32. data/man/man8/puppet-module.8 +1 -1
  33. data/man/man8/puppet-node.8 +1 -1
  34. data/man/man8/puppet-parser.8 +1 -1
  35. data/man/man8/puppet-plugin.8 +1 -1
  36. data/man/man8/puppet-report.8 +1 -1
  37. data/man/man8/puppet-resource.8 +1 -1
  38. data/man/man8/puppet-script.8 +1 -1
  39. data/man/man8/puppet-ssl.8 +1 -1
  40. data/man/man8/puppet-status.8 +1 -1
  41. data/man/man8/puppet.8 +2 -2
  42. data/spec/integration/agent/logging_spec.rb +5 -7
  43. data/spec/integration/application/apply_spec.rb +18 -16
  44. data/spec/integration/application/doc_spec.rb +1 -2
  45. data/spec/integration/application/lookup_spec.rb +5 -5
  46. data/spec/integration/configurer_spec.rb +5 -6
  47. data/spec/integration/defaults_spec.rb +5 -6
  48. data/spec/integration/directory_environments_spec.rb +1 -1
  49. data/spec/integration/faces/config_spec.rb +3 -4
  50. data/spec/integration/faces/documentation_spec.rb +0 -1
  51. data/spec/integration/faces/plugin_spec.rb +1 -1
  52. data/spec/integration/file_bucket/file_spec.rb +2 -4
  53. data/spec/integration/file_serving/content_spec.rb +0 -1
  54. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  55. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  56. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  57. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  58. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  59. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  60. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  61. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  62. data/spec/integration/network/authconfig_spec.rb +23 -24
  63. data/spec/integration/network/formats_spec.rb +0 -1
  64. data/spec/integration/node/environment_spec.rb +0 -1
  65. data/spec/integration/node/facts_spec.rb +9 -10
  66. data/spec/integration/node_spec.rb +6 -7
  67. data/spec/integration/parser/catalog_spec.rb +1 -5
  68. data/spec/integration/parser/collection_spec.rb +1 -2
  69. data/spec/integration/parser/compiler_spec.rb +6 -6
  70. data/spec/integration/parser/scope_spec.rb +1 -1
  71. data/spec/integration/parser/undef_param_spec.rb +1 -1
  72. data/spec/integration/provider/service/init_spec.rb +4 -5
  73. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  74. data/spec/integration/provider/service/windows_spec.rb +1 -2
  75. data/spec/integration/reference/providers_spec.rb +1 -2
  76. data/spec/integration/reports_spec.rb +1 -2
  77. data/spec/integration/resource/catalog_spec.rb +14 -17
  78. data/spec/integration/resource/type_collection_spec.rb +4 -5
  79. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  80. data/spec/integration/ssl/host_spec.rb +1 -2
  81. data/spec/integration/ssl/key_spec.rb +0 -1
  82. data/spec/integration/test/test_helper_spec.rb +0 -1
  83. data/spec/integration/transaction/report_spec.rb +6 -11
  84. data/spec/integration/transaction_spec.rb +18 -19
  85. data/spec/integration/type/exec_spec.rb +0 -1
  86. data/spec/integration/type/file_spec.rb +13 -14
  87. data/spec/integration/type/package_spec.rb +19 -23
  88. data/spec/integration/type/tidy_spec.rb +1 -2
  89. data/spec/integration/type_spec.rb +0 -1
  90. data/spec/integration/util/autoload_spec.rb +1 -2
  91. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  92. data/spec/integration/util/settings_spec.rb +0 -1
  93. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  94. data/spec/integration/util/windows/principal_spec.rb +0 -1
  95. data/spec/integration/util/windows/process_spec.rb +4 -6
  96. data/spec/integration/util/windows/registry_spec.rb +41 -51
  97. data/spec/integration/util/windows/security_spec.rb +2 -4
  98. data/spec/integration/util/windows/user_spec.rb +18 -20
  99. data/spec/integration/util_spec.rb +4 -7
  100. data/spec/lib/puppet_spec/compiler.rb +1 -1
  101. data/spec/lib/puppet_spec/files.rb +0 -1
  102. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  103. data/spec/lib/puppet_spec/scope.rb +1 -2
  104. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  105. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  106. data/spec/shared_behaviours/file_serving.rb +6 -8
  107. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  108. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  109. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  110. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  111. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  112. data/spec/spec_helper.rb +10 -1
  113. data/spec/unit/agent/disabler_spec.rb +4 -5
  114. data/spec/unit/agent/locker_spec.rb +12 -13
  115. data/spec/unit/agent_spec.rb +80 -85
  116. data/spec/unit/application/agent_spec.rb +88 -93
  117. data/spec/unit/application/apply_spec.rb +82 -83
  118. data/spec/unit/application/config_spec.rb +0 -1
  119. data/spec/unit/application/describe_spec.rb +6 -7
  120. data/spec/unit/application/device_spec.rb +395 -419
  121. data/spec/unit/application/doc_spec.rb +44 -46
  122. data/spec/unit/application/face_base_spec.rb +61 -62
  123. data/spec/unit/application/facts_spec.rb +3 -4
  124. data/spec/unit/application/filebucket_spec.rb +66 -74
  125. data/spec/unit/application/indirection_base_spec.rb +8 -6
  126. data/spec/unit/application/lookup_spec.rb +26 -26
  127. data/spec/unit/application/resource_spec.rb +42 -48
  128. data/spec/unit/application/ssl_spec.rb +3 -3
  129. data/spec/unit/application_spec.rb +82 -92
  130. data/spec/unit/capability_spec.rb +6 -6
  131. data/spec/unit/certificate_factory_spec.rb +3 -5
  132. data/spec/unit/configurer/downloader_spec.rb +20 -21
  133. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  134. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  135. data/spec/unit/configurer_spec.rb +189 -192
  136. data/spec/unit/confine/exists_spec.rb +17 -15
  137. data/spec/unit/confine/false_spec.rb +5 -6
  138. data/spec/unit/confine/feature_spec.rb +7 -5
  139. data/spec/unit/confine/true_spec.rb +5 -6
  140. data/spec/unit/confine/variable_spec.rb +14 -15
  141. data/spec/unit/confine_collection_spec.rb +28 -29
  142. data/spec/unit/confine_spec.rb +13 -14
  143. data/spec/unit/confiner_spec.rb +10 -11
  144. data/spec/unit/context/trusted_information_spec.rb +1 -1
  145. data/spec/unit/daemon_spec.rb +35 -36
  146. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  147. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  148. data/spec/unit/datatypes_spec.rb +3 -4
  149. data/spec/unit/defaults_spec.rb +18 -13
  150. data/spec/unit/environments_spec.rb +7 -7
  151. data/spec/unit/etc_spec.rb +30 -32
  152. data/spec/unit/external/pson_spec.rb +0 -1
  153. data/spec/unit/face/catalog_spec.rb +0 -1
  154. data/spec/unit/face/config_spec.rb +31 -35
  155. data/spec/unit/face/epp_face_spec.rb +3 -4
  156. data/spec/unit/face/facts_spec.rb +5 -6
  157. data/spec/unit/face/generate_spec.rb +4 -5
  158. data/spec/unit/face/help_spec.rb +7 -8
  159. data/spec/unit/face/key_spec.rb +0 -1
  160. data/spec/unit/face/man_spec.rb +1 -2
  161. data/spec/unit/face/module/install_spec.rb +3 -5
  162. data/spec/unit/face/module/list_spec.rb +2 -12
  163. data/spec/unit/face/module/search_spec.rb +11 -9
  164. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  165. data/spec/unit/face/node_spec.rb +23 -24
  166. data/spec/unit/face/parser_spec.rb +3 -3
  167. data/spec/unit/face/plugin_spec.rb +36 -9
  168. data/spec/unit/face/status_spec.rb +0 -1
  169. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  170. data/spec/unit/file_bucket/file_spec.rb +0 -2
  171. data/spec/unit/file_serving/base_spec.rb +14 -15
  172. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  173. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  174. data/spec/unit/file_serving/content_spec.rb +10 -11
  175. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  176. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  177. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  178. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  179. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  180. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  181. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  182. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  183. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  184. data/spec/unit/file_serving/mount_spec.rb +0 -1
  185. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  186. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  187. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  188. data/spec/unit/file_system_spec.rb +2 -2
  189. data/spec/unit/forge/errors_spec.rb +1 -1
  190. data/spec/unit/forge/forge_spec.rb +13 -14
  191. data/spec/unit/forge/module_release_spec.rb +18 -18
  192. data/spec/unit/forge/repository_spec.rb +29 -30
  193. data/spec/unit/forge_spec.rb +15 -11
  194. data/spec/unit/functions/binary_file_spec.rb +3 -3
  195. data/spec/unit/functions/contain_spec.rb +0 -2
  196. data/spec/unit/functions/defined_spec.rb +0 -1
  197. data/spec/unit/functions/epp_spec.rb +2 -2
  198. data/spec/unit/functions/find_file_spec.rb +7 -7
  199. data/spec/unit/functions/include_spec.rb +0 -4
  200. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  201. data/spec/unit/functions/lookup_spec.rb +1 -2
  202. data/spec/unit/functions/module_directory_spec.rb +12 -12
  203. data/spec/unit/functions/require_spec.rb +0 -3
  204. data/spec/unit/functions/shared.rb +5 -8
  205. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  206. data/spec/unit/functions4_spec.rb +9 -10
  207. data/spec/unit/gettext/config_spec.rb +4 -4
  208. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  209. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  210. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  211. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  212. data/spec/unit/hiera_puppet_spec.rb +20 -20
  213. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  214. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  215. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  216. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  217. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  218. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  219. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  220. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  221. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  222. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  223. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  224. data/spec/unit/indirector/envelope_spec.rb +1 -2
  225. data/spec/unit/indirector/exec_spec.rb +4 -5
  226. data/spec/unit/indirector/face_spec.rb +9 -9
  227. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  228. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  229. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  230. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  231. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  232. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  233. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  234. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  235. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  236. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  237. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  238. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  239. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  240. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  241. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  242. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  243. data/spec/unit/indirector/file_server_spec.rb +87 -87
  244. data/spec/unit/indirector/indirection_spec.rb +242 -226
  245. data/spec/unit/indirector/json_spec.rb +7 -9
  246. data/spec/unit/indirector/key/file_spec.rb +21 -22
  247. data/spec/unit/indirector/memory_spec.rb +6 -7
  248. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  249. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  250. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  251. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  252. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  253. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  254. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  255. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  256. data/spec/unit/indirector/none_spec.rb +5 -5
  257. data/spec/unit/indirector/plain_spec.rb +7 -8
  258. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  259. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  260. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  261. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  262. data/spec/unit/indirector/request_spec.rb +11 -12
  263. data/spec/unit/indirector/resource/ral_spec.rb +46 -54
  264. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  265. data/spec/unit/indirector/rest_spec.rb +113 -110
  266. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  267. data/spec/unit/indirector/status/local_spec.rb +0 -1
  268. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  269. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  270. data/spec/unit/indirector/terminus_spec.rb +27 -27
  271. data/spec/unit/indirector/yaml_spec.rb +5 -6
  272. data/spec/unit/indirector_spec.rb +1 -2
  273. data/spec/unit/info_service_spec.rb +1 -1
  274. data/spec/unit/interface/action_builder_spec.rb +0 -1
  275. data/spec/unit/interface/action_manager_spec.rb +0 -1
  276. data/spec/unit/interface/action_spec.rb +2 -3
  277. data/spec/unit/interface/documentation_spec.rb +0 -1
  278. data/spec/unit/interface/face_collection_spec.rb +19 -12
  279. data/spec/unit/interface_spec.rb +3 -3
  280. data/spec/unit/man_spec.rb +3 -4
  281. data/spec/unit/module_spec.rb +46 -51
  282. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  283. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  284. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  285. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  286. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  287. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  288. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  289. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  290. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  291. data/spec/unit/module_tool/tar_spec.rb +12 -13
  292. data/spec/unit/module_tool_spec.rb +7 -12
  293. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  294. data/spec/unit/network/authconfig_spec.rb +17 -18
  295. data/spec/unit/network/authorization_spec.rb +4 -5
  296. data/spec/unit/network/authstore_spec.rb +0 -1
  297. data/spec/unit/network/format_handler_spec.rb +0 -1
  298. data/spec/unit/network/format_spec.rb +9 -10
  299. data/spec/unit/network/format_support_spec.rb +28 -29
  300. data/spec/unit/network/formats_spec.rb +4 -5
  301. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  302. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  303. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  304. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  305. data/spec/unit/network/http/api_spec.rb +0 -2
  306. data/spec/unit/network/http/compression_spec.rb +21 -22
  307. data/spec/unit/network/http/connection_spec.rb +41 -36
  308. data/spec/unit/network/http/factory_spec.rb +5 -6
  309. data/spec/unit/network/http/handler_spec.rb +9 -18
  310. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  311. data/spec/unit/network/http/pool_spec.rb +28 -29
  312. data/spec/unit/network/http/request_spec.rb +0 -2
  313. data/spec/unit/network/http/response_spec.rb +11 -13
  314. data/spec/unit/network/http/route_spec.rb +0 -1
  315. data/spec/unit/network/http/session_spec.rb +1 -2
  316. data/spec/unit/network/http/site_spec.rb +0 -1
  317. data/spec/unit/network/http_pool_spec.rb +18 -9
  318. data/spec/unit/network/http_spec.rb +0 -1
  319. data/spec/unit/network/resolver_spec.rb +25 -26
  320. data/spec/unit/network/rights_spec.rb +52 -53
  321. data/spec/unit/node/environment_spec.rb +14 -15
  322. data/spec/unit/node/facts_spec.rb +5 -7
  323. data/spec/unit/node_spec.rb +4 -10
  324. data/spec/unit/other/selinux_spec.rb +0 -1
  325. data/spec/unit/parameter/boolean_spec.rb +1 -2
  326. data/spec/unit/parameter/package_options_spec.rb +1 -2
  327. data/spec/unit/parameter/path_spec.rb +0 -1
  328. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  329. data/spec/unit/parameter/value_spec.rb +0 -1
  330. data/spec/unit/parameter_spec.rb +9 -9
  331. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  332. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  333. data/spec/unit/parser/compiler_spec.rb +84 -96
  334. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  335. data/spec/unit/parser/files_spec.rb +0 -1
  336. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  337. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  338. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  339. data/spec/unit/parser/functions/file_spec.rb +13 -14
  340. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  341. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  342. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  343. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  344. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  345. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  346. data/spec/unit/parser/functions/split_spec.rb +0 -1
  347. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  348. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  349. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  350. data/spec/unit/parser/functions/template_spec.rb +13 -13
  351. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  352. data/spec/unit/parser/functions_spec.rb +6 -7
  353. data/spec/unit/parser/relationship_spec.rb +0 -1
  354. data/spec/unit/parser/resource_spec.rb +42 -42
  355. data/spec/unit/parser/scope_spec.rb +39 -35
  356. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  357. data/spec/unit/parser/type_loader_spec.rb +17 -19
  358. data/spec/unit/pops/adaptable_spec.rb +0 -1
  359. data/spec/unit/pops/benchmark_spec.rb +0 -1
  360. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  361. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  362. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  363. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  364. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  365. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  366. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  367. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  368. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  371. data/spec/unit/pops/factory_spec.rb +3 -4
  372. data/spec/unit/pops/issues_spec.rb +19 -20
  373. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  374. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  375. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  376. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  377. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  378. data/spec/unit/pops/migration_spec.rb +3 -5
  379. data/spec/unit/pops/model/model_spec.rb +0 -1
  380. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  381. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  382. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  383. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  384. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  385. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  386. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  387. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  388. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  389. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  390. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  391. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  392. data/spec/unit/pops/pn_spec.rb +0 -1
  393. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  394. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  395. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  396. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  397. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  398. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  399. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  400. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  401. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  402. data/spec/unit/pops/visitor_spec.rb +0 -1
  403. data/spec/unit/property/boolean_spec.rb +1 -1
  404. data/spec/unit/property/ensure_spec.rb +0 -1
  405. data/spec/unit/property/keyvalue_spec.rb +32 -34
  406. data/spec/unit/property/list_spec.rb +26 -27
  407. data/spec/unit/property/ordered_list_spec.rb +10 -14
  408. data/spec/unit/property_spec.rb +42 -43
  409. data/spec/unit/provider/aix_object_spec.rb +47 -45
  410. data/spec/unit/provider/command_spec.rb +9 -9
  411. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  412. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  413. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  414. data/spec/unit/provider/exec_spec.rb +0 -1
  415. data/spec/unit/provider/file/posix_spec.rb +22 -24
  416. data/spec/unit/provider/file/windows_spec.rb +15 -17
  417. data/spec/unit/provider/group/aix_spec.rb +3 -2
  418. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  419. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  420. data/spec/unit/provider/group/pw_spec.rb +11 -11
  421. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  422. data/spec/unit/provider/ldap_spec.rb +61 -62
  423. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  424. data/spec/unit/provider/nameservice_spec.rb +38 -40
  425. data/spec/unit/provider/package/aix_spec.rb +15 -15
  426. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  427. data/spec/unit/provider/package/apt_spec.rb +44 -27
  428. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  429. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  430. data/spec/unit/provider/package/base_spec.rb +4 -4
  431. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  432. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  433. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  434. data/spec/unit/provider/package/gem_spec.rb +51 -43
  435. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  436. data/spec/unit/provider/package/macports_spec.rb +46 -42
  437. data/spec/unit/provider/package/nim_spec.rb +30 -39
  438. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  439. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  440. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  441. data/spec/unit/provider/package/pip_spec.rb +71 -72
  442. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  443. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  444. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  445. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  446. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  447. data/spec/unit/provider/package/portage_spec.rb +70 -74
  448. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  449. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  450. data/spec/unit/provider/package/sun_spec.rb +16 -18
  451. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  452. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  453. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  454. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  455. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  456. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  457. data/spec/unit/provider/package/windows_spec.rb +36 -32
  458. data/spec/unit/provider/package/yum_spec.rb +7 -7
  459. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  460. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  461. data/spec/unit/provider/service/base_spec.rb +4 -5
  462. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  463. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  464. data/spec/unit/provider/service/debian_spec.rb +38 -38
  465. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  466. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  467. data/spec/unit/provider/service/init_spec.rb +53 -52
  468. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  469. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  470. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  471. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  472. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  473. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  474. data/spec/unit/provider/service/runit_spec.rb +29 -27
  475. data/spec/unit/provider/service/smf_spec.rb +74 -66
  476. data/spec/unit/provider/service/src_spec.rb +46 -47
  477. data/spec/unit/provider/service/systemd_spec.rb +104 -113
  478. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  479. data/spec/unit/provider/service/windows_spec.rb +33 -41
  480. data/spec/unit/provider/user/aix_spec.rb +31 -31
  481. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  482. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  483. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  484. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  485. data/spec/unit/provider/user/pw_spec.rb +37 -35
  486. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  487. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  488. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  489. data/spec/unit/provider_spec.rb +35 -35
  490. data/spec/unit/puppet_pal_2pec.rb +4 -5
  491. data/spec/unit/puppet_pal_spec.rb +0 -1
  492. data/spec/unit/puppet_spec.rb +6 -7
  493. data/spec/unit/relationship_spec.rb +0 -1
  494. data/spec/unit/reports/http_spec.rb +21 -23
  495. data/spec/unit/reports/store_spec.rb +3 -4
  496. data/spec/unit/reports_spec.rb +12 -14
  497. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  498. data/spec/unit/resource/catalog_spec.rb +72 -68
  499. data/spec/unit/resource/status_spec.rb +6 -8
  500. data/spec/unit/resource/type_collection_spec.rb +17 -18
  501. data/spec/unit/resource/type_spec.rb +34 -35
  502. data/spec/unit/resource_spec.rb +36 -32
  503. data/spec/unit/rest/client_spec.rb +58 -27
  504. data/spec/unit/rest/route_spec.rb +5 -5
  505. data/spec/unit/scheduler/job_spec.rb +0 -1
  506. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  507. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  508. data/spec/unit/settings/array_setting_spec.rb +1 -1
  509. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  510. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  511. data/spec/unit/settings/config_file_spec.rb +0 -1
  512. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  513. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  514. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  515. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  516. data/spec/unit/settings/file_setting_spec.rb +44 -46
  517. data/spec/unit/settings/path_setting_spec.rb +1 -2
  518. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  519. data/spec/unit/settings/string_setting_spec.rb +14 -15
  520. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  521. data/spec/unit/settings/value_translator_spec.rb +0 -1
  522. data/spec/unit/settings_spec.rb +228 -235
  523. data/spec/unit/ssl/base_spec.rb +14 -15
  524. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  525. data/spec/unit/ssl/certificate_spec.rb +23 -25
  526. data/spec/unit/ssl/digest_spec.rb +0 -1
  527. data/spec/unit/ssl/host_spec.rb +166 -149
  528. data/spec/unit/ssl/key_spec.rb +30 -31
  529. data/spec/unit/ssl/validator_spec.rb +38 -39
  530. data/spec/unit/task_spec.rb +44 -45
  531. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  532. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  533. data/spec/unit/transaction/event_spec.rb +16 -15
  534. data/spec/unit/transaction/persistence_spec.rb +16 -17
  535. data/spec/unit/transaction/report_spec.rb +11 -12
  536. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  537. data/spec/unit/transaction_spec.rb +100 -101
  538. data/spec/unit/type/component_spec.rb +0 -1
  539. data/spec/unit/type/exec_spec.rb +60 -56
  540. data/spec/unit/type/file/checksum_spec.rb +9 -10
  541. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  542. data/spec/unit/type/file/content_spec.rb +58 -61
  543. data/spec/unit/type/file/ctime_spec.rb +0 -1
  544. data/spec/unit/type/file/ensure_spec.rb +12 -13
  545. data/spec/unit/type/file/group_spec.rb +5 -7
  546. data/spec/unit/type/file/mode_spec.rb +4 -6
  547. data/spec/unit/type/file/mtime_spec.rb +0 -1
  548. data/spec/unit/type/file/owner_spec.rb +6 -8
  549. data/spec/unit/type/file/selinux_spec.rb +17 -19
  550. data/spec/unit/type/file/source_spec.rb +104 -101
  551. data/spec/unit/type/file/type_spec.rb +0 -1
  552. data/spec/unit/type/file_spec.rb +195 -185
  553. data/spec/unit/type/filebucket_spec.rb +4 -5
  554. data/spec/unit/type/group_spec.rb +6 -8
  555. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  556. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  557. data/spec/unit/type/package_spec.rb +56 -57
  558. data/spec/unit/type/resources_spec.rb +72 -74
  559. data/spec/unit/type/schedule_spec.rb +24 -26
  560. data/spec/unit/type/service_spec.rb +48 -48
  561. data/spec/unit/type/stage_spec.rb +0 -1
  562. data/spec/unit/type/tidy_spec.rb +61 -62
  563. data/spec/unit/type/user_spec.rb +24 -25
  564. data/spec/unit/type/whit_spec.rb +0 -1
  565. data/spec/unit/type_spec.rb +55 -54
  566. data/spec/unit/util/at_fork_spec.rb +18 -19
  567. data/spec/unit/util/autoload_spec.rb +55 -56
  568. data/spec/unit/util/backups_spec.rb +34 -35
  569. data/spec/unit/util/character_encoding_spec.rb +5 -5
  570. data/spec/unit/util/checksums_spec.rb +38 -39
  571. data/spec/unit/util/colors_spec.rb +1 -2
  572. data/spec/unit/util/command_line_spec.rb +24 -25
  573. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  574. data/spec/unit/util/diff_spec.rb +7 -8
  575. data/spec/unit/util/errors_spec.rb +0 -1
  576. data/spec/unit/util/execution_spec.rb +185 -161
  577. data/spec/unit/util/execution_stub_spec.rb +0 -1
  578. data/spec/unit/util/feature_spec.rb +21 -14
  579. data/spec/unit/util/filetype_spec.rb +49 -49
  580. data/spec/unit/util/http_proxy_spec.rb +12 -12
  581. data/spec/unit/util/inifile_spec.rb +26 -31
  582. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  583. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  584. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  585. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  586. data/spec/unit/util/lockfile_spec.rb +0 -1
  587. data/spec/unit/util/log/destinations_spec.rb +30 -33
  588. data/spec/unit/util/log_spec.rb +35 -36
  589. data/spec/unit/util/logging_spec.rb +58 -72
  590. data/spec/unit/util/metric_spec.rb +0 -1
  591. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  592. data/spec/unit/util/multi_match_spec.rb +0 -1
  593. data/spec/unit/util/network_device/config_spec.rb +0 -1
  594. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  595. data/spec/unit/util/network_device_spec.rb +7 -9
  596. data/spec/unit/util/package_spec.rb +0 -1
  597. data/spec/unit/util/pidlock_spec.rb +21 -22
  598. data/spec/unit/util/plist_spec.rb +40 -33
  599. data/spec/unit/util/posix_spec.rb +54 -51
  600. data/spec/unit/util/rdoc_spec.rb +9 -10
  601. data/spec/unit/util/reference_spec.rb +0 -1
  602. data/spec/unit/util/resource_template_spec.rb +20 -20
  603. data/spec/unit/util/retry_action_spec.rb +7 -8
  604. data/spec/unit/util/rubygems_spec.rb +7 -8
  605. data/spec/unit/util/run_mode_spec.rb +3 -4
  606. data/spec/unit/util/selinux_spec.rb +79 -72
  607. data/spec/unit/util/splayer_spec.rb +8 -9
  608. data/spec/unit/util/ssl_spec.rb +0 -1
  609. data/spec/unit/util/storage_spec.rb +3 -4
  610. data/spec/unit/util/suidmanager_spec.rb +45 -54
  611. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  612. data/spec/unit/util/tag_set_spec.rb +0 -1
  613. data/spec/unit/util/tagging_spec.rb +0 -1
  614. data/spec/unit/util/terminal_spec.rb +9 -10
  615. data/spec/unit/util/user_attr_spec.rb +1 -2
  616. data/spec/unit/util/warnings_spec.rb +3 -4
  617. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  618. data/spec/unit/util/watcher_spec.rb +51 -21
  619. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  620. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  621. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  622. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  623. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  624. data/spec/unit/util/windows/file_spec.rb +0 -1
  625. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  626. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  627. data/spec/unit/util/windows/service_spec.rb +66 -68
  628. data/spec/unit/util/windows/sid_spec.rb +11 -13
  629. data/spec/unit/util/windows/string_spec.rb +0 -1
  630. data/spec/unit/util_spec.rb +55 -57
  631. data/spec/unit/version_spec.rb +6 -6
  632. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet_spec/files'
4
3
  require 'puppet_pal'
@@ -386,8 +385,8 @@ describe 'Puppet Pal' do
386
385
  end
387
386
 
388
387
  { nil => Puppet::Error,
389
- '0xWAT' => Puppet::ParseErrorWithIssue,
390
- '$0 = 1' => Puppet::ParseErrorWithIssue,
388
+ '0xWAT' => Puppet::ParseErrorWithIssue,
389
+ '$0 = 1' => Puppet::ParseErrorWithIssue,
391
390
  'else 32' => Puppet::ParseErrorWithIssue,
392
391
  }.each_pair do |input, error_class|
393
392
  it "'parse_string' raises an error for invalid input: '#{input}'" do
@@ -513,7 +512,7 @@ describe 'Puppet Pal' do
513
512
 
514
513
  # TODO: there is something amiss with the metadata wrt dependencies - when metadata is present there is an error
515
514
  # that dependencies could not be resolved. Metadata is therefore commented out.
516
- # Dependency based visibility is probably something that we should remove...
515
+ # Dependency based visibility is probably something that we should remove...
517
516
  let(:modules) {
518
517
  {
519
518
  'a' => {
@@ -943,7 +942,7 @@ describe 'Puppet Pal' do
943
942
  testing_env_dir # creates the structure
944
943
  other_modules1 = File.join(environments_dir, 'other_env1/modules')
945
944
  other_modules2 = File.join(environments_dir, 'other_env2/modules')
946
- result = Puppet::Pal.in_environment('pal_env', envpath: environments_dir,
945
+ result = Puppet::Pal.in_environment('pal_env', envpath: environments_dir,
947
946
  pre_modulepath: [other_modules1],
948
947
  post_modulepath: [other_modules2],
949
948
  facts: node_facts
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet_spec/files'
4
3
  require_relative 'puppet_pal_2pec'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet'
4
3
  require 'puppet_spec/files'
@@ -25,8 +24,8 @@ describe Puppet do
25
24
  end
26
25
 
27
26
  it 'should propagate --modulepath to base environment' do
28
- Puppet::Node::Environment.expects(:create).with(
29
- is_a(Symbol), ['/my/modules'], Puppet::Node::Environment::NO_MANIFEST)
27
+ expect(Puppet::Node::Environment).to receive(:create).with(
28
+ be_a(Symbol), ['/my/modules'], Puppet::Node::Environment::NO_MANIFEST)
30
29
 
31
30
  Puppet.base_context({
32
31
  :environmentpath => '/envs',
@@ -36,8 +35,8 @@ describe Puppet do
36
35
  end
37
36
 
38
37
  it 'empty modulepath does not override basemodulepath' do
39
- Puppet::Node::Environment.expects(:create).with(
40
- is_a(Symbol), ['/base/modules'], Puppet::Node::Environment::NO_MANIFEST)
38
+ expect(Puppet::Node::Environment).to receive(:create).with(
39
+ be_a(Symbol), ['/base/modules'], Puppet::Node::Environment::NO_MANIFEST)
41
40
 
42
41
  Puppet.base_context({
43
42
  :environmentpath => '/envs',
@@ -47,8 +46,8 @@ describe Puppet do
47
46
  end
48
47
 
49
48
  it 'nil modulepath does not override basemodulepath' do
50
- Puppet::Node::Environment.expects(:create).with(
51
- is_a(Symbol), ['/base/modules'], Puppet::Node::Environment::NO_MANIFEST)
49
+ expect(Puppet::Node::Environment).to receive(:create).with(
50
+ be_a(Symbol), ['/base/modules'], Puppet::Node::Environment::NO_MANIFEST)
52
51
 
53
52
  Puppet.base_context({
54
53
  :environmentpath => '/envs',
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/relationship'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/reports'
4
3
 
@@ -8,19 +7,19 @@ describe processor do
8
7
  subject { Puppet::Transaction::Report.new.extend(processor) }
9
8
 
10
9
  describe "when setting up the connection" do
11
- let(:http) { stub_everything "http" }
10
+ let(:http) { double("http") }
12
11
  let(:httpok) { Net::HTTPOK.new('1.1', 200, '') }
13
12
 
14
13
  before :each do
15
- http.expects(:post).returns(httpok)
14
+ expect(http).to receive(:post).and_return(httpok)
16
15
  end
17
16
 
18
17
  it "configures the connection for ssl when using https" do
19
18
  Puppet[:reporturl] = 'https://testing:8080/the/path'
20
19
 
21
- Puppet::Network::HttpPool.expects(:http_instance).with(
20
+ expect(Puppet::Network::HttpPool).to receive(:http_instance).with(
22
21
  'testing', 8080, true
23
- ).returns http
22
+ ).and_return(http)
24
23
 
25
24
  subject.process
26
25
  end
@@ -28,26 +27,26 @@ describe processor do
28
27
  it "does not configure the connectino for ssl when using http" do
29
28
  Puppet[:reporturl] = "http://testing:8080/the/path"
30
29
 
31
- Puppet::Network::HttpPool.expects(:http_instance).with(
30
+ expect(Puppet::Network::HttpPool).to receive(:http_instance).with(
32
31
  'testing', 8080, false
33
- ).returns http
32
+ ).and_return(http)
34
33
 
35
34
  subject.process
36
35
  end
37
36
  end
38
37
 
39
38
  describe "when making a request" do
40
- let(:connection) { stub_everything "connection" }
39
+ let(:connection) { double("connection") }
41
40
  let(:httpok) { Net::HTTPOK.new('1.1', 200, '') }
42
41
  let(:options) { {:metric_id => [:puppet, :report, :http]} }
43
42
 
44
43
  before :each do
45
- Puppet::Network::HttpPool.expects(:http_instance).returns(connection)
44
+ expect(Puppet::Network::HttpPool).to receive(:http_instance).and_return(connection)
46
45
  end
47
46
 
48
47
  it "should use the path specified by the 'reporturl' setting" do
49
48
  report_path = URI.parse(Puppet[:reporturl]).path
50
- connection.expects(:post).with(report_path, anything, anything, options).returns(httpok)
49
+ expect(connection).to receive(:post).with(report_path, anything, anything, options).and_return(httpok)
51
50
 
52
51
  subject.process
53
52
  end
@@ -55,24 +54,24 @@ describe processor do
55
54
  it "should use the username and password specified by the 'reporturl' setting" do
56
55
  Puppet[:reporturl] = "https://user:pass@myhost.mydomain:1234/report/upload"
57
56
 
58
- connection.expects(:post).with(anything, anything, anything,
59
- {:metric_id => [:puppet, :report, :http],
60
- :basic_auth => {
61
- :user => 'user',
62
- :password => 'pass'
63
- }}).returns(httpok)
57
+ expect(connection).to receive(:post).with(anything, anything, anything,
58
+ {:metric_id => [:puppet, :report, :http],
59
+ :basic_auth => {
60
+ :user => 'user',
61
+ :password => 'pass'
62
+ }}).and_return(httpok)
64
63
 
65
64
  subject.process
66
65
  end
67
66
 
68
67
  it "should give the body as the report as YAML" do
69
- connection.expects(:post).with(anything, subject.to_yaml, anything, options).returns(httpok)
68
+ expect(connection).to receive(:post).with(anything, subject.to_yaml, anything, options).and_return(httpok)
70
69
 
71
70
  subject.process
72
71
  end
73
72
 
74
73
  it "should set content-type to 'application/x-yaml'" do
75
- connection.expects(:post).with(anything, anything, has_entry("Content-Type" => "application/x-yaml"), options).returns(httpok)
74
+ expect(connection).to receive(:post).with(anything, anything, hash_including("Content-Type" => "application/x-yaml"), options).and_return(httpok)
76
75
 
77
76
  subject.process
78
77
  end
@@ -81,9 +80,9 @@ describe processor do
81
80
  if code.to_i >= 200 and code.to_i < 300
82
81
  it "should succeed on http code #{code}" do
83
82
  response = klass.new('1.1', code, '')
84
- connection.expects(:post).returns(response)
83
+ expect(connection).to receive(:post).and_return(response)
85
84
 
86
- Puppet.expects(:err).never
85
+ expect(Puppet).not_to receive(:err)
87
86
  subject.process
88
87
  end
89
88
  end
@@ -91,13 +90,12 @@ describe processor do
91
90
  if code.to_i >= 300 && ![301, 302, 307].include?(code.to_i)
92
91
  it "should log error on http code #{code}" do
93
92
  response = klass.new('1.1', code, '')
94
- connection.expects(:post).returns(response)
93
+ expect(connection).to receive(:post).and_return(response)
95
94
 
96
- Puppet.expects(:err)
95
+ expect(Puppet).to receive(:err)
97
96
  subject.process
98
97
  end
99
98
  end
100
99
  end
101
-
102
100
  end
103
101
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/reports'
@@ -24,7 +23,7 @@ describe processor do
24
23
  end
25
24
 
26
25
  it "should write the report to the file in YAML" do
27
- Time.stubs(:now).returns(Time.utc(2011,01,06,12,00,00))
26
+ allow(Time).to receive(:now).and_return(Time.utc(2011,01,06,12,00,00))
28
27
  @report.process
29
28
 
30
29
  expect(File.read(File.join(Puppet[:reportdir], @report.host, "201101061200.yaml"))).to eq(@report.to_yaml)
@@ -32,14 +31,14 @@ describe processor do
32
31
 
33
32
  it "rejects invalid hostnames" do
34
33
  @report.host = ".."
35
- Puppet::FileSystem.expects(:exist?).never
34
+ expect(Puppet::FileSystem).not_to receive(:exist?)
36
35
  expect { @report.process }.to raise_error(ArgumentError, /Invalid node/)
37
36
  end
38
37
  end
39
38
 
40
39
  describe "::destroy" do
41
40
  it "rejects invalid hostnames" do
42
- Puppet::FileSystem.expects(:unlink).never
41
+ expect(Puppet::FileSystem).not_to receive(:unlink)
43
42
  expect { processor.destroy("..") }.to raise_error(ArgumentError, /Invalid node/)
44
43
  end
45
44
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/reports'
@@ -17,11 +16,11 @@ describe Puppet::Reports do
17
16
  end
18
17
 
19
18
  it "should provide a method for returning documentation for all reports" do
20
- Puppet::Reports.expects(:loaded_instances).with(:report).returns([:one, :two])
21
- one = mock 'one', :doc => "onedoc"
22
- two = mock 'two', :doc => "twodoc"
23
- Puppet::Reports.expects(:report).with(:one).returns(one)
24
- Puppet::Reports.expects(:report).with(:two).returns(two)
19
+ expect(Puppet::Reports).to receive(:loaded_instances).with(:report).and_return([:one, :two])
20
+ one = double('one', :doc => "onedoc")
21
+ two = double('two', :doc => "twodoc")
22
+ expect(Puppet::Reports).to receive(:report).with(:one).and_return(one)
23
+ expect(Puppet::Reports).to receive(:report).with(:two).and_return(two)
25
24
 
26
25
  doc = Puppet::Reports.reportdocs
27
26
  expect(doc.include?("onedoc")).to be_truthy
@@ -29,17 +28,16 @@ describe Puppet::Reports do
29
28
  end
30
29
  end
31
30
 
32
-
33
31
  describe Puppet::Reports, " when loading report types" do
34
32
  it "should use the instance loader to retrieve report types" do
35
- Puppet::Reports.expects(:loaded_instance).with(:report, :myreporttype)
33
+ expect(Puppet::Reports).to receive(:loaded_instance).with(:report, :myreporttype)
36
34
  Puppet::Reports.report(:myreporttype)
37
35
  end
38
36
  end
39
37
 
40
38
  describe Puppet::Reports, " when registering report types" do
41
39
  it "should evaluate the supplied block as code for a module" do
42
- Puppet::Reports.expects(:genmodule).returns(Module.new)
40
+ expect(Puppet::Reports).to receive(:genmodule).and_return(Module.new)
43
41
  Puppet::Reports.register_report(:testing) { }
44
42
  end
45
43
 
@@ -54,17 +52,17 @@ describe Puppet::Reports, " when registering report types" do
54
52
  end
55
53
 
56
54
  it "should extend the report type with the Puppet::Util::Docs module" do
57
- mod = stub 'module', :define_method => true
55
+ mod = double('module', :define_method => true)
58
56
 
59
- Puppet::Reports.expects(:genmodule).with { |name, options, block| options[:extend] == Puppet::Util::Docs }.returns(mod)
57
+ expect(Puppet::Reports).to receive(:genmodule).with(anything, hash_including(extend: Puppet::Util::Docs)).and_return(mod)
60
58
  Puppet::Reports.register_report(:testing) { }
61
59
  end
62
60
 
63
61
  it "should define a :report_name method in the module that returns the name of the report" do
64
- mod = mock 'module'
65
- mod.expects(:define_method).with(:report_name)
62
+ mod = double('module')
63
+ expect(mod).to receive(:define_method).with(:report_name)
66
64
 
67
- Puppet::Reports.expects(:genmodule).returns(mod)
65
+ expect(Puppet::Reports).to receive(:genmodule).and_return(mod)
68
66
  Puppet::Reports.register_report(:testing) { }
69
67
  end
70
68
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require_relative '../pops/parser/parser_rspec_helper'
4
3
  require 'puppet/resource/capability_finder'
@@ -6,15 +5,14 @@ require 'puppet/resource/capability_finder'
6
5
  describe Puppet::Resource::CapabilityFinder do
7
6
  context 'when PuppetDB is not configured' do
8
7
  it 'should error' do
9
- Puppet::Util.expects(:const_defined?).with('Puppetdb').returns false
8
+ expect(Puppet::Util).to receive(:const_defined?).with('Puppetdb').and_return(false)
10
9
  expect { Puppet::Resource::CapabilityFinder.find('production', nil, nil) }.to raise_error(/PuppetDB is not available/)
11
10
  end
12
11
  end
13
12
 
14
13
  context 'when PuppetDB is configured' do
15
-
16
14
  before(:each) do
17
- Puppet::Parser::Compiler.any_instance.stubs(:loaders).returns(loaders)
15
+ allow_any_instance_of(Puppet::Parser::Compiler).to receive(:loaders).and_return(loaders)
18
16
  Puppet.push_context({:loaders => loaders, :current_environment => env})
19
17
  if mock_pdb
20
18
  module Puppet::Util::Puppetdb
@@ -35,7 +33,7 @@ describe Puppet::Resource::CapabilityFinder do
35
33
  let(:loaders) { Puppet::Pops::Loaders.new(env) }
36
34
 
37
35
  let(:response_body) { [{"type"=>"Cap", "title"=>"cap", "parameters"=>{"host"=>"ahost"}}] }
38
- let(:response) { stub('response', :body => response_body.to_json) }
36
+ let(:response) { double('response', :body => response_body.to_json) }
39
37
 
40
38
  def make_cap_type
41
39
  Puppet::Type.newtype :cap, :is_capability => true do
@@ -46,8 +44,8 @@ describe Puppet::Resource::CapabilityFinder do
46
44
 
47
45
  describe "when query_puppetdb method is available" do
48
46
  it 'should call use the query_puppetdb method if available' do
49
- Puppet::Util::Puppetdb.expects(:query_puppetdb).returns(response_body)
50
- Puppet::Util::Puppetdb::Http.expects(:action).never
47
+ expect(Puppet::Util::Puppetdb).to receive(:query_puppetdb).and_return(response_body)
48
+ expect(Puppet::Util::Puppetdb::Http).not_to receive(:action)
51
49
 
52
50
  result = Puppet::Resource::CapabilityFinder.find('production', nil, Puppet::Resource.new('Cap', 'cap'))
53
51
  expect(result['host']).to eq('ahost')
@@ -56,11 +54,11 @@ describe Puppet::Resource::CapabilityFinder do
56
54
 
57
55
  describe "when query_puppetdb method is unavailable" do
58
56
  before :each do
59
- Puppet::Util::Puppetdb.stubs(:respond_to?).with(:query_puppetdb).returns false
57
+ allow(Puppet::Util::Puppetdb).to receive(:respond_to?).with(:query_puppetdb).and_return(false)
60
58
  end
61
59
 
62
60
  it 'should call Puppet::Util::PuppetDB::Http.action' do
63
- Puppet::Util::Puppetdb::Http.expects(:action).returns(response)
61
+ expect(Puppet::Util::Puppetdb::Http).to receive(:action).and_return(response)
64
62
  result = Puppet::Resource::CapabilityFinder.find('production', nil, Puppet::Resource.new('Cap', 'cap'))
65
63
  expect(result['host']).to eq('ahost')
66
64
  end
@@ -72,14 +70,14 @@ describe Puppet::Resource::CapabilityFinder do
72
70
 
73
71
  it 'should search for the resource without including code_id or environment' do
74
72
  resources = [{"type"=>"Cap", "title"=>"cap", "parameters"=>{"host"=>"ahost"}}]
75
- Puppet::Resource::CapabilityFinder.stubs(:search).with(nil, nil, capability).returns resources
73
+ allow(Puppet::Resource::CapabilityFinder).to receive(:search).with(nil, nil, capability).and_return(resources)
76
74
 
77
75
  result = Puppet::Resource::CapabilityFinder.find('production', code_id, Puppet::Resource.new('Cap', 'cap'))
78
76
  expect(result['host']).to eq('ahost')
79
77
  end
80
78
 
81
79
  it 'should return nil if no resource is found' do
82
- Puppet::Resource::CapabilityFinder.stubs(:search).with(nil, nil, capability).returns []
80
+ allow(Puppet::Resource::CapabilityFinder).to receive(:search).with(nil, nil, capability).and_return([])
83
81
 
84
82
  result = Puppet::Resource::CapabilityFinder.find('production', code_id, capability)
85
83
  expect(result).to be_nil
@@ -92,7 +90,7 @@ describe Puppet::Resource::CapabilityFinder do
92
90
  end
93
91
 
94
92
  before :each do
95
- Puppet::Resource::CapabilityFinder.stubs(:search).with(nil, nil, capability).returns resources
93
+ allow(Puppet::Resource::CapabilityFinder).to receive(:search).with(nil, nil, capability).and_return(resources)
96
94
  end
97
95
 
98
96
  it 'should return the resource matching environment' do
@@ -113,30 +111,30 @@ describe Puppet::Resource::CapabilityFinder do
113
111
  end
114
112
 
115
113
  before :each do
116
- Puppet::Resource::CapabilityFinder.stubs(:search).with(nil, nil, capability).returns resources
114
+ allow(Puppet::Resource::CapabilityFinder).to receive(:search).with(nil, nil, capability).and_return(resources)
117
115
  end
118
116
 
119
117
  it 'should return the resource matching code_id' do
120
- Puppet::Resource::CapabilityFinder.stubs(:search).with('production', code_id, capability).returns [{"type"=>"Cap", "title"=>"cap", "parameters"=>{"host"=>"chost"}}]
118
+ allow(Puppet::Resource::CapabilityFinder).to receive(:search).with('production', code_id, capability).and_return([{"type"=>"Cap", "title"=>"cap", "parameters"=>{"host"=>"chost"}}])
121
119
 
122
120
  result = Puppet::Resource::CapabilityFinder.find('production', code_id, capability)
123
121
  expect(result['host']).to eq('chost')
124
122
  end
125
123
 
126
124
  it 'should fail if no resource matches code_id' do
127
- Puppet::Resource::CapabilityFinder.stubs(:search).with('production', code_id, capability).returns []
125
+ allow(Puppet::Resource::CapabilityFinder).to receive(:search).with('production', code_id, capability).and_return([])
128
126
 
129
127
  expect { Puppet::Resource::CapabilityFinder.find('production', code_id, capability) }.to raise_error(Puppet::Error, /expected exactly one resource but got 2/)
130
128
  end
131
129
 
132
130
  it 'should fail if multiple resources match code_id' do
133
- Puppet::Resource::CapabilityFinder.stubs(:search).with('production', code_id, capability).returns resources
131
+ allow(Puppet::Resource::CapabilityFinder).to receive(:search).with('production', code_id, capability).and_return(resources)
134
132
 
135
133
  expect { Puppet::Resource::CapabilityFinder.find('production', code_id, capability) }.to raise_error(Puppet::DevError, /expected exactly one resource but got 2/)
136
134
  end
137
135
 
138
136
  it 'should fail if no code_id was specified' do
139
- Puppet::Resource::CapabilityFinder.stubs(:search).with('production', nil, capability).returns resources
137
+ allow(Puppet::Resource::CapabilityFinder).to receive(:search).with('production', nil, capability).and_return(resources)
140
138
  expect { Puppet::Resource::CapabilityFinder.find('production', nil, capability) }.to raise_error(Puppet::DevError, /expected exactly one resource but got 2/)
141
139
  end
142
140
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet_spec/compiler'
4
3
 
@@ -11,7 +10,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
11
10
  before do
12
11
  @basepath = make_absolute("/somepath")
13
12
  # stub this to not try to create state.yaml
14
- Puppet::Util::Storage.stubs(:store)
13
+ allow(Puppet::Util::Storage).to receive(:store)
15
14
  end
16
15
 
17
16
  it "should support json, pson, dot, yaml" do
@@ -71,11 +70,11 @@ describe Puppet::Resource::Catalog, "when compiling" do
71
70
 
72
71
  Puppet[:classfile] = File.expand_path("/class/file")
73
72
 
74
- fh = mock 'filehandle'
73
+ fh = double('filehandle')
75
74
  classfile = Puppet.settings.setting(:classfile)
76
- Puppet::FileSystem.expects(:open).with(classfile.value, classfile.mode.to_i(8), "w:UTF-8").yields fh
75
+ expect(Puppet::FileSystem).to receive(:open).with(classfile.value, classfile.mode.to_i(8), "w:UTF-8").and_yield(fh)
77
76
 
78
- fh.expects(:puts).with "foo\nbar"
77
+ expect(fh).to receive(:puts).with("foo\nbar")
79
78
 
80
79
  @catalog.write_class_file
81
80
  end
@@ -98,7 +97,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
98
97
  end
99
98
 
100
99
  it "should include a catalog_uuid" do
101
- SecureRandom.stubs(:uuid).returns ("827a74c8-cf98-44da-9ff7-18c5e4bee41e")
100
+ allow(SecureRandom).to receive(:uuid).and_return("827a74c8-cf98-44da-9ff7-18c5e4bee41e")
102
101
  catalog = Puppet::Resource::Catalog.new("host")
103
102
  expect(catalog.catalog_uuid).to eq("827a74c8-cf98-44da-9ff7-18c5e4bee41e")
104
103
  end
@@ -235,15 +234,29 @@ describe Puppet::Resource::Catalog, "when compiling" do
235
234
  @original.tag(*%w{one two three})
236
235
  @original.add_class(*%w{four five six})
237
236
 
238
- @r1 = stub_everything 'r1', :ref => "File[/a]"
239
- @r1.stubs(:respond_to?).with(:ref).returns(true)
240
- @r1.stubs(:copy_as_resource).returns(@r1)
241
- @r1.stubs(:is_a?).with(Puppet::Resource).returns(true)
242
-
243
- @r2 = stub_everything 'r2', :ref => "File[/b]"
244
- @r2.stubs(:respond_to?).with(:ref).returns(true)
245
- @r2.stubs(:copy_as_resource).returns(@r2)
246
- @r2.stubs(:is_a?).with(Puppet::Resource).returns(true)
237
+ @r1 = double(
238
+ 'r1',
239
+ :ref => "File[/a]",
240
+ :[] => nil,
241
+ :virtual => nil,
242
+ :catalog= => nil,
243
+ )
244
+ allow(@r1).to receive(:respond_to?)
245
+ allow(@r1).to receive(:respond_to?).with(:ref).and_return(true)
246
+ allow(@r1).to receive(:copy_as_resource).and_return(@r1)
247
+ allow(@r1).to receive(:is_a?).with(Puppet::Resource).and_return(true)
248
+
249
+ @r2 = double(
250
+ 'r2',
251
+ :ref => "File[/b]",
252
+ :[] => nil,
253
+ :virtual => nil,
254
+ :catalog= => nil,
255
+ )
256
+ allow(@r2).to receive(:respond_to?)
257
+ allow(@r2).to receive(:respond_to?).with(:ref).and_return(true)
258
+ allow(@r2).to receive(:copy_as_resource).and_return(@r2)
259
+ allow(@r2).to receive(:is_a?).with(Puppet::Resource).and_return(true)
247
260
 
248
261
  @resources = [@r1,@r2]
249
262
 
@@ -251,13 +264,13 @@ describe Puppet::Resource::Catalog, "when compiling" do
251
264
  end
252
265
 
253
266
  it "should transform the catalog to a resource catalog" do
254
- @original.expects(:to_catalog).with { |h,b| h == :to_resource }
267
+ expect(@original).to receive(:to_catalog).with(:to_resource)
255
268
 
256
269
  @original.filter
257
270
  end
258
271
 
259
272
  it "should scan each catalog resource in turn and apply filtering block" do
260
- @resources.each { |r| r.expects(:test?) }
273
+ @resources.each { |r| expect(r).to receive(:test?) }
261
274
  @original.filter do |r|
262
275
  r.test?
263
276
  end
@@ -321,7 +334,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
321
334
  end
322
335
 
323
336
  it "should set itself as the resource's catalog if it is not a relationship graph" do
324
- @one.expects(:catalog=).with(@catalog)
337
+ expect(@one).to receive(:catalog=).with(@catalog)
325
338
  @catalog.add_resource @one
326
339
  end
327
340
 
@@ -411,14 +424,14 @@ describe Puppet::Resource::Catalog, "when compiling" do
411
424
  it "should remove all resources when asked" do
412
425
  @catalog.add_resource @one
413
426
  @catalog.add_resource @two
414
- @one.expects :remove
415
- @two.expects :remove
427
+ expect(@one).to receive(:remove)
428
+ expect(@two).to receive(:remove)
416
429
  @catalog.clear(true)
417
430
  end
418
431
 
419
432
  it "should support a mechanism for finishing resources" do
420
- @one.expects :finish
421
- @two.expects :finish
433
+ expect(@one).to receive(:finish)
434
+ expect(@two).to receive(:finish)
422
435
  @catalog.add_resource @one
423
436
  @catalog.add_resource @two
424
437
 
@@ -426,7 +439,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
426
439
  end
427
440
 
428
441
  it "should make default resources when finalizing" do
429
- @catalog.expects(:make_default_resources)
442
+ expect(@catalog).to receive(:make_default_resources)
430
443
  @catalog.finalize
431
444
  end
432
445
 
@@ -436,8 +449,8 @@ describe Puppet::Resource::Catalog, "when compiling" do
436
449
  end
437
450
 
438
451
  it "should optionally support an initialization block and should finalize after such blocks" do
439
- @one.expects :finish
440
- @two.expects :finish
452
+ expect(@one).to receive(:finish)
453
+ expect(@two).to receive(:finish)
441
454
  Puppet::Resource::Catalog.new("host") do |conf|
442
455
  conf.add_resource @one
443
456
  conf.add_resource @two
@@ -445,7 +458,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
445
458
  end
446
459
 
447
460
  it "should inform the resource that it is the resource's catalog" do
448
- @one.expects(:catalog=).with(@catalog)
461
+ expect(@one).to receive(:catalog=).with(@catalog)
449
462
  @catalog.add_resource @one
450
463
  end
451
464
 
@@ -528,14 +541,14 @@ describe Puppet::Resource::Catalog, "when compiling" do
528
541
  it "should remove resource aliases when the target resource is removed" do
529
542
  @catalog.add_resource @one
530
543
  @catalog.alias(@one, "other")
531
- @one.expects :remove
544
+ expect(@one).to receive(:remove)
532
545
  @catalog.remove_resource(@one)
533
546
  expect(@catalog.resource("notify", "other")).to be_nil
534
547
  end
535
548
 
536
549
  it "should add an alias for the namevar when the title and name differ on isomorphic resource types" do
537
550
  resource = Puppet::Type.type(:file).new :path => @basepath+"/something", :title => "other", :content => "blah"
538
- resource.expects(:isomorphic?).returns(true)
551
+ expect(resource).to receive(:isomorphic?).and_return(true)
539
552
  @catalog.add_resource(resource)
540
553
  expect(@catalog.resource(:file, "other")).to equal(resource)
541
554
  expect(@catalog.resource(:file, @basepath+"/something").ref).to eq(resource.ref)
@@ -543,7 +556,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
543
556
 
544
557
  it "should not add an alias for the namevar when the title and name differ on non-isomorphic resource types" do
545
558
  resource = Puppet::Type.type(:file).new :path => @basepath+"/something", :title => "other", :content => "blah"
546
- resource.expects(:isomorphic?).returns(false)
559
+ expect(resource).to receive(:isomorphic?).and_return(false)
547
560
  @catalog.add_resource(resource)
548
561
  expect(@catalog.resource(:file, resource.title)).to equal(resource)
549
562
  # We can't use .should here, because the resources respond to that method.
@@ -552,8 +565,8 @@ describe Puppet::Resource::Catalog, "when compiling" do
552
565
 
553
566
  it "should provide a method to create additional resources that also registers the resource" do
554
567
  args = {:name => "/yay", :ensure => :file}
555
- resource = stub 'file', :ref => "File[/yay]", :catalog= => @catalog, :title => "/yay", :[] => "/yay"
556
- Puppet::Type.type(:file).expects(:new).with(args).returns(resource)
568
+ resource = double('file', :ref => "File[/yay]", :catalog= => @catalog, :title => "/yay", :[] => "/yay")
569
+ expect(Puppet::Type.type(:file)).to receive(:new).with(args).and_return(resource)
557
570
  @catalog.create_resource :file, args
558
571
  expect(@catalog.resource("File[/yay]")).to equal(resource)
559
572
  end
@@ -617,20 +630,20 @@ describe Puppet::Resource::Catalog, "when compiling" do
617
630
  @catalog = Puppet::Resource::Catalog.new("host")
618
631
 
619
632
  @transaction = Puppet::Transaction.new(@catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
620
- Puppet::Transaction.stubs(:new).returns(@transaction)
621
- @transaction.stubs(:evaluate)
622
- @transaction.stubs(:for_network_device=)
633
+ allow(Puppet::Transaction).to receive(:new).and_return(@transaction)
634
+ allow(@transaction).to receive(:evaluate)
635
+ allow(@transaction).to receive(:for_network_device=)
623
636
 
624
- Puppet.settings.stubs(:use)
637
+ allow(Puppet.settings).to receive(:use)
625
638
  end
626
639
 
627
640
  it "should create and evaluate a transaction" do
628
- @transaction.expects(:evaluate)
641
+ expect(@transaction).to receive(:evaluate)
629
642
  @catalog.apply
630
643
  end
631
644
 
632
645
  it "should add a transaction evalution time to the report" do
633
- @transaction.report.expects(:add_times).with(:transaction_evaluation, kind_of(Numeric))
646
+ expect(@transaction.report).to receive(:add_times).with(:transaction_evaluation, kind_of(Numeric))
634
647
  @catalog.apply
635
648
  end
636
649
 
@@ -654,17 +667,17 @@ describe Puppet::Resource::Catalog, "when compiling" do
654
667
  end
655
668
 
656
669
  it "should pass supplied tags on to the transaction" do
657
- @transaction.expects(:tags=).with(%w{one two})
670
+ expect(@transaction).to receive(:tags=).with(%w{one two})
658
671
  @catalog.apply(:tags => %w{one two})
659
672
  end
660
673
 
661
674
  it "should set ignoreschedules on the transaction if specified in apply()" do
662
- @transaction.expects(:ignoreschedules=).with(true)
675
+ expect(@transaction).to receive(:ignoreschedules=).with(true)
663
676
  @catalog.apply(:ignoreschedules => true)
664
677
  end
665
678
 
666
679
  it "should detect transaction failure and report it" do
667
- @transaction.stubs(:evaluate).raises(RuntimeError, 'transaction failed.')
680
+ allow(@transaction).to receive(:evaluate).and_raise(RuntimeError, 'transaction failed.')
668
681
  report = Puppet::Transaction::Report.new('apply')
669
682
 
670
683
  expect { @catalog.apply(:report => report) }.to raise_error(RuntimeError)
@@ -674,31 +687,28 @@ describe Puppet::Resource::Catalog, "when compiling" do
674
687
  end
675
688
 
676
689
  describe "host catalogs" do
677
-
678
690
  # super() doesn't work in the setup method for some reason
679
691
  before do
680
692
  @catalog.host_config = true
681
- Puppet::Util::Storage.stubs(:store)
693
+ allow(Puppet::Util::Storage).to receive(:store)
682
694
  end
683
695
 
684
696
  it "should initialize the state database before applying a catalog" do
685
- Puppet::Util::Storage.expects(:load)
697
+ expect(Puppet::Util::Storage).to receive(:load)
686
698
 
687
699
  # Short-circuit the apply, so we know we're loading before the transaction
688
- Puppet::Transaction.expects(:new).raises ArgumentError
700
+ expect(Puppet::Transaction).to receive(:new).and_raise(ArgumentError)
689
701
  expect { @catalog.apply }.to raise_error(ArgumentError)
690
702
  end
691
703
 
692
704
  it "should sync the state database after applying" do
693
- Puppet::Util::Storage.expects(:store)
694
- @transaction.stubs :any_failed? => false
705
+ expect(Puppet::Util::Storage).to receive(:store)
706
+ allow(@transaction).to receive(:any_failed?).and_return(false)
695
707
  @catalog.apply
696
708
  end
697
-
698
709
  end
699
710
 
700
711
  describe "non-host catalogs" do
701
-
702
712
  before do
703
713
  @catalog.host_config = false
704
714
  end
@@ -710,11 +720,10 @@ describe Puppet::Resource::Catalog, "when compiling" do
710
720
  end
711
721
 
712
722
  it "should never modify the state database" do
713
- Puppet::Util::Storage.expects(:load).never
714
- Puppet::Util::Storage.expects(:store).never
723
+ expect(Puppet::Util::Storage).not_to receive(:load)
724
+ expect(Puppet::Util::Storage).not_to receive(:store)
715
725
  @catalog.apply
716
726
  end
717
-
718
727
  end
719
728
  end
720
729
 
@@ -724,7 +733,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
724
733
  end
725
734
 
726
735
  it "should get removed when the catalog is cleaned up" do
727
- @catalog.relationship_graph.expects(:clear)
736
+ expect(@catalog.relationship_graph).to receive(:clear)
728
737
 
729
738
  @catalog.clear
730
739
 
@@ -740,19 +749,18 @@ describe Puppet::Resource::Catalog, "when compiling" do
740
749
  end
741
750
 
742
751
  it "should only write when it is a host catalog" do
743
- Puppet::FileSystem.expects(:open).with(@file, 0640, "w:UTF-8").never
752
+ expect(Puppet::FileSystem).not_to receive(:open).with(@file, 0640, "w:UTF-8")
744
753
  @catalog.host_config = false
745
754
  Puppet[:graph] = true
746
755
  @catalog.write_graph(@name)
747
756
  end
748
-
749
757
  end
750
758
 
751
759
  describe "when indirecting" do
752
760
  before do
753
761
  @real_indirection = Puppet::Resource::Catalog.indirection
754
762
 
755
- @indirection = stub 'indirection', :name => :catalog
763
+ @indirection = double('indirection', :name => :catalog)
756
764
  end
757
765
 
758
766
  it "should use the value of the 'catalog_terminus' setting to determine its terminus class" do
@@ -877,7 +885,6 @@ describe Puppet::Resource::Catalog, "when converting a resource catalog to json"
877
885
  Puppet.pop_context
878
886
  end
879
887
 
880
-
881
888
  let(:catalog_w_regexp) { compile_to_catalog("notify {'foo': message => /[a-z]+/ }") }
882
889
 
883
890
  it 'should generate rich value hash for parameter values that are not Data' do
@@ -1012,9 +1019,7 @@ describe Puppet::Resource::Catalog, "when converting a resource catalog to json"
1012
1019
  expect(message['a']).to eql(nil)
1013
1020
  expect(message['b']).to eql(10)
1014
1021
  end
1015
-
1016
1022
  end
1017
-
1018
1023
  end
1019
1024
  end
1020
1025
 
@@ -1045,30 +1050,29 @@ describe Puppet::Resource::Catalog, "when converting to json" do
1045
1050
  end
1046
1051
 
1047
1052
  it "should convert its resources to a JSON-encoded array and store it as the 'resources' data" do
1048
- one = stub 'one', :to_data_hash => "one_resource", :ref => "Foo[one]"
1049
- two = stub 'two', :to_data_hash => "two_resource", :ref => "Foo[two]"
1053
+ one = double('one', :to_data_hash => "one_resource", :ref => "Foo[one]")
1054
+ two = double('two', :to_data_hash => "two_resource", :ref => "Foo[two]")
1050
1055
 
1051
- one.expects(:'[]').with(:alias).returns nil
1052
- two.expects(:'[]').with(:alias).returns nil
1056
+ expect(one).to receive(:'[]').with(:alias).and_return(nil)
1057
+ expect(two).to receive(:'[]').with(:alias).and_return(nil)
1053
1058
 
1054
1059
  @catalog.add_resource(one)
1055
1060
  @catalog.add_resource(two)
1056
1061
 
1057
1062
  # TODO this should really guarantee sort order
1058
1063
  expect(JSON.parse(@catalog.to_json,:create_additions => false)['resources'].sort).to eq(["one_resource", "two_resource"].sort)
1059
-
1060
1064
  end
1061
1065
 
1062
1066
  it "should convert its edges to a JSON-encoded array and store it as the 'edges' data" do
1063
- one = stub 'one', :to_data_hash => "one_resource", :ref => 'Foo[one]'
1064
- two = stub 'two', :to_data_hash => "two_resource", :ref => 'Foo[two]'
1065
- three = stub 'three', :to_data_hash => "three_resource", :ref => 'Foo[three]'
1067
+ one = double('one', :to_data_hash => "one_resource", :ref => 'Foo[one]')
1068
+ two = double('two', :to_data_hash => "two_resource", :ref => 'Foo[two]')
1069
+ three = double('three', :to_data_hash => "three_resource", :ref => 'Foo[three]')
1066
1070
 
1067
1071
  @catalog.add_edge(one, two)
1068
1072
  @catalog.add_edge(two, three)
1069
1073
 
1070
- @catalog.edges_between(one, two )[0].expects(:to_data_hash).returns "one_two_json"
1071
- @catalog.edges_between(two, three)[0].expects(:to_data_hash).returns "two_three_json"
1074
+ expect(@catalog.edges_between(one, two )[0]).to receive(:to_data_hash).and_return("one_two_json")
1075
+ expect(@catalog.edges_between(two, three)[0]).to receive(:to_data_hash).and_return("two_three_json")
1072
1076
 
1073
1077
  expect(JSON.parse(@catalog.to_json,:create_additions => false)['edges'].sort).to eq(%w{one_two_json two_three_json}.sort)
1074
1078
  end