puppet 6.0.7-x64-mingw32 → 6.0.8-x64-mingw32

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

Potentially problematic release.


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

Files changed (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
@@ -7,8 +7,8 @@ end
7
7
  [:group].each do |type_for_this_round|
8
8
  describe Puppet::Type.type(type_for_this_round).provider(:directoryservice) do
9
9
  before do
10
- @resource = stub("resource")
11
- @resource.stubs(:[]).with(:name)
10
+ @resource = double("resource")
11
+ allow(@resource).to receive(:[]).with(:name)
12
12
  @provider = described_class.new(@resource)
13
13
  end
14
14
 
@@ -17,18 +17,18 @@ end
17
17
  desired = ["foo", ["quux"], "qorp"]
18
18
  group = 'example'
19
19
 
20
- @resource.stubs(:[]).with(:name).returns(group)
21
- @resource.stubs(:[]).with(:auth_membership).returns(true)
20
+ allow(@resource).to receive(:[]).with(:name).and_return(group)
21
+ allow(@resource).to receive(:[]).with(:auth_membership).and_return(true)
22
22
  @provider.instance_variable_set(:@property_value_cache_hash,
23
23
  { :members => current })
24
24
 
25
25
  %w{bar baz}.each do |del|
26
- @provider.expects(:execute).once.
26
+ expect(@provider).to receive(:execute).once.
27
27
  with([:dseditgroup, '-o', 'edit', '-n', '.', '-d', del, group])
28
28
  end
29
29
 
30
30
  %w{quux qorp}.each do |add|
31
- @provider.expects(:execute).once.
31
+ expect(@provider).to receive(:execute).once.
32
32
  with([:dseditgroup, '-o', 'edit', '-n', '.', '-a', add, group])
33
33
  end
34
34
 
@@ -40,13 +40,13 @@ end
40
40
  describe Puppet::Provider::NameService::DirectoryService do
41
41
  context '.single_report' do
42
42
  it 'should use plist data' do
43
- Puppet::Provider::NameService::DirectoryService.stubs(:get_ds_path).returns('Users')
44
- Puppet::Provider::NameService::DirectoryService.stubs(:list_all_present).returns(
43
+ allow(Puppet::Provider::NameService::DirectoryService).to receive(:get_ds_path).and_return('Users')
44
+ allow(Puppet::Provider::NameService::DirectoryService).to receive(:list_all_present).and_return(
45
45
  ['root', 'user1', 'user2', 'resource_name']
46
46
  )
47
- Puppet::Provider::NameService::DirectoryService.stubs(:generate_attribute_hash)
48
- Puppet::Provider::NameService::DirectoryService.stubs(:execute)
49
- Puppet::Provider::NameService::DirectoryService.expects(:parse_dscl_plist_data)
47
+ allow(Puppet::Provider::NameService::DirectoryService).to receive(:generate_attribute_hash)
48
+ allow(Puppet::Provider::NameService::DirectoryService).to receive(:execute)
49
+ expect(Puppet::Provider::NameService::DirectoryService).to receive(:parse_dscl_plist_data)
50
50
 
51
51
  Puppet::Provider::NameService::DirectoryService.single_report('resource_name')
52
52
  end
@@ -54,7 +54,7 @@ describe Puppet::Provider::NameService::DirectoryService do
54
54
 
55
55
  context '.get_exec_preamble' do
56
56
  it 'should use plist data' do
57
- Puppet::Provider::NameService::DirectoryService.stubs(:get_ds_path).returns('Users')
57
+ allow(Puppet::Provider::NameService::DirectoryService).to receive(:get_ds_path).and_return('Users')
58
58
 
59
59
  expect(Puppet::Provider::NameService::DirectoryService.get_exec_preamble('-list')).to include("-plist")
60
60
  end
@@ -85,9 +85,9 @@ describe Puppet::Provider::NameService::DirectoryService do
85
85
  end
86
86
 
87
87
  it 'should execute convert_binary_to_hash once when getting the password' do
88
- described_class.expects(:convert_binary_to_hash).returns({'SALTED-SHA512' => pw_string})
89
- Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
90
- Puppet::Util::Plist.expects(:read_plist_file).returns(shadow_hash_data)
88
+ expect(described_class).to receive(:convert_binary_to_hash).and_return({'SALTED-SHA512' => pw_string})
89
+ expect(Puppet::FileSystem).to receive(:exist?).with(plist_path).once.and_return(true)
90
+ expect(Puppet::Util::Plist).to receive(:read_plist_file).and_return(shadow_hash_data)
91
91
  described_class.get_password('uid', 'jeff')
92
92
  end
93
93
 
@@ -98,19 +98,19 @@ describe Puppet::Provider::NameService::DirectoryService do
98
98
  end
99
99
 
100
100
  it 'should convert xml-to-binary and binary-to-xml when setting the pw on >= 10.7' do
101
- described_class.expects(:convert_binary_to_hash).returns({'SALTED-SHA512' => pw_string})
102
- described_class.expects(:convert_hash_to_binary).returns(binary_plist)
103
- Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
104
- Puppet::Util::Plist.expects(:read_plist_file).returns(shadow_hash_data)
105
- Puppet::Util::Plist.expects(:write_plist_file).with(shadow_hash_data, plist_path, :binary)
101
+ expect(described_class).to receive(:convert_binary_to_hash).and_return({'SALTED-SHA512' => pw_string})
102
+ expect(described_class).to receive(:convert_hash_to_binary).and_return(binary_plist)
103
+ expect(Puppet::FileSystem).to receive(:exist?).with(plist_path).once.and_return(true)
104
+ expect(Puppet::Util::Plist).to receive(:read_plist_file).and_return(shadow_hash_data)
105
+ expect(Puppet::Util::Plist).to receive(:write_plist_file).with(shadow_hash_data, plist_path, :binary)
106
106
  described_class.set_password('jeff', 'uid', sha512_hash)
107
107
  end
108
108
 
109
109
  it '[#13686] should handle an empty ShadowHashData field in the users plist' do
110
- described_class.expects(:convert_hash_to_binary).returns(binary_plist)
111
- Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
112
- Puppet::Util::Plist.expects(:read_plist_file).returns({'ShadowHashData' => nil})
113
- Puppet::Util::Plist.expects(:write_plist_file)
110
+ expect(described_class).to receive(:convert_hash_to_binary).and_return(binary_plist)
111
+ expect(Puppet::FileSystem).to receive(:exist?).with(plist_path).once.and_return(true)
112
+ expect(Puppet::Util::Plist).to receive(:read_plist_file).and_return({'ShadowHashData' => nil})
113
+ expect(Puppet::Util::Plist).to receive(:write_plist_file)
114
114
  described_class.set_password('jeff', 'uid', sha512_hash)
115
115
  end
116
116
  end
@@ -129,7 +129,7 @@ describe Puppet::Provider::NameService::DirectoryService do
129
129
  end
130
130
 
131
131
  let :stub_resource do
132
- stub('resource')
132
+ double('resource')
133
133
  end
134
134
 
135
135
  subject do
@@ -137,21 +137,20 @@ describe Puppet::Provider::NameService::DirectoryService do
137
137
  end
138
138
 
139
139
  before :each do
140
- @resource = stub("resource")
141
- @resource.stubs(:[]).with(:name)
140
+ @resource = double("resource")
141
+ allow(@resource).to receive(:[]).with(:name)
142
142
  @provider = provider_class.new(@resource)
143
143
  end
144
144
 
145
145
  it 'should delete a group member if the user does not exist' do
146
- stub_resource.stubs(:[]).with(:name).returns('fake_group')
147
- stub_resource.stubs(:name).returns('fake_group')
148
- subject.expects(:execute).with([:dseditgroup, '-o', 'edit', '-n', '.',
149
- '-d', 'jeff',
150
- 'fake_group']).raises(Puppet::ExecutionFailure,
151
- 'it broke')
152
- subject.expects(:execute).with([:dscl, '.', '-delete',
153
- '/Groups/fake_group', 'GroupMembership',
154
- 'jeff'])
146
+ allow(stub_resource).to receive(:[]).with(:name).and_return('fake_group')
147
+ allow(stub_resource).to receive(:name).and_return('fake_group')
148
+ expect(subject).to receive(:execute).with([:dseditgroup, '-o', 'edit', '-n', '.',
149
+ '-d', 'jeff',
150
+ 'fake_group']).and_raise(Puppet::ExecutionFailure, 'it broke')
151
+ expect(subject).to receive(:execute).with([:dscl, '.', '-delete',
152
+ '/Groups/fake_group', 'GroupMembership',
153
+ 'jeff'])
155
154
  subject.remove_unwanted_members(group_members, user_account)
156
155
  end
157
156
  end
@@ -1,5 +1,3 @@
1
- #! /usr/bin/env ruby
2
-
3
1
  require 'spec_helper'
4
2
  require 'puppet/provider/nameservice'
5
3
  require 'puppet/etc'
@@ -134,7 +132,7 @@ describe Puppet::Provider::NameService do
134
132
 
135
133
  describe "#section" do
136
134
  it "should raise an error if resource_type has not been set" do
137
- described_class.expects(:resource_type).returns nil
135
+ expect(described_class).to receive(:resource_type).and_return(nil)
138
136
  expect { described_class.section }.to raise_error Puppet::Error, 'Cannot determine Etc section without a resource type'
139
137
  end
140
138
 
@@ -153,15 +151,15 @@ describe Puppet::Provider::NameService do
153
151
 
154
152
  describe "#listbyname" do
155
153
  it "should be deprecated" do
156
- Puppet.expects(:deprecation_warning).with(regexp_matches(/listbyname is deprecated/))
154
+ expect(Puppet).to receive(:deprecation_warning).with(/listbyname is deprecated/)
157
155
  described_class.listbyname
158
156
  end
159
157
 
160
158
  it "should return a list of users if resource_type is user" do
161
159
  described_class.resource_type = Puppet::Type.type(:user)
162
- Puppet::Etc.expects(:setpwent)
163
- Puppet::Etc.stubs(:getpwent).returns(*users)
164
- Puppet::Etc.expects(:endpwent)
160
+ expect(Puppet::Etc).to receive(:setpwent)
161
+ allow(Puppet::Etc).to receive(:getpwent).and_return(*users)
162
+ expect(Puppet::Etc).to receive(:endpwent)
165
163
  expect(described_class.listbyname).to eq(%w{root foo})
166
164
  end
167
165
 
@@ -172,7 +170,7 @@ describe Puppet::Provider::NameService do
172
170
  # the same name on disk, but each name is stored on disk in a different
173
171
  # encoding
174
172
  it "should return names with invalid byte sequences replaced with '?'" do
175
- Etc.stubs(:getpwent).returns(*utf_8_mixed_users)
173
+ allow(Etc).to receive(:getpwent).and_return(*utf_8_mixed_users)
176
174
  expect(invalid_utf_8_jose).to_not be_valid_encoding
177
175
  result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::UTF_8) do
178
176
  described_class.listbyname
@@ -181,7 +179,7 @@ describe Puppet::Provider::NameService do
181
179
  end
182
180
 
183
181
  it "should return names in their original encoding/bytes if they would not be valid UTF-8" do
184
- Etc.stubs(:getpwent).returns(*latin_1_mixed_users)
182
+ allow(Etc).to receive(:getpwent).and_return(*latin_1_mixed_users)
185
183
  result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ISO_8859_1) do
186
184
  described_class.listbyname
187
185
  end
@@ -191,18 +189,18 @@ describe Puppet::Provider::NameService do
191
189
 
192
190
  it "should return a list of groups if resource_type is group", :unless => Puppet::Util::Platform.windows? do
193
191
  described_class.resource_type = Puppet::Type.type(:group)
194
- Puppet::Etc.expects(:setgrent)
195
- Puppet::Etc.stubs(:getgrent).returns(*groups)
196
- Puppet::Etc.expects(:endgrent)
192
+ expect(Puppet::Etc).to receive(:setgrent)
193
+ allow(Puppet::Etc).to receive(:getgrent).and_return(*groups)
194
+ expect(Puppet::Etc).to receive(:endgrent)
197
195
  expect(described_class.listbyname).to eq(%w{root bin})
198
196
  end
199
197
 
200
198
  it "should yield if a block given" do
201
199
  yield_results = []
202
200
  described_class.resource_type = Puppet::Type.type(:user)
203
- Puppet::Etc.expects(:setpwent)
204
- Puppet::Etc.stubs(:getpwent).returns(*users)
205
- Puppet::Etc.expects(:endpwent)
201
+ expect(Puppet::Etc).to receive(:setpwent)
202
+ allow(Puppet::Etc).to receive(:getpwent).and_return(*users)
203
+ expect(Puppet::Etc).to receive(:endpwent)
206
204
  described_class.listbyname {|x| yield_results << x }
207
205
  expect(yield_results).to eq(%w{root foo})
208
206
  end
@@ -213,7 +211,7 @@ describe Puppet::Provider::NameService do
213
211
  # These two tests simulate an environment where there are two users with
214
212
  # the same name on disk, but each name is stored on disk in a different
215
213
  # encoding
216
- Etc.stubs(:getpwent).returns(*utf_8_mixed_users)
214
+ allow(Etc).to receive(:getpwent).and_return(*utf_8_mixed_users)
217
215
  result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::UTF_8) do
218
216
  described_class.instances
219
217
  end
@@ -228,7 +226,7 @@ describe Puppet::Provider::NameService do
228
226
  end
229
227
 
230
228
  it "should have object names in their original encoding/bytes if they would not be valid UTF-8" do
231
- Etc.stubs(:getpwent).returns(*latin_1_mixed_users)
229
+ allow(Etc).to receive(:getpwent).and_return(*latin_1_mixed_users)
232
230
  result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ISO_8859_1) do
233
231
  described_class.instances
234
232
  end
@@ -244,8 +242,8 @@ describe Puppet::Provider::NameService do
244
242
 
245
243
  it "should pass the Puppet::Etc :canonical_name Struct member to the constructor" do
246
244
  users = [ Struct::Passwd.new(invalid_utf_8_jose, invalid_utf_8_jose, 1002, 2000), nil ]
247
- Etc.stubs(:getpwent).returns(*users)
248
- described_class.expects(:new).with(:name => escaped_utf_8_jose, :canonical_name => invalid_utf_8_jose, :ensure => :present)
245
+ allow(Etc).to receive(:getpwent).and_return(*users)
246
+ expect(described_class).to receive(:new).with(:name => escaped_utf_8_jose, :canonical_name => invalid_utf_8_jose, :ensure => :present)
249
247
  described_class.instances
250
248
  end
251
249
  end
@@ -278,19 +276,19 @@ describe Puppet::Provider::NameService do
278
276
  describe "getinfo" do
279
277
  before :each do
280
278
  # with section=foo we'll call Etc.getfoonam instead of getpwnam or getgrnam
281
- described_class.stubs(:section).returns 'foo'
279
+ allow(described_class).to receive(:section).and_return('foo')
282
280
  resource # initialize the resource so our provider has a @resource instance variable
283
281
  end
284
282
 
285
283
  it "should return a hash if we can retrieve something" do
286
- Puppet::Etc.expects(:send).with(:getfoonam, 'bob').returns fakeetcobject
287
- provider.expects(:info2hash).with(fakeetcobject).returns(:foo => 'fooval', :bar => 'barval')
284
+ expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'bob').and_return(fakeetcobject)
285
+ expect(provider).to receive(:info2hash).with(fakeetcobject).and_return(:foo => 'fooval', :bar => 'barval')
288
286
  expect(provider.getinfo(true)).to eq({:foo => 'fooval', :bar => 'barval'})
289
287
  end
290
288
 
291
289
  it "should return nil if we cannot retrieve anything" do
292
- Puppet::Etc.expects(:send).with(:getfoonam, 'bob').raises(ArgumentError, "can't find bob")
293
- provider.expects(:info2hash).never
290
+ expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'bob').and_raise(ArgumentError, "can't find bob")
291
+ expect(provider).not_to receive(:info2hash)
294
292
  expect(provider.getinfo(true)).to be_nil
295
293
  end
296
294
 
@@ -299,13 +297,13 @@ describe Puppet::Provider::NameService do
299
297
  # again if needed
300
298
  it "should use the instance's @canonical_name to query the system" do
301
299
  provider_instance = described_class.new(:name => 'foo', :canonical_name => 'original_foo', :ensure => :present)
302
- Puppet::Etc.expects(:send).with(:getfoonam, 'original_foo')
300
+ expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'original_foo')
303
301
  provider_instance.getinfo(true)
304
302
  end
305
303
 
306
304
  it "should use the instance's name instead of canonical_name if not supplied during instantiation" do
307
305
  provider_instance = described_class.new(:name => 'foo', :ensure => :present)
308
- Puppet::Etc.expects(:send).with(:getfoonam, 'foo')
306
+ expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'foo')
309
307
  provider_instance.getinfo(true)
310
308
  end
311
309
  end
@@ -319,9 +317,9 @@ describe Puppet::Provider::NameService do
319
317
  # expect two method invocations because info2hash calls the method
320
318
  # twice if the Struct responds to the propertyname (our fake Struct
321
319
  # provides values for :foo and :bar) TODO: Fix that
322
- provider.expects(:posixmethod).with(:foo).returns(:foo).twice
323
- provider.expects(:posixmethod).with(:bar).returns(:bar).twice
324
- provider.expects(:posixmethod).with(:ensure).returns :ensure
320
+ expect(provider).to receive(:posixmethod).with(:foo).and_return(:foo).twice
321
+ expect(provider).to receive(:posixmethod).with(:bar).and_return(:bar).twice
322
+ expect(provider).to receive(:posixmethod).with(:ensure).and_return(:ensure)
325
323
  expect(provider.info2hash(fakeetcobject)).to eq({ :foo => 'fooval', :bar => 'barval' })
326
324
  end
327
325
  end
@@ -351,11 +349,11 @@ describe Puppet::Provider::NameService do
351
349
 
352
350
  describe "exists?" do
353
351
  it "should return true if we can retrieve anything" do
354
- provider.expects(:getinfo).with(true).returns(:foo => 'fooval', :bar => 'barval')
352
+ expect(provider).to receive(:getinfo).with(true).and_return(:foo => 'fooval', :bar => 'barval')
355
353
  expect(provider).to be_exists
356
354
  end
357
355
  it "should return false if we cannot retrieve anything" do
358
- provider.expects(:getinfo).with(true).returns nil
356
+ expect(provider).to receive(:getinfo).with(true).and_return(nil)
359
357
  expect(provider).not_to be_exists
360
358
  end
361
359
  end
@@ -364,18 +362,18 @@ describe Puppet::Provider::NameService do
364
362
  before(:each) {described_class.resource_type = faketype }
365
363
 
366
364
  it "should return the correct getinfo value" do
367
- provider.expects(:getinfo).with(false).returns(:foo => 'fooval', :bar => 'barval')
365
+ expect(provider).to receive(:getinfo).with(false).and_return(:foo => 'fooval', :bar => 'barval')
368
366
  expect(provider.get(:bar)).to eq('barval')
369
367
  end
370
368
 
371
369
  it "should unmunge the value first" do
372
370
  described_class.options(:bar, :munge => proc { |x| x*2}, :unmunge => proc {|x| x/2})
373
- provider.expects(:getinfo).with(false).returns(:foo => 200, :bar => 500)
371
+ expect(provider).to receive(:getinfo).with(false).and_return(:foo => 200, :bar => 500)
374
372
  expect(provider.get(:bar)).to eq(250)
375
373
  end
376
374
 
377
375
  it "should return nil if getinfo cannot retrieve the value" do
378
- provider.expects(:getinfo).with(false).returns(:foo => 'fooval', :bar => 'barval')
376
+ expect(provider).to receive(:getinfo).with(false).and_return(:foo => 'fooval', :bar => 'barval')
379
377
  expect(provider.get(:no_such_key)).to be_nil
380
378
  end
381
379
 
@@ -392,21 +390,21 @@ describe Puppet::Provider::NameService do
392
390
  end
393
391
 
394
392
  it "should execute the modify command on valid values" do
395
- provider.expects(:modifycmd).with(:foo, 100).returns ['/bin/modify', '-f', '100' ]
396
- provider.expects(:execute).with(['/bin/modify', '-f', '100'], has_entry(:custom_environment, {}))
393
+ expect(provider).to receive(:modifycmd).with(:foo, 100).and_return(['/bin/modify', '-f', '100' ])
394
+ expect(provider).to receive(:execute).with(['/bin/modify', '-f', '100'], hash_including(custom_environment: {}))
397
395
  provider.set(:foo, 100)
398
396
  end
399
397
 
400
398
  it "should munge the value first" do
401
399
  described_class.options(:foo, :munge => proc { |x| x*2}, :unmunge => proc {|x| x/2})
402
- provider.expects(:modifycmd).with(:foo, 200).returns(['/bin/modify', '-f', '200' ])
403
- provider.expects(:execute).with(['/bin/modify', '-f', '200'], has_entry(:custom_environment, {}))
400
+ expect(provider).to receive(:modifycmd).with(:foo, 200).and_return(['/bin/modify', '-f', '200' ])
401
+ expect(provider).to receive(:execute).with(['/bin/modify', '-f', '200'], hash_including(custom_environment: {}))
404
402
  provider.set(:foo, 100)
405
403
  end
406
404
 
407
405
  it "should fail if the modify command fails" do
408
- provider.expects(:modifycmd).with(:foo, 100).returns(['/bin/modify', '-f', '100' ])
409
- provider.expects(:execute).with(['/bin/modify', '-f', '100'], kind_of(Hash)).raises(Puppet::ExecutionFailure, "Execution of '/bin/modify' returned 1: some_failure")
406
+ expect(provider).to receive(:modifycmd).with(:foo, 100).and_return(['/bin/modify', '-f', '100' ])
407
+ expect(provider).to receive(:execute).with(['/bin/modify', '-f', '100'], kind_of(Hash)).and_raise(Puppet::ExecutionFailure, "Execution of '/bin/modify' returned 1: some_failure")
410
408
  expect { provider.set(:foo, 100) }.to raise_error Puppet::Error, /Could not set foo/
411
409
  end
412
410
  end
@@ -15,26 +15,26 @@ describe Puppet::Type.type(:package).provider(:aix) do
15
15
  end
16
16
 
17
17
  it "should uninstall a package" do
18
- @provider.expects(:installp).with('-gu', 'mypackage')
19
- @provider.class.expects(:pkglist).with(:pkgname => 'mypackage').returns(nil)
18
+ expect(@provider).to receive(:installp).with('-gu', 'mypackage')
19
+ expect(@provider.class).to receive(:pkglist).with(:pkgname => 'mypackage').and_return(nil)
20
20
  @provider.uninstall
21
21
  end
22
22
 
23
23
  context "when installing" do
24
24
  it "should install a package" do
25
- @provider.expects(:installp).with('-acgwXY', '-d', 'mysource', 'mypackage')
25
+ expect(@provider).to receive(:installp).with('-acgwXY', '-d', 'mysource', 'mypackage')
26
26
  @provider.install
27
27
  end
28
28
 
29
29
  it "should install a specific package version" do
30
- @resource.stubs(:should).with(:ensure).returns("1.2.3.4")
31
- @provider.expects(:installp).with('-acgwXY', '-d', 'mysource', 'mypackage 1.2.3.4')
30
+ allow(@resource).to receive(:should).with(:ensure).and_return("1.2.3.4")
31
+ expect(@provider).to receive(:installp).with('-acgwXY', '-d', 'mysource', 'mypackage 1.2.3.4')
32
32
  @provider.install
33
33
  end
34
34
 
35
35
  it "should fail if the specified version is superseded" do
36
36
  @resource[:ensure] = '1.2.3.3'
37
- @provider.stubs(:installp).returns <<-OUTPUT
37
+ allow(@provider).to receive(:installp).and_return(<<-OUTPUT)
38
38
  +-----------------------------------------------------------------------------+
39
39
  Pre-installation Verification...
40
40
  +-----------------------------------------------------------------------------+
@@ -85,26 +85,26 @@ mypackage 1.2.3.3 Already superseded by 1.2.3.4
85
85
 
86
86
  context "when finding the latest version" do
87
87
  it "should return the current version when no later version is present" do
88
- @provider.stubs(:latest_info).returns(nil)
89
- @provider.stubs(:properties).returns( { :ensure => "1.2.3.4" } )
88
+ allow(@provider).to receive(:latest_info).and_return(nil)
89
+ allow(@provider).to receive(:properties).and_return({ :ensure => "1.2.3.4" })
90
90
  expect(@provider.latest).to eq("1.2.3.4")
91
91
  end
92
92
 
93
93
  it "should return the latest version of a package" do
94
- @provider.stubs(:latest_info).returns( { :version => "1.2.3.5" } )
94
+ allow(@provider).to receive(:latest_info).and_return({ :version => "1.2.3.5" })
95
95
  expect(@provider.latest).to eq("1.2.3.5")
96
96
  end
97
97
 
98
98
  it "should prefetch the right values" do
99
- Process.stubs(:euid).returns(0)
99
+ allow(Process).to receive(:euid).and_return(0)
100
100
  resource = Puppet::Type.type(:package).
101
101
  new(:name => 'sudo.rte', :ensure => :latest,
102
102
  :source => 'mysource', :provider => :aix)
103
103
 
104
- resource.stubs(:should).with(:ensure).returns(:latest)
104
+ allow(resource).to receive(:should).with(:ensure).and_return(:latest)
105
105
  resource.should(:ensure)
106
106
 
107
- resource.provider.class.stubs(:execute).returns(<<-END.chomp)
107
+ allow(resource.provider.class).to receive(:execute).and_return(<<-END.chomp)
108
108
  sudo:sudo.rte:1.7.10.4::I:C:::::N:Configurable super-user privileges runtime::::0::
109
109
  sudo:sudo.rte:1.8.6.4::I:T:::::N:Configurable super-user privileges runtime::::0::
110
110
  END
@@ -115,15 +115,15 @@ END
115
115
  end
116
116
 
117
117
  it "update should install a package" do
118
- @provider.expects(:install).with(false)
118
+ expect(@provider).to receive(:install).with(false)
119
119
  @provider.update
120
120
  end
121
121
 
122
122
  it "should prefetch when some packages lack sources" do
123
123
  latest = Puppet::Type.type(:package).new(:name => 'mypackage', :ensure => :latest, :source => 'mysource', :provider => :aix)
124
124
  absent = Puppet::Type.type(:package).new(:name => 'otherpackage', :ensure => :absent, :provider => :aix)
125
- Process.stubs(:euid).returns(0)
126
- described_class.expects(:execute).returns 'mypackage:mypackage.rte:1.8.6.4::I:T:::::N:A Super Cool Package::::0::\n'
125
+ allow(Process).to receive(:euid).and_return(0)
126
+ expect(described_class).to receive(:execute).and_return('mypackage:mypackage.rte:1.8.6.4::I:T:::::N:A Super Cool Package::::0::\n')
127
127
  described_class.prefetch({ 'mypackage' => latest, 'otherpackage' => absent })
128
128
  end
129
129
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  describe Puppet::Type.type(:package).provider(:appdmg) do
@@ -10,12 +9,11 @@ describe Puppet::Type.type(:package).provider(:appdmg) do
10
9
  let(:fake_hdiutil_plist) { {"system-entities" => [{"mount-point" => fake_mountpoint}]} }
11
10
 
12
11
  before do
13
- fh = mock 'filehandle'
14
- fh.stubs(:path).yields "/tmp/foo"
12
+ fh = double('filehandle', path: '/tmp/foo')
15
13
  resource[:source] = "foo.dmg"
16
- described_class.stubs(:open).yields fh
17
- Dir.stubs(:mktmpdir).returns "/tmp/testtmp123"
18
- FileUtils.stubs(:remove_entry_secure)
14
+ allow(described_class).to receive(:open).and_yield(fh)
15
+ allow(Dir).to receive(:mktmpdir).and_return("/tmp/testtmp123")
16
+ allow(FileUtils).to receive(:remove_entry_secure)
19
17
  end
20
18
 
21
19
  describe "from a remote source" do
@@ -26,14 +24,16 @@ describe Puppet::Type.type(:package).provider(:appdmg) do
26
24
  end
27
25
 
28
26
  it "should call tmpdir and use the returned directory" do
29
- Dir.expects(:mktmpdir).returns tmpdir
30
- Dir.stubs(:entries).returns ["foo.app"]
31
- described_class.expects(:curl).with do |*args|
32
- args[0] == "-o" && args[1].include?(tmpdir) && ! args.include?("-k")
27
+ expect(Dir).to receive(:mktmpdir).and_return(tmpdir)
28
+ allow(Dir).to receive(:entries).and_return(["foo.app"])
29
+ expect(described_class).to receive(:curl) do |*args|
30
+ expect(args[0]).to eq("-o")
31
+ expect(args[1]).to include(tmpdir)
32
+ expect(args).not_to include("-k")
33
33
  end
34
- described_class.stubs(:hdiutil).returns 'a plist'
35
- Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
36
- described_class.expects(:installapp)
34
+ allow(described_class).to receive(:hdiutil).and_return('a plist')
35
+ expect(Puppet::Util::Plist).to receive(:parse_plist).with('a plist').and_return(fake_hdiutil_plist)
36
+ expect(described_class).to receive(:installapp)
37
37
 
38
38
  provider.install
39
39
  end