puppet 6.0.7-universal-darwin → 6.0.8-universal-darwin

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

Potentially problematic release.


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

Files changed (632) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +4 -8
  4. data/lib/puppet/application/device.rb +99 -83
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/configurer.rb +5 -4
  7. data/lib/puppet/defaults.rb +31 -11
  8. data/lib/puppet/indirector/request.rb +26 -15
  9. data/lib/puppet/network/http/connection.rb +15 -7
  10. data/lib/puppet/transaction/event_manager.rb +1 -5
  11. data/lib/puppet/type/file/source.rb +0 -1
  12. data/lib/puppet/util/connection.rb +15 -6
  13. data/lib/puppet/util/http_proxy.rb +3 -2
  14. data/lib/puppet/version.rb +1 -1
  15. data/locales/puppet.pot +99 -40
  16. data/man/man5/puppet.conf.5 +8 -8
  17. data/man/man8/puppet-agent.8 +1 -1
  18. data/man/man8/puppet-apply.8 +1 -1
  19. data/man/man8/puppet-catalog.8 +1 -1
  20. data/man/man8/puppet-config.8 +1 -1
  21. data/man/man8/puppet-describe.8 +1 -1
  22. data/man/man8/puppet-device.8 +1 -1
  23. data/man/man8/puppet-doc.8 +1 -1
  24. data/man/man8/puppet-epp.8 +1 -1
  25. data/man/man8/puppet-facts.8 +1 -1
  26. data/man/man8/puppet-filebucket.8 +1 -1
  27. data/man/man8/puppet-generate.8 +1 -1
  28. data/man/man8/puppet-help.8 +1 -1
  29. data/man/man8/puppet-key.8 +1 -1
  30. data/man/man8/puppet-lookup.8 +1 -1
  31. data/man/man8/puppet-man.8 +1 -1
  32. data/man/man8/puppet-module.8 +1 -1
  33. data/man/man8/puppet-node.8 +1 -1
  34. data/man/man8/puppet-parser.8 +1 -1
  35. data/man/man8/puppet-plugin.8 +1 -1
  36. data/man/man8/puppet-report.8 +1 -1
  37. data/man/man8/puppet-resource.8 +1 -1
  38. data/man/man8/puppet-script.8 +1 -1
  39. data/man/man8/puppet-ssl.8 +1 -1
  40. data/man/man8/puppet-status.8 +1 -1
  41. data/man/man8/puppet.8 +2 -2
  42. data/spec/integration/agent/logging_spec.rb +5 -7
  43. data/spec/integration/application/apply_spec.rb +18 -16
  44. data/spec/integration/application/doc_spec.rb +1 -2
  45. data/spec/integration/application/lookup_spec.rb +5 -5
  46. data/spec/integration/configurer_spec.rb +5 -6
  47. data/spec/integration/defaults_spec.rb +5 -6
  48. data/spec/integration/directory_environments_spec.rb +1 -1
  49. data/spec/integration/faces/config_spec.rb +3 -4
  50. data/spec/integration/faces/documentation_spec.rb +0 -1
  51. data/spec/integration/faces/plugin_spec.rb +1 -1
  52. data/spec/integration/file_bucket/file_spec.rb +2 -4
  53. data/spec/integration/file_serving/content_spec.rb +0 -1
  54. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  55. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  56. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  57. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  58. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  59. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  60. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  61. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  62. data/spec/integration/network/authconfig_spec.rb +23 -24
  63. data/spec/integration/network/formats_spec.rb +0 -1
  64. data/spec/integration/node/environment_spec.rb +0 -1
  65. data/spec/integration/node/facts_spec.rb +9 -10
  66. data/spec/integration/node_spec.rb +6 -7
  67. data/spec/integration/parser/catalog_spec.rb +1 -5
  68. data/spec/integration/parser/collection_spec.rb +1 -2
  69. data/spec/integration/parser/compiler_spec.rb +6 -6
  70. data/spec/integration/parser/scope_spec.rb +1 -1
  71. data/spec/integration/parser/undef_param_spec.rb +1 -1
  72. data/spec/integration/provider/service/init_spec.rb +4 -5
  73. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  74. data/spec/integration/provider/service/windows_spec.rb +1 -2
  75. data/spec/integration/reference/providers_spec.rb +1 -2
  76. data/spec/integration/reports_spec.rb +1 -2
  77. data/spec/integration/resource/catalog_spec.rb +14 -17
  78. data/spec/integration/resource/type_collection_spec.rb +4 -5
  79. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  80. data/spec/integration/ssl/host_spec.rb +1 -2
  81. data/spec/integration/ssl/key_spec.rb +0 -1
  82. data/spec/integration/test/test_helper_spec.rb +0 -1
  83. data/spec/integration/transaction/report_spec.rb +6 -11
  84. data/spec/integration/transaction_spec.rb +18 -19
  85. data/spec/integration/type/exec_spec.rb +0 -1
  86. data/spec/integration/type/file_spec.rb +13 -14
  87. data/spec/integration/type/package_spec.rb +19 -23
  88. data/spec/integration/type/tidy_spec.rb +1 -2
  89. data/spec/integration/type_spec.rb +0 -1
  90. data/spec/integration/util/autoload_spec.rb +1 -2
  91. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  92. data/spec/integration/util/settings_spec.rb +0 -1
  93. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  94. data/spec/integration/util/windows/principal_spec.rb +0 -1
  95. data/spec/integration/util/windows/process_spec.rb +4 -6
  96. data/spec/integration/util/windows/registry_spec.rb +41 -51
  97. data/spec/integration/util/windows/security_spec.rb +2 -4
  98. data/spec/integration/util/windows/user_spec.rb +18 -20
  99. data/spec/integration/util_spec.rb +4 -7
  100. data/spec/lib/puppet_spec/compiler.rb +1 -1
  101. data/spec/lib/puppet_spec/files.rb +0 -1
  102. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  103. data/spec/lib/puppet_spec/scope.rb +1 -2
  104. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  105. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  106. data/spec/shared_behaviours/file_serving.rb +6 -8
  107. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  108. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  109. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  110. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  111. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  112. data/spec/spec_helper.rb +10 -1
  113. data/spec/unit/agent/disabler_spec.rb +4 -5
  114. data/spec/unit/agent/locker_spec.rb +12 -13
  115. data/spec/unit/agent_spec.rb +80 -85
  116. data/spec/unit/application/agent_spec.rb +88 -93
  117. data/spec/unit/application/apply_spec.rb +82 -83
  118. data/spec/unit/application/config_spec.rb +0 -1
  119. data/spec/unit/application/describe_spec.rb +6 -7
  120. data/spec/unit/application/device_spec.rb +395 -419
  121. data/spec/unit/application/doc_spec.rb +44 -46
  122. data/spec/unit/application/face_base_spec.rb +61 -62
  123. data/spec/unit/application/facts_spec.rb +3 -4
  124. data/spec/unit/application/filebucket_spec.rb +66 -74
  125. data/spec/unit/application/indirection_base_spec.rb +8 -6
  126. data/spec/unit/application/lookup_spec.rb +26 -26
  127. data/spec/unit/application/resource_spec.rb +42 -48
  128. data/spec/unit/application/ssl_spec.rb +3 -3
  129. data/spec/unit/application_spec.rb +82 -92
  130. data/spec/unit/capability_spec.rb +6 -6
  131. data/spec/unit/certificate_factory_spec.rb +3 -5
  132. data/spec/unit/configurer/downloader_spec.rb +20 -21
  133. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  134. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  135. data/spec/unit/configurer_spec.rb +189 -192
  136. data/spec/unit/confine/exists_spec.rb +17 -15
  137. data/spec/unit/confine/false_spec.rb +5 -6
  138. data/spec/unit/confine/feature_spec.rb +7 -5
  139. data/spec/unit/confine/true_spec.rb +5 -6
  140. data/spec/unit/confine/variable_spec.rb +14 -15
  141. data/spec/unit/confine_collection_spec.rb +28 -29
  142. data/spec/unit/confine_spec.rb +13 -14
  143. data/spec/unit/confiner_spec.rb +10 -11
  144. data/spec/unit/context/trusted_information_spec.rb +1 -1
  145. data/spec/unit/daemon_spec.rb +35 -36
  146. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  147. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  148. data/spec/unit/datatypes_spec.rb +3 -4
  149. data/spec/unit/defaults_spec.rb +18 -13
  150. data/spec/unit/environments_spec.rb +7 -7
  151. data/spec/unit/etc_spec.rb +30 -32
  152. data/spec/unit/external/pson_spec.rb +0 -1
  153. data/spec/unit/face/catalog_spec.rb +0 -1
  154. data/spec/unit/face/config_spec.rb +31 -35
  155. data/spec/unit/face/epp_face_spec.rb +3 -4
  156. data/spec/unit/face/facts_spec.rb +5 -6
  157. data/spec/unit/face/generate_spec.rb +4 -5
  158. data/spec/unit/face/help_spec.rb +7 -8
  159. data/spec/unit/face/key_spec.rb +0 -1
  160. data/spec/unit/face/man_spec.rb +1 -2
  161. data/spec/unit/face/module/install_spec.rb +3 -5
  162. data/spec/unit/face/module/list_spec.rb +2 -12
  163. data/spec/unit/face/module/search_spec.rb +11 -9
  164. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  165. data/spec/unit/face/node_spec.rb +23 -24
  166. data/spec/unit/face/parser_spec.rb +3 -3
  167. data/spec/unit/face/plugin_spec.rb +36 -9
  168. data/spec/unit/face/status_spec.rb +0 -1
  169. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  170. data/spec/unit/file_bucket/file_spec.rb +0 -2
  171. data/spec/unit/file_serving/base_spec.rb +14 -15
  172. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  173. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  174. data/spec/unit/file_serving/content_spec.rb +10 -11
  175. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  176. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  177. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  178. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  179. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  180. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  181. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  182. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  183. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  184. data/spec/unit/file_serving/mount_spec.rb +0 -1
  185. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  186. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  187. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  188. data/spec/unit/file_system_spec.rb +2 -2
  189. data/spec/unit/forge/errors_spec.rb +1 -1
  190. data/spec/unit/forge/forge_spec.rb +13 -14
  191. data/spec/unit/forge/module_release_spec.rb +18 -18
  192. data/spec/unit/forge/repository_spec.rb +29 -30
  193. data/spec/unit/forge_spec.rb +15 -11
  194. data/spec/unit/functions/binary_file_spec.rb +3 -3
  195. data/spec/unit/functions/contain_spec.rb +0 -2
  196. data/spec/unit/functions/defined_spec.rb +0 -1
  197. data/spec/unit/functions/epp_spec.rb +2 -2
  198. data/spec/unit/functions/find_file_spec.rb +7 -7
  199. data/spec/unit/functions/include_spec.rb +0 -4
  200. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  201. data/spec/unit/functions/lookup_spec.rb +1 -2
  202. data/spec/unit/functions/module_directory_spec.rb +12 -12
  203. data/spec/unit/functions/require_spec.rb +0 -3
  204. data/spec/unit/functions/shared.rb +5 -8
  205. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  206. data/spec/unit/functions4_spec.rb +9 -10
  207. data/spec/unit/gettext/config_spec.rb +4 -4
  208. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  209. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  210. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  211. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  212. data/spec/unit/hiera_puppet_spec.rb +20 -20
  213. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  214. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  215. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  216. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  217. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  218. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  219. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  220. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  221. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  222. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  223. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  224. data/spec/unit/indirector/envelope_spec.rb +1 -2
  225. data/spec/unit/indirector/exec_spec.rb +4 -5
  226. data/spec/unit/indirector/face_spec.rb +9 -9
  227. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  228. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  229. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  230. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  231. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  232. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  233. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  234. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  235. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  236. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  237. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  238. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  239. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  240. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  241. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  242. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  243. data/spec/unit/indirector/file_server_spec.rb +87 -87
  244. data/spec/unit/indirector/indirection_spec.rb +242 -226
  245. data/spec/unit/indirector/json_spec.rb +7 -9
  246. data/spec/unit/indirector/key/file_spec.rb +21 -22
  247. data/spec/unit/indirector/memory_spec.rb +6 -7
  248. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  249. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  250. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  251. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  252. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  253. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  254. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  255. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  256. data/spec/unit/indirector/none_spec.rb +5 -5
  257. data/spec/unit/indirector/plain_spec.rb +7 -8
  258. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  259. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  260. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  261. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  262. data/spec/unit/indirector/request_spec.rb +11 -12
  263. data/spec/unit/indirector/resource/ral_spec.rb +46 -54
  264. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  265. data/spec/unit/indirector/rest_spec.rb +113 -110
  266. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  267. data/spec/unit/indirector/status/local_spec.rb +0 -1
  268. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  269. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  270. data/spec/unit/indirector/terminus_spec.rb +27 -27
  271. data/spec/unit/indirector/yaml_spec.rb +5 -6
  272. data/spec/unit/indirector_spec.rb +1 -2
  273. data/spec/unit/info_service_spec.rb +1 -1
  274. data/spec/unit/interface/action_builder_spec.rb +0 -1
  275. data/spec/unit/interface/action_manager_spec.rb +0 -1
  276. data/spec/unit/interface/action_spec.rb +2 -3
  277. data/spec/unit/interface/documentation_spec.rb +0 -1
  278. data/spec/unit/interface/face_collection_spec.rb +19 -12
  279. data/spec/unit/interface_spec.rb +3 -3
  280. data/spec/unit/man_spec.rb +3 -4
  281. data/spec/unit/module_spec.rb +46 -51
  282. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  283. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  284. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  285. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  286. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  287. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  288. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  289. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  290. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  291. data/spec/unit/module_tool/tar_spec.rb +12 -13
  292. data/spec/unit/module_tool_spec.rb +7 -12
  293. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  294. data/spec/unit/network/authconfig_spec.rb +17 -18
  295. data/spec/unit/network/authorization_spec.rb +4 -5
  296. data/spec/unit/network/authstore_spec.rb +0 -1
  297. data/spec/unit/network/format_handler_spec.rb +0 -1
  298. data/spec/unit/network/format_spec.rb +9 -10
  299. data/spec/unit/network/format_support_spec.rb +28 -29
  300. data/spec/unit/network/formats_spec.rb +4 -5
  301. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  302. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  303. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  304. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  305. data/spec/unit/network/http/api_spec.rb +0 -2
  306. data/spec/unit/network/http/compression_spec.rb +21 -22
  307. data/spec/unit/network/http/connection_spec.rb +41 -36
  308. data/spec/unit/network/http/factory_spec.rb +5 -6
  309. data/spec/unit/network/http/handler_spec.rb +9 -18
  310. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  311. data/spec/unit/network/http/pool_spec.rb +28 -29
  312. data/spec/unit/network/http/request_spec.rb +0 -2
  313. data/spec/unit/network/http/response_spec.rb +11 -13
  314. data/spec/unit/network/http/route_spec.rb +0 -1
  315. data/spec/unit/network/http/session_spec.rb +1 -2
  316. data/spec/unit/network/http/site_spec.rb +0 -1
  317. data/spec/unit/network/http_pool_spec.rb +18 -9
  318. data/spec/unit/network/http_spec.rb +0 -1
  319. data/spec/unit/network/resolver_spec.rb +25 -26
  320. data/spec/unit/network/rights_spec.rb +52 -53
  321. data/spec/unit/node/environment_spec.rb +14 -15
  322. data/spec/unit/node/facts_spec.rb +5 -7
  323. data/spec/unit/node_spec.rb +4 -10
  324. data/spec/unit/other/selinux_spec.rb +0 -1
  325. data/spec/unit/parameter/boolean_spec.rb +1 -2
  326. data/spec/unit/parameter/package_options_spec.rb +1 -2
  327. data/spec/unit/parameter/path_spec.rb +0 -1
  328. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  329. data/spec/unit/parameter/value_spec.rb +0 -1
  330. data/spec/unit/parameter_spec.rb +9 -9
  331. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  332. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  333. data/spec/unit/parser/compiler_spec.rb +84 -96
  334. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  335. data/spec/unit/parser/files_spec.rb +0 -1
  336. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  337. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  338. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  339. data/spec/unit/parser/functions/file_spec.rb +13 -14
  340. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  341. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  342. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  343. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  344. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  345. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  346. data/spec/unit/parser/functions/split_spec.rb +0 -1
  347. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  348. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  349. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  350. data/spec/unit/parser/functions/template_spec.rb +13 -13
  351. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  352. data/spec/unit/parser/functions_spec.rb +6 -7
  353. data/spec/unit/parser/relationship_spec.rb +0 -1
  354. data/spec/unit/parser/resource_spec.rb +42 -42
  355. data/spec/unit/parser/scope_spec.rb +39 -35
  356. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  357. data/spec/unit/parser/type_loader_spec.rb +17 -19
  358. data/spec/unit/pops/adaptable_spec.rb +0 -1
  359. data/spec/unit/pops/benchmark_spec.rb +0 -1
  360. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  361. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  362. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  363. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  364. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  365. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  366. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  367. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  368. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  371. data/spec/unit/pops/factory_spec.rb +3 -4
  372. data/spec/unit/pops/issues_spec.rb +19 -20
  373. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  374. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  375. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  376. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  377. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  378. data/spec/unit/pops/migration_spec.rb +3 -5
  379. data/spec/unit/pops/model/model_spec.rb +0 -1
  380. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  381. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  382. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  383. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  384. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  385. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  386. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  387. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  388. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  389. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  390. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  391. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  392. data/spec/unit/pops/pn_spec.rb +0 -1
  393. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  394. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  395. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  396. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  397. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  398. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  399. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  400. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  401. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  402. data/spec/unit/pops/visitor_spec.rb +0 -1
  403. data/spec/unit/property/boolean_spec.rb +1 -1
  404. data/spec/unit/property/ensure_spec.rb +0 -1
  405. data/spec/unit/property/keyvalue_spec.rb +32 -34
  406. data/spec/unit/property/list_spec.rb +26 -27
  407. data/spec/unit/property/ordered_list_spec.rb +10 -14
  408. data/spec/unit/property_spec.rb +42 -43
  409. data/spec/unit/provider/aix_object_spec.rb +47 -45
  410. data/spec/unit/provider/command_spec.rb +9 -9
  411. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  412. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  413. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  414. data/spec/unit/provider/exec_spec.rb +0 -1
  415. data/spec/unit/provider/file/posix_spec.rb +22 -24
  416. data/spec/unit/provider/file/windows_spec.rb +15 -17
  417. data/spec/unit/provider/group/aix_spec.rb +3 -2
  418. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  419. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  420. data/spec/unit/provider/group/pw_spec.rb +11 -11
  421. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  422. data/spec/unit/provider/ldap_spec.rb +61 -62
  423. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  424. data/spec/unit/provider/nameservice_spec.rb +38 -40
  425. data/spec/unit/provider/package/aix_spec.rb +15 -15
  426. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  427. data/spec/unit/provider/package/apt_spec.rb +44 -27
  428. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  429. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  430. data/spec/unit/provider/package/base_spec.rb +4 -4
  431. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  432. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  433. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  434. data/spec/unit/provider/package/gem_spec.rb +51 -43
  435. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  436. data/spec/unit/provider/package/macports_spec.rb +46 -42
  437. data/spec/unit/provider/package/nim_spec.rb +30 -39
  438. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  439. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  440. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  441. data/spec/unit/provider/package/pip_spec.rb +71 -72
  442. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  443. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  444. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  445. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  446. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  447. data/spec/unit/provider/package/portage_spec.rb +70 -74
  448. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  449. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  450. data/spec/unit/provider/package/sun_spec.rb +16 -18
  451. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  452. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  453. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  454. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  455. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  456. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  457. data/spec/unit/provider/package/windows_spec.rb +36 -32
  458. data/spec/unit/provider/package/yum_spec.rb +7 -7
  459. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  460. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  461. data/spec/unit/provider/service/base_spec.rb +4 -5
  462. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  463. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  464. data/spec/unit/provider/service/debian_spec.rb +38 -38
  465. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  466. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  467. data/spec/unit/provider/service/init_spec.rb +53 -52
  468. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  469. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  470. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  471. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  472. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  473. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  474. data/spec/unit/provider/service/runit_spec.rb +29 -27
  475. data/spec/unit/provider/service/smf_spec.rb +74 -66
  476. data/spec/unit/provider/service/src_spec.rb +46 -47
  477. data/spec/unit/provider/service/systemd_spec.rb +104 -113
  478. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  479. data/spec/unit/provider/service/windows_spec.rb +33 -41
  480. data/spec/unit/provider/user/aix_spec.rb +31 -31
  481. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  482. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  483. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  484. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  485. data/spec/unit/provider/user/pw_spec.rb +37 -35
  486. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  487. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  488. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  489. data/spec/unit/provider_spec.rb +35 -35
  490. data/spec/unit/puppet_pal_2pec.rb +4 -5
  491. data/spec/unit/puppet_pal_spec.rb +0 -1
  492. data/spec/unit/puppet_spec.rb +6 -7
  493. data/spec/unit/relationship_spec.rb +0 -1
  494. data/spec/unit/reports/http_spec.rb +21 -23
  495. data/spec/unit/reports/store_spec.rb +3 -4
  496. data/spec/unit/reports_spec.rb +12 -14
  497. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  498. data/spec/unit/resource/catalog_spec.rb +72 -68
  499. data/spec/unit/resource/status_spec.rb +6 -8
  500. data/spec/unit/resource/type_collection_spec.rb +17 -18
  501. data/spec/unit/resource/type_spec.rb +34 -35
  502. data/spec/unit/resource_spec.rb +36 -32
  503. data/spec/unit/rest/client_spec.rb +58 -27
  504. data/spec/unit/rest/route_spec.rb +5 -5
  505. data/spec/unit/scheduler/job_spec.rb +0 -1
  506. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  507. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  508. data/spec/unit/settings/array_setting_spec.rb +1 -1
  509. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  510. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  511. data/spec/unit/settings/config_file_spec.rb +0 -1
  512. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  513. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  514. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  515. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  516. data/spec/unit/settings/file_setting_spec.rb +44 -46
  517. data/spec/unit/settings/path_setting_spec.rb +1 -2
  518. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  519. data/spec/unit/settings/string_setting_spec.rb +14 -15
  520. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  521. data/spec/unit/settings/value_translator_spec.rb +0 -1
  522. data/spec/unit/settings_spec.rb +228 -235
  523. data/spec/unit/ssl/base_spec.rb +14 -15
  524. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  525. data/spec/unit/ssl/certificate_spec.rb +23 -25
  526. data/spec/unit/ssl/digest_spec.rb +0 -1
  527. data/spec/unit/ssl/host_spec.rb +166 -149
  528. data/spec/unit/ssl/key_spec.rb +30 -31
  529. data/spec/unit/ssl/validator_spec.rb +38 -39
  530. data/spec/unit/task_spec.rb +44 -45
  531. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  532. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  533. data/spec/unit/transaction/event_spec.rb +16 -15
  534. data/spec/unit/transaction/persistence_spec.rb +16 -17
  535. data/spec/unit/transaction/report_spec.rb +11 -12
  536. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  537. data/spec/unit/transaction_spec.rb +100 -101
  538. data/spec/unit/type/component_spec.rb +0 -1
  539. data/spec/unit/type/exec_spec.rb +60 -56
  540. data/spec/unit/type/file/checksum_spec.rb +9 -10
  541. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  542. data/spec/unit/type/file/content_spec.rb +58 -61
  543. data/spec/unit/type/file/ctime_spec.rb +0 -1
  544. data/spec/unit/type/file/ensure_spec.rb +12 -13
  545. data/spec/unit/type/file/group_spec.rb +5 -7
  546. data/spec/unit/type/file/mode_spec.rb +4 -6
  547. data/spec/unit/type/file/mtime_spec.rb +0 -1
  548. data/spec/unit/type/file/owner_spec.rb +6 -8
  549. data/spec/unit/type/file/selinux_spec.rb +17 -19
  550. data/spec/unit/type/file/source_spec.rb +104 -101
  551. data/spec/unit/type/file/type_spec.rb +0 -1
  552. data/spec/unit/type/file_spec.rb +195 -185
  553. data/spec/unit/type/filebucket_spec.rb +4 -5
  554. data/spec/unit/type/group_spec.rb +6 -8
  555. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  556. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  557. data/spec/unit/type/package_spec.rb +56 -57
  558. data/spec/unit/type/resources_spec.rb +72 -74
  559. data/spec/unit/type/schedule_spec.rb +24 -26
  560. data/spec/unit/type/service_spec.rb +48 -48
  561. data/spec/unit/type/stage_spec.rb +0 -1
  562. data/spec/unit/type/tidy_spec.rb +61 -62
  563. data/spec/unit/type/user_spec.rb +24 -25
  564. data/spec/unit/type/whit_spec.rb +0 -1
  565. data/spec/unit/type_spec.rb +55 -54
  566. data/spec/unit/util/at_fork_spec.rb +18 -19
  567. data/spec/unit/util/autoload_spec.rb +55 -56
  568. data/spec/unit/util/backups_spec.rb +34 -35
  569. data/spec/unit/util/character_encoding_spec.rb +5 -5
  570. data/spec/unit/util/checksums_spec.rb +38 -39
  571. data/spec/unit/util/colors_spec.rb +1 -2
  572. data/spec/unit/util/command_line_spec.rb +24 -25
  573. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  574. data/spec/unit/util/diff_spec.rb +7 -8
  575. data/spec/unit/util/errors_spec.rb +0 -1
  576. data/spec/unit/util/execution_spec.rb +185 -161
  577. data/spec/unit/util/execution_stub_spec.rb +0 -1
  578. data/spec/unit/util/feature_spec.rb +21 -14
  579. data/spec/unit/util/filetype_spec.rb +49 -49
  580. data/spec/unit/util/http_proxy_spec.rb +12 -12
  581. data/spec/unit/util/inifile_spec.rb +26 -31
  582. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  583. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  584. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  585. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  586. data/spec/unit/util/lockfile_spec.rb +0 -1
  587. data/spec/unit/util/log/destinations_spec.rb +30 -33
  588. data/spec/unit/util/log_spec.rb +35 -36
  589. data/spec/unit/util/logging_spec.rb +58 -72
  590. data/spec/unit/util/metric_spec.rb +0 -1
  591. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  592. data/spec/unit/util/multi_match_spec.rb +0 -1
  593. data/spec/unit/util/network_device/config_spec.rb +0 -1
  594. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  595. data/spec/unit/util/network_device_spec.rb +7 -9
  596. data/spec/unit/util/package_spec.rb +0 -1
  597. data/spec/unit/util/pidlock_spec.rb +21 -22
  598. data/spec/unit/util/plist_spec.rb +40 -33
  599. data/spec/unit/util/posix_spec.rb +54 -51
  600. data/spec/unit/util/rdoc_spec.rb +9 -10
  601. data/spec/unit/util/reference_spec.rb +0 -1
  602. data/spec/unit/util/resource_template_spec.rb +20 -20
  603. data/spec/unit/util/retry_action_spec.rb +7 -8
  604. data/spec/unit/util/rubygems_spec.rb +7 -8
  605. data/spec/unit/util/run_mode_spec.rb +3 -4
  606. data/spec/unit/util/selinux_spec.rb +79 -72
  607. data/spec/unit/util/splayer_spec.rb +8 -9
  608. data/spec/unit/util/ssl_spec.rb +0 -1
  609. data/spec/unit/util/storage_spec.rb +3 -4
  610. data/spec/unit/util/suidmanager_spec.rb +45 -54
  611. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  612. data/spec/unit/util/tag_set_spec.rb +0 -1
  613. data/spec/unit/util/tagging_spec.rb +0 -1
  614. data/spec/unit/util/terminal_spec.rb +9 -10
  615. data/spec/unit/util/user_attr_spec.rb +1 -2
  616. data/spec/unit/util/warnings_spec.rb +3 -4
  617. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  618. data/spec/unit/util/watcher_spec.rb +51 -21
  619. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  620. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  621. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  622. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  623. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  624. data/spec/unit/util/windows/file_spec.rb +0 -1
  625. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  626. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  627. data/spec/unit/util/windows/service_spec.rb +66 -68
  628. data/spec/unit/util/windows/sid_spec.rb +11 -13
  629. data/spec/unit/util/windows/string_spec.rb +0 -1
  630. data/spec/unit/util_spec.rb +55 -57
  631. data/spec/unit/version_spec.rb +6 -6
  632. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/ssl/key'
@@ -48,36 +47,36 @@ describe Puppet::SSL::Key do
48
47
 
49
48
  it "should be able to read keys from disk" do
50
49
  path = "/my/path"
51
- Puppet::FileSystem.expects(:read).with(path, :encoding => Encoding::ASCII).returns("my key")
52
- key = mock 'key'
53
- OpenSSL::PKey::RSA.expects(:new).returns(key)
50
+ expect(Puppet::FileSystem).to receive(:read).with(path, :encoding => Encoding::ASCII).and_return("my key")
51
+ key = double('key')
52
+ expect(OpenSSL::PKey::RSA).to receive(:new).and_return(key)
54
53
  expect(@key.read(path)).to equal(key)
55
54
  expect(@key.content).to equal(key)
56
55
  end
57
56
 
58
57
  it "should not try to use the provided password file if the file does not exist" do
59
- Puppet::FileSystem.stubs(:exist?).returns false
58
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
60
59
  @key.password_file = "/path/to/password"
61
60
 
62
61
  path = "/my/path"
63
62
 
64
- Puppet::FileSystem.stubs(:read).with(path, :encoding => Encoding::ASCII).returns("my key")
65
- OpenSSL::PKey::RSA.expects(:new).with("my key", nil).returns(mock('key'))
66
- Puppet::FileSystem.expects(:read).with("/path/to/password", :encoding => Encoding::BINARY).never
63
+ allow(Puppet::FileSystem).to receive(:read).with(path, :encoding => Encoding::ASCII).and_return("my key")
64
+ expect(OpenSSL::PKey::RSA).to receive(:new).with("my key", nil).and_return(double('key'))
65
+ expect(Puppet::FileSystem).not_to receive(:read).with("/path/to/password", :encoding => Encoding::BINARY)
67
66
 
68
67
  @key.read(path)
69
68
  end
70
69
 
71
70
  it "should read the key with the password retrieved from the password file if one is provided" do
72
- Puppet::FileSystem.stubs(:exist?).returns true
71
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
73
72
  @key.password_file = "/path/to/password"
74
73
 
75
74
  path = "/my/path"
76
- Puppet::FileSystem.expects(:read).with(path, :encoding => Encoding::ASCII).returns("my key")
77
- Puppet::FileSystem.expects(:read).with("/path/to/password", :encoding => Encoding::BINARY).returns("my password")
75
+ expect(Puppet::FileSystem).to receive(:read).with(path, :encoding => Encoding::ASCII).and_return("my key")
76
+ expect(Puppet::FileSystem).to receive(:read).with("/path/to/password", :encoding => Encoding::BINARY).and_return("my password")
78
77
 
79
- key = mock 'key'
80
- OpenSSL::PKey::RSA.expects(:new).with("my key", "my password").returns(key)
78
+ key = double('key')
79
+ expect(OpenSSL::PKey::RSA).to receive(:new).with("my key", "my password").and_return(key)
81
80
  expect(@key.read(path)).to equal(key)
82
81
  expect(@key.content).to equal(key)
83
82
  end
@@ -87,14 +86,14 @@ describe Puppet::SSL::Key do
87
86
  end
88
87
 
89
88
  it "should convert the key to pem format when converted to a string" do
90
- key = mock 'key', :to_pem => "pem"
89
+ key = double('key', :to_pem => "pem")
91
90
  @key.content = key
92
91
  expect(@key.to_s).to eq("pem")
93
92
  end
94
93
 
95
94
  it "should have a :to_text method that it delegates to the actual key" do
96
- real_key = mock 'key'
97
- real_key.expects(:to_text).returns "keytext"
95
+ real_key = double('key')
96
+ expect(real_key).to receive(:to_text).and_return("keytext")
98
97
  @key.content = real_key
99
98
  expect(@key.to_text).to eq("keytext")
100
99
  end
@@ -104,43 +103,43 @@ describe Puppet::SSL::Key do
104
103
  before do
105
104
  @instance = @class.new("test")
106
105
 
107
- @key = mock 'key'
106
+ @key = double('key')
108
107
  end
109
108
 
110
109
  it "should create an instance of OpenSSL::PKey::RSA" do
111
- OpenSSL::PKey::RSA.expects(:new).returns(@key)
110
+ expect(OpenSSL::PKey::RSA).to receive(:new).and_return(@key)
112
111
 
113
112
  @instance.generate
114
113
  end
115
114
 
116
115
  it "should create the private key with the keylength specified in the settings" do
117
116
  Puppet[:keylength] = 513
118
- OpenSSL::PKey::RSA.expects(:new).with(513).returns(@key)
117
+ expect(OpenSSL::PKey::RSA).to receive(:new).with(513).and_return(@key)
119
118
 
120
119
  @instance.generate
121
120
  end
122
121
 
123
122
  it "should set the content to the generated key" do
124
- OpenSSL::PKey::RSA.stubs(:new).returns(@key)
123
+ allow(OpenSSL::PKey::RSA).to receive(:new).and_return(@key)
125
124
  @instance.generate
126
125
  expect(@instance.content).to equal(@key)
127
126
  end
128
127
 
129
128
  it "should return the generated key" do
130
- OpenSSL::PKey::RSA.stubs(:new).returns(@key)
129
+ allow(OpenSSL::PKey::RSA).to receive(:new).and_return(@key)
131
130
  expect(@instance.generate).to equal(@key)
132
131
  end
133
132
 
134
133
  it "should return the key in pem format" do
135
134
  @instance.generate
136
- @instance.content.expects(:to_pem).returns "my normal key"
135
+ expect(@instance.content).to receive(:to_pem).and_return("my normal key")
137
136
  expect(@instance.to_s).to eq("my normal key")
138
137
  end
139
138
 
140
139
  describe "with a password file set" do
141
140
  it "should return a nil password if the password file does not exist" do
142
- Puppet::FileSystem.expects(:exist?).with("/path/to/pass").returns false
143
- Puppet::FileSystem.expects(:read).with("/path/to/pass", :encoding => Encoding::BINARY).never
141
+ expect(Puppet::FileSystem).to receive(:exist?).with("/path/to/pass").and_return(false)
142
+ expect(Puppet::FileSystem).not_to receive(:read).with("/path/to/pass", :encoding => Encoding::BINARY)
144
143
 
145
144
  @instance.password_file = "/path/to/pass"
146
145
 
@@ -148,8 +147,8 @@ describe Puppet::SSL::Key do
148
147
  end
149
148
 
150
149
  it "should return the contents of the password file as its password" do
151
- Puppet::FileSystem.expects(:exist?).with("/path/to/pass").returns true
152
- Puppet::FileSystem.expects(:read).with("/path/to/pass", :encoding => Encoding::BINARY).returns "my password"
150
+ expect(Puppet::FileSystem).to receive(:exist?).with("/path/to/pass").and_return(true)
151
+ expect(Puppet::FileSystem).to receive(:read).with("/path/to/pass", :encoding => Encoding::BINARY).and_return("my password")
153
152
 
154
153
  @instance.password_file = "/path/to/pass"
155
154
 
@@ -158,14 +157,14 @@ describe Puppet::SSL::Key do
158
157
 
159
158
  it "should export the private key to text using the password" do
160
159
  @instance.password_file = "/path/to/pass"
161
- @instance.stubs(:password).returns "my password"
160
+ allow(@instance).to receive(:password).and_return("my password")
162
161
 
163
- OpenSSL::PKey::RSA.expects(:new).returns(@key)
162
+ expect(OpenSSL::PKey::RSA).to receive(:new).and_return(@key)
164
163
  @instance.generate
165
164
 
166
- cipher = mock 'cipher'
167
- OpenSSL::Cipher::DES.expects(:new).with(:EDE3, :CBC).returns cipher
168
- @key.expects(:export).with(cipher, "my password").returns "my encrypted key"
165
+ cipher = double('cipher')
166
+ expect(OpenSSL::Cipher::DES).to receive(:new).with(:EDE3, :CBC).and_return(cipher)
167
+ expect(@key).to receive(:export).with(cipher, "my password").and_return("my encrypted key")
169
168
 
170
169
  expect(@instance.to_s).to eq("my encrypted key")
171
170
  end
@@ -5,7 +5,7 @@ require 'puppet_spec/ssl'
5
5
  describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platform.jruby? do
6
6
  include PuppetSpec::Files
7
7
  let(:ssl_context) do
8
- mock('OpenSSL::X509::StoreContext')
8
+ double('OpenSSL::X509::StoreContext')
9
9
  end
10
10
 
11
11
  before(:all) do
@@ -17,10 +17,10 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
17
17
  end
18
18
 
19
19
  let(:ssl_host) do
20
- stub('ssl_host',
21
- :ssl_store => nil,
22
- :certificate => stub('cert', :content => nil),
23
- :key => stub('key', :content => nil))
20
+ double('ssl_host',
21
+ :ssl_store => nil,
22
+ :certificate => double('cert', :content => nil),
23
+ :key => double('key', :content => nil))
24
24
  end
25
25
 
26
26
  subject do
@@ -28,13 +28,13 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
28
28
  end
29
29
 
30
30
  before :each do
31
- subject.stubs(:read_file).returns(@pki[:root_cert].to_s)
31
+ allow(subject).to receive(:read_file).and_return(@pki[:root_cert].to_s)
32
32
  end
33
33
 
34
34
  describe '#call' do
35
35
  before :each do
36
- ssl_context.stubs(:current_cert).returns(*cert_chain_in_callback_order)
37
- ssl_context.stubs(:chain).returns(cert_chain)
36
+ allow(ssl_context).to receive(:current_cert).and_return(*cert_chain_in_callback_order)
37
+ allow(ssl_context).to receive(:chain).and_return(cert_chain)
38
38
  end
39
39
 
40
40
  context 'When pre-verification is not OK' do
@@ -43,31 +43,31 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
43
43
  let(:code) { OpenSSL::X509::V_ERR_INVALID_CA }
44
44
 
45
45
  it 'rejects the connection' do
46
- ssl_context.stubs(:error_string).returns("Something went wrong")
47
- ssl_context.stubs(:error).returns(code)
46
+ allow(ssl_context).to receive(:error_string).and_return("Something went wrong")
47
+ allow(ssl_context).to receive(:error).and_return(code)
48
48
 
49
49
  expect(subject.call(false, ssl_context)).to eq(false)
50
50
  end
51
51
 
52
52
  it 'makes the error available via #verify_errors' do
53
- ssl_context.stubs(:error_string).returns("Something went wrong")
54
- ssl_context.stubs(:error).returns(code)
53
+ allow(ssl_context).to receive(:error_string).and_return("Something went wrong")
54
+ allow(ssl_context).to receive(:error).and_return(code)
55
55
 
56
56
  subject.call(false, ssl_context)
57
57
  expect(subject.verify_errors).to eq(["Something went wrong for #{root_subject}"])
58
58
  end
59
59
 
60
60
  it 'uses a generic message if error_string is nil' do
61
- ssl_context.stubs(:error_string).returns(nil)
62
- ssl_context.stubs(:error).returns(code)
61
+ allow(ssl_context).to receive(:error_string).and_return(nil)
62
+ allow(ssl_context).to receive(:error).and_return(code)
63
63
 
64
64
  subject.call(false, ssl_context)
65
65
  expect(subject.verify_errors).to eq(["OpenSSL error #{code} for #{root_subject}"])
66
66
  end
67
67
 
68
68
  it 'uses 0 for nil error codes' do
69
- ssl_context.stubs(:error_string).returns("Something went wrong")
70
- ssl_context.stubs(:error).returns(nil)
69
+ allow(ssl_context).to receive(:error_string).and_return("Something went wrong")
70
+ allow(ssl_context).to receive(:error).and_return(nil)
71
71
 
72
72
  subject.call(false, ssl_context)
73
73
  expect(subject.verify_errors).to eq(["Something went wrong for #{root_subject}"])
@@ -75,12 +75,12 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
75
75
 
76
76
  context "when CRL is not yet valid" do
77
77
  before :each do
78
- ssl_context.stubs(:error_string).returns("CRL is not yet valid")
79
- ssl_context.stubs(:error).returns(OpenSSL::X509::V_ERR_CRL_NOT_YET_VALID)
78
+ allow(ssl_context).to receive(:error_string).and_return("CRL is not yet valid")
79
+ allow(ssl_context).to receive(:error).and_return(OpenSSL::X509::V_ERR_CRL_NOT_YET_VALID)
80
80
  end
81
81
 
82
82
  it 'rejects nil CRL' do
83
- ssl_context.stubs(:current_crl).returns(nil)
83
+ allow(ssl_context).to receive(:current_crl).and_return(nil)
84
84
 
85
85
  expect(subject.call(false, ssl_context)).to eq(false)
86
86
  expect(subject.verify_errors).to eq(["CRL is not yet valid"])
@@ -90,7 +90,7 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
90
90
  crl = OpenSSL::X509::CRL.new
91
91
  crl.issuer = OpenSSL::X509::Name.new([['CN','Puppet CA: puppetmaster.example.com']])
92
92
  crl.last_update = Time.now + 24 * 60 * 60
93
- ssl_context.stubs(:current_crl).returns(crl)
93
+ allow(ssl_context).to receive(:current_crl).and_return(crl)
94
94
 
95
95
  subject.call(false, ssl_context)
96
96
  expect(subject.verify_errors).to eq(["CRL is not yet valid for /CN=Puppet CA: puppetmaster.example.com"])
@@ -100,7 +100,7 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
100
100
  crl = OpenSSL::X509::CRL.new
101
101
  crl.issuer = OpenSSL::X509::Name.new([['CN','Puppet CA: puppetmaster.example.com']])
102
102
  crl.last_update = Time.now + 24 * 60 * 60
103
- ssl_context.stubs(:current_crl).returns(crl)
103
+ allow(ssl_context).to receive(:current_crl).and_return(crl)
104
104
 
105
105
  expect(subject.call(false, ssl_context)).to eq(false)
106
106
  end
@@ -109,7 +109,7 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
109
109
  crl = OpenSSL::X509::CRL.new
110
110
  crl.issuer = OpenSSL::X509::Name.new([['CN','Puppet CA: puppetmaster.example.com']])
111
111
  crl.last_update = Time.now + 10
112
- ssl_context.stubs(:current_crl).returns(crl)
112
+ allow(ssl_context).to receive(:current_crl).and_return(crl)
113
113
 
114
114
  expect(subject.call(false, ssl_context)).to eq(true)
115
115
  end
@@ -120,7 +120,7 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
120
120
  context 'When pre-verification is OK' do
121
121
  context 'and the ssl_context is in an error state' do
122
122
  before :each do
123
- ssl_context.stubs(:error_string).returns("Something went wrong")
123
+ allow(ssl_context).to receive(:error_string).and_return("Something went wrong")
124
124
  end
125
125
 
126
126
  it 'does not make the error available via #verify_errors' do
@@ -146,7 +146,7 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
146
146
 
147
147
  context 'and the chain is invalid' do
148
148
  before :each do
149
- subject.stubs(:read_file).returns(@pki[:unrevoked_leaf_node_cert])
149
+ allow(subject).to receive(:read_file).and_return(@pki[:unrevoked_leaf_node_cert])
150
150
  end
151
151
 
152
152
  it 'is true for each CA certificate in the chain' do
@@ -165,7 +165,7 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
165
165
 
166
166
  context 'an error is raised inside of #call' do
167
167
  before :each do
168
- ssl_context.expects(:current_cert).raises(StandardError, "BOOM!")
168
+ expect(ssl_context).to receive(:current_cert).and_raise(StandardError, "BOOM!")
169
169
  end
170
170
 
171
171
  it 'is false' do
@@ -182,26 +182,25 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
182
182
 
183
183
  describe '#setup_connection' do
184
184
  it 'updates the connection for verification' do
185
- subject.stubs(:ssl_certificates_are_present?).returns(true)
186
- connection = mock('Net::HTTP')
185
+ allow(subject).to receive(:ssl_certificates_are_present?).and_return(true)
186
+ connection = double('Net::HTTP')
187
187
 
188
- connection.expects(:cert_store=).with(ssl_host.ssl_store)
189
- connection.expects(:ca_file=).with(ca_path)
190
- connection.expects(:cert=).with(ssl_host.certificate.content)
191
- connection.expects(:key=).with(ssl_host.key.content)
192
- connection.expects(:verify_callback=).with(subject)
193
- connection.expects(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
188
+ expect(connection).to receive(:cert_store=).with(ssl_host.ssl_store)
189
+ expect(connection).to receive(:ca_file=).with(ca_path)
190
+ expect(connection).to receive(:cert=).with(ssl_host.certificate.content)
191
+ expect(connection).to receive(:key=).with(ssl_host.key.content)
192
+ expect(connection).to receive(:verify_callback=).with(subject)
193
+ expect(connection).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
194
194
 
195
195
  subject.setup_connection(connection, ssl_host)
196
196
  end
197
197
 
198
198
  context 'when no file path is found' do
199
-
200
199
  it 'does not perform verification if certificate files are missing' do
201
- subject.stubs(:ssl_certificates_are_present?).returns(false)
202
- connection = mock('Net::HTTP')
200
+ allow(subject).to receive(:ssl_certificates_are_present?).and_return(false)
201
+ connection = double('Net::HTTP')
203
202
 
204
- connection.expects(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
203
+ expect(connection).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
205
204
 
206
205
  subject.setup_connection(connection, ssl_host)
207
206
  end
@@ -215,7 +214,7 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
215
214
 
216
215
  context 'when the peer presents a valid chain' do
217
216
  before :each do
218
- subject.stubs(:has_authz_peer_cert).returns(true)
217
+ allow(subject).to receive(:has_authz_peer_cert).and_return(true)
219
218
  end
220
219
 
221
220
  it 'is true' do
@@ -225,7 +224,7 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
225
224
 
226
225
  context 'when the peer presents an invalid chain' do
227
226
  before :each do
228
- subject.stubs(:has_authz_peer_cert).returns(false)
227
+ allow(subject).to receive(:has_authz_peer_cert).and_return(false)
229
228
  end
230
229
 
231
230
  it 'is false' do
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet_spec/files'
4
3
  require 'puppet_spec/modules'
@@ -24,9 +23,9 @@ describe Puppet::Module::Task do
24
23
 
25
24
  it "constructs tasks as expected when every task has a metadata file with the same name (besides extension)" do
26
25
  task_files = %w{task1.json task1 task2.json task2.exe task3.json task3.sh}.map { |bn| "#{tasks_path}/#{bn}" }
27
- Dir.expects(:glob).with(tasks_glob).returns(task_files)
26
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(task_files)
28
27
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
29
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({})
28
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({})
30
29
 
31
30
  expect(tasks.count).to eq(3)
32
31
  expect(tasks.map{|t| t.name}).to eq(%w{mymod::task1 mymod::task2 mymod::task3})
@@ -52,8 +51,8 @@ describe Puppet::Module::Task do
52
51
 
53
52
  it "constructs tasks as expected when some tasks don't have a metadata file" do
54
53
  task_files = %w{task1 task2.exe task3.json task3.sh}.map { |bn| "#{tasks_path}/#{bn}" }
55
- Dir.expects(:glob).with(tasks_glob).returns(task_files)
56
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({})
54
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(task_files)
55
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({})
57
56
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
58
57
 
59
58
  expect(tasks.count).to eq(3)
@@ -66,9 +65,9 @@ describe Puppet::Module::Task do
66
65
 
67
66
  it "constructs a task as expected when a task has implementations" do
68
67
  task_files = %w{task1.elf task1.sh task1.json}.map { |bn| "#{tasks_path}/#{bn}" }
69
- Dir.expects(:glob).with(tasks_glob).returns(task_files)
68
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(task_files)
70
69
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
71
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({'implementations' => [{"name" => "task1.sh"}]})
70
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({'implementations' => [{"name" => "task1.sh"}]})
72
71
 
73
72
  expect(tasks.count).to eq(1)
74
73
  expect(tasks.map{|t| t.name}).to eq(%w{mymod::task1})
@@ -78,10 +77,10 @@ describe Puppet::Module::Task do
78
77
 
79
78
  it "constructs a task as expected when task metadata declares additional files" do
80
79
  task_files = %w{task1.sh task1.json}.map { |bn| "#{tasks_path}/#{bn}" }
81
- Dir.expects(:glob).with(tasks_glob).returns(task_files)
82
- Puppet::Module::Task.expects(:find_extra_files).returns([{'name' => 'mymod/lib/file0.elf', 'path' => "/path/to/file0.elf"}])
80
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(task_files)
81
+ expect(Puppet::Module::Task).to receive(:find_extra_files).and_return([{'name' => 'mymod/lib/file0.elf', 'path' => "/path/to/file0.elf"}])
83
82
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
84
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({'files' => ["mymod/lib/file0.elf"]})
83
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({'files' => ["mymod/lib/file0.elf"]})
85
84
 
86
85
  expect(tasks.count).to eq(1)
87
86
  expect(tasks.map{|t| t.name}).to eq(%w{mymod::task1})
@@ -91,10 +90,10 @@ describe Puppet::Module::Task do
91
90
 
92
91
  it "constructs a task as expected when a task implementation declares additional files" do
93
92
  task_files = %w{task1.sh task1.json}.map { |bn| "#{tasks_path}/#{bn}" }
94
- Dir.expects(:glob).with(tasks_glob).returns(task_files)
95
- Puppet::Module::Task.expects(:find_extra_files).returns([{'name' => 'mymod/lib/file0.elf', 'path' => "/path/to/file0.elf"}])
93
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(task_files)
94
+ expect(Puppet::Module::Task).to receive(:find_extra_files).and_return([{'name' => 'mymod/lib/file0.elf', 'path' => "/path/to/file0.elf"}])
96
95
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
97
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({'implementations' => [{"name" => "task1.sh", "files" => ["mymod/lib/file0.elf"]}]})
96
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({'implementations' => [{"name" => "task1.sh", "files" => ["mymod/lib/file0.elf"]}]})
98
97
 
99
98
  expect(tasks.count).to eq(1)
100
99
  expect(tasks.map{|t| t.name}).to eq(%w{mymod::task1})
@@ -104,13 +103,13 @@ describe Puppet::Module::Task do
104
103
 
105
104
  it "constructs a task as expected when task metadata and a task implementation both declare additional files" do
106
105
  task_files = %w{task1.sh task1.json}.map { |bn| "#{tasks_path}/#{bn}" }
107
- Dir.expects(:glob).with(tasks_glob).returns(task_files)
108
- Puppet::Module::Task.expects(:find_extra_files).returns([
106
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(task_files)
107
+ expect(Puppet::Module::Task).to receive(:find_extra_files).and_return([
109
108
  {'name' => 'mymod/lib/file0.elf', 'path' => "/path/to/file0.elf"},
110
109
  {'name' => 'yourmod/files/file1.txt', 'path' => "/other/path/to/file1.txt"}
111
110
  ])
112
111
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
113
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({'implementations' => [{"name" => "task1.sh", "files" => ["mymod/lib/file0.elf"]}]})
112
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({'implementations' => [{"name" => "task1.sh", "files" => ["mymod/lib/file0.elf"]}]})
114
113
 
115
114
  expect(tasks.count).to eq(1)
116
115
  expect(tasks.map{|t| t.name}).to eq(%w{mymod::task1})
@@ -124,14 +123,14 @@ describe Puppet::Module::Task do
124
123
 
125
124
  it "constructs a task as expected when a task has files" do
126
125
  og_files = %w{task1.sh task1.json}.map { |bn| "#{tasks_path}/#{bn}" }
127
- Dir.expects(:glob).with(tasks_glob).returns(og_files)
128
- File.expects(:exist?).with(any_parameters).returns(true).at_least(1)
126
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(og_files)
127
+ expect(File).to receive(:exist?).with(any_args).and_return(true).at_least(:once)
129
128
 
130
- Puppet::Module.expects(:find).with(othermod.name, "production").returns(othermod).at_least(1)
129
+ expect(Puppet::Module).to receive(:find).with(othermod.name, "production").and_return(othermod).at_least(:once)
131
130
  short_files = %w{other_task.sh other_task.json task_2.sh}.map { |bn| "#{othermod.name}/tasks/#{bn}" }
132
131
  long_files = %w{other_task.sh other_task.json task_2.sh}.map { |bn| "#{other_tasks_path}/#{bn}" }
133
132
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
134
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({'files' => short_files})
133
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({'files' => short_files})
135
134
 
136
135
  expect(tasks.count).to eq(1)
137
136
  expect(tasks.map{|t| t.files.map{ |f| f["path"] } }).to eq([["#{tasks_path}/task1.sh"] + long_files])
@@ -139,18 +138,18 @@ describe Puppet::Module::Task do
139
138
 
140
139
  it "fails to load a task if its metadata specifies a non-existent file" do
141
140
  og_files = %w{task1.sh task1.json}.map { |bn| "#{tasks_path}/#{bn}" }
142
- Dir.stubs(:glob).with(tasks_glob).returns(og_files)
143
- File.stubs(:exist?).with(any_parameters).returns(true)
141
+ allow(Dir).to receive(:glob).with(tasks_glob).and_return(og_files)
142
+ allow(File).to receive(:exist?).with(any_args).and_return(true)
144
143
 
145
- Puppet::Module.expects(:find).with(othermod.name, "production").returns(nil).at_least(1)
144
+ expect(Puppet::Module).to receive(:find).with(othermod.name, "production").and_return(nil).at_least(:once)
146
145
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
147
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({'files' => ["#{othermod.name}/files/test"]})
146
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({'files' => ["#{othermod.name}/files/test"]})
148
147
 
149
148
  expect { tasks.first.files }.to raise_error(Puppet::Module::Task::InvalidMetadata, /Could not find module #{othermod.name} containing task file test/)
150
149
  end
151
150
 
152
151
  it "finds files whose names (besides extensions) are valid task names" do
153
- Dir.expects(:glob).with(tasks_glob).returns(%w{task task_1 xx_t_a_s_k_2_xx})
152
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{task task_1 xx_t_a_s_k_2_xx})
154
153
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
155
154
 
156
155
  expect(tasks.count).to eq(3)
@@ -158,7 +157,7 @@ describe Puppet::Module::Task do
158
157
  end
159
158
 
160
159
  it "ignores files that have names (besides extensions) that are not valid task names" do
161
- Dir.expects(:glob).with(tasks_glob).returns(%w{.nottask.exe .wat !runme _task 2task2furious def_a_task_PSYCH Fake_task not-a-task realtask})
160
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{.nottask.exe .wat !runme _task 2task2furious def_a_task_PSYCH Fake_task not-a-task realtask})
162
161
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
163
162
 
164
163
  expect(tasks.count).to eq(1)
@@ -166,7 +165,7 @@ describe Puppet::Module::Task do
166
165
  end
167
166
 
168
167
  it "ignores files that have names ending in .conf and .md" do
169
- Dir.expects(:glob).with(tasks_glob).returns(%w{ginuwine_task task.conf readme.md other_task.md})
168
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{ginuwine_task task.conf readme.md other_task.md})
170
169
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
171
170
 
172
171
  expect(tasks.count).to eq(1)
@@ -180,8 +179,8 @@ describe Puppet::Module::Task do
180
179
  describe :metadata do
181
180
  it "loads metadata for a task" do
182
181
  metadata = {'desciption': 'some info'}
183
- Dir.expects(:glob).with(tasks_glob).returns(%w{task1.exe task1.json})
184
- Puppet::Module::Task.stubs(:read_metadata).returns(metadata)
182
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{task1.exe task1.json})
183
+ allow(Puppet::Module::Task).to receive(:read_metadata).and_return(metadata)
185
184
 
186
185
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
187
186
 
@@ -190,7 +189,7 @@ describe Puppet::Module::Task do
190
189
  end
191
190
 
192
191
  it 'returns nil for metadata if no file is present' do
193
- Dir.expects(:glob).with(tasks_glob).returns(%w{task1.exe})
192
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{task1.exe})
194
193
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
195
194
 
196
195
  expect(tasks.count).to eq(1)
@@ -213,7 +212,7 @@ describe Puppet::Module::Task do
213
212
 
214
213
  describe :validate do
215
214
  it "validates when there is no metadata" do
216
- Dir.expects(:glob).with(tasks_glob).returns(%w{task1.exe})
215
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{task1.exe})
217
216
 
218
217
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
219
218
 
@@ -224,8 +223,8 @@ describe Puppet::Module::Task do
224
223
  it "validates when an implementation isn't used" do
225
224
  metadata = {'desciption' => 'some info',
226
225
  'implementations' => [ {"name" => "task1.exe"}, ] }
227
- Dir.expects(:glob).with(tasks_glob).returns(%w{task1.exe task1.sh task1.json})
228
- Puppet::Module::Task.stubs(:read_metadata).returns(metadata)
226
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{task1.exe task1.sh task1.json})
227
+ allow(Puppet::Module::Task).to receive(:read_metadata).and_return(metadata)
229
228
 
230
229
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
231
230
 
@@ -236,8 +235,8 @@ describe Puppet::Module::Task do
236
235
  it "validates when an implementation is another task" do
237
236
  metadata = {'desciption' => 'some info',
238
237
  'implementations' => [ {"name" => "task2.sh"}, ] }
239
- Dir.expects(:glob).with(tasks_glob).returns(%w{task1.exe task2.sh task1.json})
240
- Puppet::Module::Task.stubs(:read_metadata).returns(metadata)
238
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{task1.exe task2.sh task1.json})
239
+ allow(Puppet::Module::Task).to receive(:read_metadata).and_return(metadata)
241
240
 
242
241
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
243
242
 
@@ -246,9 +245,9 @@ describe Puppet::Module::Task do
246
245
  end
247
246
 
248
247
  it "fails validation when there is no metadata and multiple task files" do
249
- Dir.expects(:glob).with(tasks_glob).returns(%w{task1.elf task1.exe task1.json task2.ps1 task2.sh})
248
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{task1.elf task1.exe task1.json task2.ps1 task2.sh})
250
249
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
251
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({})
250
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({})
252
251
 
253
252
  tasks.each do |task|
254
253
  expect {task.validate}.to raise_error(Puppet::Module::Task::InvalidTask)
@@ -256,9 +255,9 @@ describe Puppet::Module::Task do
256
255
  end
257
256
 
258
257
  it "fails validation when an implementation references a non-existant file" do
259
- Dir.expects(:glob).with(tasks_glob).returns(%w{task1.elf task1.exe task1.json})
258
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{task1.elf task1.exe task1.json})
260
259
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
261
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({'implementations' => [ { 'name' => 'task1.sh' } ] })
260
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({'implementations' => [ { 'name' => 'task1.sh' } ] })
262
261
 
263
262
  tasks.each do |task|
264
263
  expect {task.validate}.to raise_error(Puppet::Module::Task::InvalidTask)
@@ -266,25 +265,25 @@ describe Puppet::Module::Task do
266
265
  end
267
266
 
268
267
  it 'fails validation when there is metadata but no executable' do
269
- Dir.expects(:glob).with(tasks_glob).returns(%w{task1.json task2.sh})
268
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{task1.json task2.sh})
270
269
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
271
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({})
270
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({})
272
271
 
273
272
  expect { tasks.find { |t| t.name == 'mymod::task1' }.validate }.to raise_error(Puppet::Module::Task::InvalidTask)
274
273
  end
275
274
 
276
275
  it 'fails validation when the implementations are not an array' do
277
- Dir.expects(:glob).with(tasks_glob).returns(%w{task1.json task2.sh})
276
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{task1.json task2.sh})
278
277
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
279
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({"implemenations" => {}})
278
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({"implemenations" => {}})
280
279
 
281
280
  expect { tasks.find { |t| t.name == 'mymod::task1' }.validate }.to raise_error(Puppet::Module::Task::InvalidTask)
282
281
  end
283
282
 
284
283
  it 'fails validation when the implementation is json' do
285
- Dir.expects(:glob).with(tasks_glob).returns(%w{task1.json task1.sh})
284
+ expect(Dir).to receive(:glob).with(tasks_glob).and_return(%w{task1.json task1.sh})
286
285
  tasks = Puppet::Module::Task.tasks_in_module(mymod)
287
- Puppet::Module::Task.any_instance.stubs(:metadata).returns({'implementations' => [ { 'name' => 'task1.json' } ] })
286
+ allow_any_instance_of(Puppet::Module::Task).to receive(:metadata).and_return({'implementations' => [ { 'name' => 'task1.json' } ] })
288
287
 
289
288
  expect { tasks.find { |t| t.name == 'mymod::task1' }.validate }.to raise_error(Puppet::Module::Task::InvalidTask)
290
289
  end