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
  describe Puppet::Type.type(:package).provider(:pkgdmg) do
@@ -10,7 +9,7 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
10
9
 
11
10
  describe "when installing it should fail when" do
12
11
  before :each do
13
- Puppet::Util.expects(:execute).never
12
+ expect(Puppet::Util).not_to receive(:execute)
14
13
  end
15
14
 
16
15
  it "no source is specified" do
@@ -29,33 +28,33 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
29
28
  let(:fake_hdiutil_plist) { {"system-entities" => [{"mount-point" => fake_mountpoint}]} }
30
29
 
31
30
  before do
32
- fh = mock 'filehandle'
33
- fh.stubs(:path).yields "/tmp/foo"
31
+ fh = double('filehandle')
32
+ allow(fh).to receive(:path).and_return("/tmp/foo")
34
33
  resource[:source] = "foo.dmg"
35
- File.stubs(:open).yields fh
36
- Dir.stubs(:mktmpdir).returns "/tmp/testtmp123"
37
- FileUtils.stubs(:remove_entry_secure)
34
+ allow(File).to receive(:open).and_yield(fh)
35
+ allow(Dir).to receive(:mktmpdir).and_return("/tmp/testtmp123")
36
+ allow(FileUtils).to receive(:remove_entry_secure)
38
37
  end
39
38
 
40
39
  it "should fail when a disk image with no system entities is mounted" do
41
- described_class.stubs(:hdiutil).returns 'empty plist'
42
- Puppet::Util::Plist.expects(:parse_plist).with('empty plist').returns({})
40
+ allow(described_class).to receive(:hdiutil).and_return('empty plist')
41
+ expect(Puppet::Util::Plist).to receive(:parse_plist).with('empty plist').and_return({})
43
42
  expect { provider.install }.to raise_error(Puppet::Error, /No disk entities/)
44
43
  end
45
44
 
46
45
  it "should call hdiutil to mount and eject the disk image" do
47
- Dir.stubs(:entries).returns []
48
- provider.class.expects(:hdiutil).with("eject", fake_mountpoint).returns 0
49
- provider.class.expects(:hdiutil).with("mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", nil).returns 'a plist'
50
- Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
46
+ allow(Dir).to receive(:entries).and_return([])
47
+ expect(provider.class).to receive(:hdiutil).with("eject", fake_mountpoint).and_return(0)
48
+ expect(provider.class).to receive(:hdiutil).with("mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", '/tmp/foo').and_return('a plist')
49
+ expect(Puppet::Util::Plist).to receive(:parse_plist).with('a plist').and_return(fake_hdiutil_plist)
51
50
  provider.install
52
51
  end
53
52
 
54
53
  it "should call installpkg if a pkg/mpkg is found on the dmg" do
55
- Dir.stubs(:entries).returns ["foo.pkg"]
56
- provider.class.stubs(:hdiutil).returns 'a plist'
57
- Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
58
- provider.class.expects(:installpkg).with("#{fake_mountpoint}/foo.pkg", resource[:name], "foo.dmg").returns ""
54
+ allow(Dir).to receive(:entries).and_return(["foo.pkg"])
55
+ allow(provider.class).to receive(:hdiutil).and_return('a plist')
56
+ expect(Puppet::Util::Plist).to receive(:parse_plist).with('a plist').and_return(fake_hdiutil_plist)
57
+ expect(provider.class).to receive(:installpkg).with("#{fake_mountpoint}/foo.pkg", resource[:name], "foo.dmg").and_return("")
59
58
  provider.install
60
59
  end
61
60
 
@@ -67,66 +66,69 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
67
66
  end
68
67
 
69
68
  it "should call tmpdir and then call curl with that directory" do
70
- Dir.expects(:mktmpdir).returns tmpdir
71
- Dir.stubs(:entries).returns ["foo.pkg"]
72
- described_class.expects(:curl).with do |*args|
73
- args[0] == "-o" && args[1].include?(tmpdir) && args.include?("--fail") && ! args.include?("-k")
69
+ expect(Dir).to receive(:mktmpdir).and_return(tmpdir)
70
+ allow(Dir).to receive(:entries).and_return(["foo.pkg"])
71
+ expect(described_class).to receive(:curl) do |*args|
72
+ expect(args[0]).to eq("-o")
73
+ expect(args[1]).to include(tmpdir)
74
+ expect(args).to include("--fail")
75
+ expect(args).not_to include("-k")
74
76
  end
75
- described_class.stubs(:hdiutil).returns 'a plist'
76
- Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
77
- described_class.expects(:installpkg)
77
+ allow(described_class).to receive(:hdiutil).and_return('a plist')
78
+ expect(Puppet::Util::Plist).to receive(:parse_plist).with('a plist').and_return(fake_hdiutil_plist)
79
+ expect(described_class).to receive(:installpkg)
78
80
 
79
81
  provider.install
80
82
  end
81
83
 
82
84
  it "should use an http proxy host and port if specified" do
83
- Puppet::Util::HttpProxy.expects(:no_proxy?).returns false
84
- Puppet::Util::HttpProxy.expects(:http_proxy_host).returns 'some_host'
85
- Puppet::Util::HttpProxy.expects(:http_proxy_port).returns 'some_port'
86
- Dir.expects(:mktmpdir).returns tmpdir
87
- Dir.stubs(:entries).returns ["foo.pkg"]
88
- described_class.expects(:curl).with do |*args|
89
- expect(args).to be_include 'some_host:some_port'
90
- expect(args).to be_include '--proxy'
85
+ expect(Puppet::Util::HttpProxy).to receive(:no_proxy?).and_return(false)
86
+ expect(Puppet::Util::HttpProxy).to receive(:http_proxy_host).and_return('some_host')
87
+ expect(Puppet::Util::HttpProxy).to receive(:http_proxy_port).and_return('some_port')
88
+ expect(Dir).to receive(:mktmpdir).and_return(tmpdir)
89
+ allow(Dir).to receive(:entries).and_return(["foo.pkg"])
90
+ expect(described_class).to receive(:curl) do |*args|
91
+ expect(args).to include('some_host:some_port')
92
+ expect(args).to include('--proxy')
91
93
  end
92
- described_class.stubs(:hdiutil).returns 'a plist'
93
- Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
94
- described_class.expects(:installpkg)
94
+ allow(described_class).to receive(:hdiutil).and_return('a plist')
95
+ expect(Puppet::Util::Plist).to receive(:parse_plist).with('a plist').and_return(fake_hdiutil_plist)
96
+ expect(described_class).to receive(:installpkg)
95
97
 
96
98
  provider.install
97
99
  end
98
100
 
99
101
  it "should use an http proxy host only if specified" do
100
- Puppet::Util::HttpProxy.expects(:no_proxy?).returns false
101
- Puppet::Util::HttpProxy.expects(:http_proxy_host).returns 'some_host'
102
- Puppet::Util::HttpProxy.expects(:http_proxy_port).returns nil
103
- Dir.expects(:mktmpdir).returns tmpdir
104
- Dir.stubs(:entries).returns ["foo.pkg"]
105
- described_class.expects(:curl).with do |*args|
106
- expect(args).to be_include 'some_host'
107
- expect(args).to be_include '--proxy'
102
+ expect(Puppet::Util::HttpProxy).to receive(:no_proxy?).and_return(false)
103
+ expect(Puppet::Util::HttpProxy).to receive(:http_proxy_host).and_return('some_host')
104
+ expect(Puppet::Util::HttpProxy).to receive(:http_proxy_port).and_return(nil)
105
+ expect(Dir).to receive(:mktmpdir).and_return(tmpdir)
106
+ allow(Dir).to receive(:entries).and_return(["foo.pkg"])
107
+ expect(described_class).to receive(:curl) do |*args|
108
+ expect(args).to include('some_host')
109
+ expect(args).to include('--proxy')
108
110
  end
109
- described_class.stubs(:hdiutil).returns 'a plist'
110
- Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
111
- described_class.expects(:installpkg)
111
+ allow(described_class).to receive(:hdiutil).and_return('a plist')
112
+ expect(Puppet::Util::Plist).to receive(:parse_plist).with('a plist').and_return(fake_hdiutil_plist)
113
+ expect(described_class).to receive(:installpkg)
112
114
 
113
115
  provider.install
114
116
  end
115
117
 
116
118
  it "should not use the configured proxy if no_proxy contains a match for the destination" do
117
- Puppet::Util::HttpProxy.expects(:no_proxy?).returns true
118
- Puppet::Util::HttpProxy.expects(:http_proxy_host).never
119
- Puppet::Util::HttpProxy.expects(:http_proxy_port).never
120
- Dir.expects(:mktmpdir).returns tmpdir
121
- Dir.stubs(:entries).returns ["foo.pkg"]
122
- described_class.expects(:curl).with do |*args|
123
- expect(args).not_to be_include 'some_host:some_port'
124
- expect(args).not_to be_include '--proxy'
119
+ expect(Puppet::Util::HttpProxy).to receive(:no_proxy?).and_return(true)
120
+ expect(Puppet::Util::HttpProxy).not_to receive(:http_proxy_host)
121
+ expect(Puppet::Util::HttpProxy).not_to receive(:http_proxy_port)
122
+ expect(Dir).to receive(:mktmpdir).and_return(tmpdir)
123
+ allow(Dir).to receive(:entries).and_return(["foo.pkg"])
124
+ expect(described_class).to receive(:curl) do |*args|
125
+ expect(args).not_to include('some_host:some_port')
126
+ expect(args).not_to include('--proxy')
125
127
  true
126
128
  end
127
- described_class.stubs(:hdiutil).returns 'a plist'
128
- Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
129
- described_class.expects(:installpkg)
129
+ allow(described_class).to receive(:hdiutil).and_return('a plist')
130
+ expect(Puppet::Util::Plist).to receive(:parse_plist).with('a plist').and_return(fake_hdiutil_plist)
131
+ expect(described_class).to receive(:installpkg)
130
132
 
131
133
  provider.install
132
134
  end
@@ -138,7 +140,7 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
138
140
  it "should call installpkg if a flat pkg file is found instead of a .dmg image" do
139
141
  resource[:source] = "/tmp/test.pkg"
140
142
  resource[:name] = "testpkg"
141
- provider.class.expects(:installpkgdmg).with("/tmp/test.pkg", "testpkg").returns ""
143
+ expect(provider.class).to receive(:installpkgdmg).with("/tmp/test.pkg", "testpkg").and_return("")
142
144
  provider.install
143
145
  end
144
146
  end
@@ -152,15 +154,15 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
152
154
  resource[:name] = 'testpkg'
153
155
  resource[:source] = remote_source
154
156
 
155
- Dir.stubs(:mktmpdir).returns tmpdir
157
+ allow(Dir).to receive(:mktmpdir).and_return(tmpdir)
156
158
  end
157
159
 
158
160
  it "should call installpkg if a flat pkg file is found instead of a .dmg image" do
159
- described_class.expects(:curl).with do |*args|
160
- expect(args).to be_include tmpfile
161
- expect(args).to be_include remote_source
161
+ expect(described_class).to receive(:curl) do |*args|
162
+ expect(args).to include(tmpfile)
163
+ expect(args).to include(remote_source)
162
164
  end
163
- provider.class.expects(:installpkg).with(tmpfile, 'testpkg', remote_source)
165
+ expect(provider.class).to receive(:installpkg).with(tmpfile, 'testpkg', remote_source)
164
166
  provider.install
165
167
  end
166
168
  end
@@ -13,16 +13,18 @@ describe Puppet::Type.type(:package).provider(:pkgin) do
13
13
  describe "#install" do
14
14
  describe "a package not installed" do
15
15
  before { resource[:ensure] = :absent }
16
+
16
17
  it "uses pkgin install to install" do
17
- subject.expects(:pkgin).with("-y", :install, "vim").once()
18
+ expect(subject).to receive(:pkgin).with("-y", :install, "vim").once()
18
19
  subject.install
19
20
  end
20
21
  end
21
22
 
22
23
  describe "a package with a fixed version" do
23
24
  before { resource[:ensure] = '7.2.446' }
25
+
24
26
  it "uses pkgin install to install a fixed version" do
25
- subject.expects(:pkgin).with("-y", :install, "vim-7.2.446").once()
27
+ expect(subject).to receive(:pkgin).with("-y", :install, "vim-7.2.446").once()
26
28
  subject.install
27
29
  end
28
30
  end
@@ -30,7 +32,7 @@ describe Puppet::Type.type(:package).provider(:pkgin) do
30
32
 
31
33
  describe "#uninstall" do
32
34
  it "uses pkgin remove to uninstall" do
33
- subject.expects(:pkgin).with("-y", :remove, "vim").once()
35
+ expect(subject).to receive(:pkgin).with("-y", :remove, "vim").once()
34
36
  subject.uninstall
35
37
  end
36
38
  end
@@ -41,7 +43,7 @@ describe Puppet::Type.type(:package).provider(:pkgin) do
41
43
  end
42
44
 
43
45
  before do
44
- described_class.stubs(:pkgin).with(:list).returns(pkgin_ls_output)
46
+ allow(described_class).to receive(:pkgin).with(:list).and_return(pkgin_ls_output)
45
47
  end
46
48
 
47
49
  it "returns an array of providers for each package" do
@@ -63,7 +65,7 @@ describe Puppet::Type.type(:package).provider(:pkgin) do
63
65
 
64
66
  describe "#latest" do
65
67
  before do
66
- described_class.stubs(:pkgin).with(:search, "vim").returns(pkgin_search_output)
68
+ allow(described_class).to receive(:pkgin).with(:search, "vim").and_return(pkgin_search_output)
67
69
  end
68
70
 
69
71
  context "when the package is installed" do
@@ -72,7 +74,7 @@ describe Puppet::Type.type(:package).provider(:pkgin) do
72
74
  end
73
75
 
74
76
  it "returns installed version" do
75
- subject.expects(:properties).returns( { :ensure => "7.2.446" } )
77
+ expect(subject).to receive(:properties).and_return({ :ensure => "7.2.446" })
76
78
  expect(subject.latest).to eq("7.2.446")
77
79
  end
78
80
  end
@@ -93,7 +95,7 @@ describe Puppet::Type.type(:package).provider(:pkgin) do
93
95
  end
94
96
 
95
97
  it "returns current version" do
96
- subject.expects(:properties).returns( { :ensure => "7.2.446" } )
98
+ expect(subject).to receive(:properties).and_return({ :ensure => "7.2.446" })
97
99
  expect(subject.latest).to eq("7.2.446")
98
100
  end
99
101
  end
@@ -115,7 +117,7 @@ SEARCH
115
117
  end
116
118
 
117
119
  it "returns the newest available version" do
118
- described_class.stubs(:pkgin).with(:search, "vim").returns(pkgin_search_output)
120
+ allow(described_class).to receive(:pkgin).with(:search, "vim").and_return(pkgin_search_output)
119
121
  expect(subject.latest).to eq("7.3")
120
122
  end
121
123
  end
@@ -28,26 +28,25 @@ describe Puppet::Type.type(:package).provider(:pkgng) do
28
28
  catalog = Puppet::Resource::Catalog.new
29
29
  catalog.host_config = false
30
30
  resources.each do |resource|
31
- #resource.expects(:err).never
32
31
  catalog.add_resource(resource)
33
32
  end
34
33
  catalog.apply
35
34
  end
36
35
 
37
36
  before do
38
- described_class.stubs(:command).with(:pkg) { '/usr/local/sbin/pkg' }
37
+ allow(described_class).to receive(:command).with(:pkg).and_return('/usr/local/sbin/pkg')
39
38
 
40
39
  info = File.read(my_fixture('pkg.info'))
41
- described_class.stubs(:get_query).returns(info)
40
+ allow(described_class).to receive(:get_query).and_return(info)
42
41
 
43
42
  version_list = File.read(my_fixture('pkg.version'))
44
- described_class.stubs(:get_version_list).returns(version_list)
43
+ allow(described_class).to receive(:get_version_list).and_return(version_list)
45
44
  end
46
45
 
47
46
  context "#instances" do
48
47
  it "should return the empty set if no packages are listed" do
49
- described_class.stubs(:get_query).returns('')
50
- described_class.stubs(:get_version_list).returns('')
48
+ allow(described_class).to receive(:get_query).and_return('')
49
+ allow(described_class).to receive(:get_version_list).and_return('')
51
50
  expect(described_class.instances).to be_empty
52
51
  end
53
52
 
@@ -63,14 +62,14 @@ describe Puppet::Type.type(:package).provider(:pkgng) do
63
62
  end
64
63
 
65
64
  it "should return an empty array when pkg calls raise an exception" do
66
- described_class.stubs(:get_query).raises(Puppet::ExecutionFailure, 'An error occurred.')
65
+ allow(described_class).to receive(:get_query).and_raise(Puppet::ExecutionFailure, 'An error occurred.')
67
66
  expect(described_class.instances).to eq([])
68
67
  end
69
68
 
70
69
  describe "version" do
71
70
  it "should retrieve the correct version of the current package" do
72
71
  zsh = described_class.instances.find {|i| i.properties[:origin] == 'shells/zsh' }
73
- expect( zsh.properties[:version]).to eq('5.0.2_1')
72
+ expect(zsh.properties[:version]).to eq('5.0.2_1')
74
73
  end
75
74
  end
76
75
  end
@@ -82,8 +81,8 @@ describe Puppet::Type.type(:package).provider(:pkgng) do
82
81
  :provider => :pkgng,
83
82
  :ensure => '7.33.1'
84
83
  )
85
- resource.provider.expects(:pkg) do |arg|
86
- arg.should include('curl-7.33.1')
84
+ expect(resource.provider).to receive(:pkg) do |arg|
85
+ expect(arg).to include('curl-7.33.1')
87
86
  end
88
87
  resource.provider.install
89
88
  end
@@ -94,8 +93,8 @@ describe Puppet::Type.type(:package).provider(:pkgng) do
94
93
  :provider => :pkgng,
95
94
  :ensure => '7.33.1'
96
95
  )
97
- resource.provider.expects(:pkg) do |arg|
98
- arg.should include('curl-7.33.1')
96
+ expect(resource.provider).to receive(:pkg) do |arg|
97
+ expect(arg).to include('curl-7.33.1')
99
98
  end
100
99
  resource.provider.install
101
100
  end
@@ -106,8 +105,8 @@ describe Puppet::Type.type(:package).provider(:pkgng) do
106
105
  :provider => :pkgng,
107
106
  :source => 'urn:freebsd:repo:FreeBSD'
108
107
  )
109
- resource.provider.expects(:pkg) do |arg|
110
- arg.should include('FreeBSD')
108
+ expect(resource.provider).to receive(:pkg) do |arg|
109
+ expect(arg).to include('FreeBSD')
111
110
  end
112
111
  resource.provider.install
113
112
  end
@@ -115,7 +114,7 @@ describe Puppet::Type.type(:package).provider(:pkgng) do
115
114
 
116
115
  context "#prefetch" do
117
116
  it "should fail gracefully when " do
118
- described_class.stubs(:instances).returns([])
117
+ allow(described_class).to receive(:instances).and_return([])
119
118
  expect{ described_class.prefetch({}) }.to_not raise_error
120
119
  end
121
120
  end
@@ -128,7 +127,7 @@ describe Puppet::Type.type(:package).provider(:pkgng) do
128
127
 
129
128
  it "should return nil if not present" do
130
129
  fixture = File.read(my_fixture('pkg.query_absent'))
131
- described_class.stubs(:get_resource_info).with('bash').returns(fixture)
130
+ allow(described_class).to receive(:get_resource_info).with('bash').and_return(fixture)
132
131
  expect(provider.query).to equal(nil)
133
132
  end
134
133
  end
@@ -152,7 +151,7 @@ describe Puppet::Type.type(:package).provider(:pkgng) do
152
151
  :ensure => :latest
153
152
  )
154
153
 
155
- resource.provider.expects(:update)
154
+ expect(resource.provider).to receive(:update)
156
155
 
157
156
  resource.property(:ensure).sync
158
157
  end
@@ -175,7 +174,7 @@ describe Puppet::Type.type(:package).provider(:pkgng) do
175
174
  describe "confine" do
176
175
  context "on FreeBSD" do
177
176
  it "should be the default provider" do
178
- Facter.expects(:value).with(:operatingsystem).at_least_once.returns :freebsd
177
+ expect(Facter).to receive(:value).with(:operatingsystem).at_least(:once).and_return(:freebsd)
179
178
  expect(described_class).to be_default
180
179
  end
181
180
  end
@@ -1,19 +1,16 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
- provider = Puppet::Type.type(:package).provider(:pkgutil)
5
-
6
- describe provider do
3
+ describe Puppet::Type.type(:package).provider(:pkgutil) do
7
4
  before(:each) do
8
5
  @resource = Puppet::Type.type(:package).new(
9
6
  :name => "TESTpkg",
10
7
  :ensure => :present,
11
8
  :provider => :pkgutil
12
9
  )
13
- @provider = provider.new(@resource)
10
+ @provider = described_class.new(@resource)
14
11
 
15
12
  # Stub all file and config tests
16
- provider.stubs(:healthcheck)
13
+ allow(described_class).to receive(:healthcheck)
17
14
  end
18
15
 
19
16
  it "should have an install method" do
@@ -35,59 +32,59 @@ describe provider do
35
32
  describe "when installing" do
36
33
  it "should use a command without versioned package" do
37
34
  @resource[:ensure] = :latest
38
- @provider.expects(:pkguti).with('-y', '-i', 'TESTpkg')
35
+ expect(@provider).to receive(:pkguti).with('-y', '-i', 'TESTpkg')
39
36
  @provider.install
40
37
  end
41
38
 
42
39
  it "should support a single temp repo URL" do
43
40
  @resource[:ensure] = :latest
44
41
  @resource[:source] = "http://example.net/repo"
45
- @provider.expects(:pkguti).with('-t', 'http://example.net/repo', '-y', '-i', 'TESTpkg')
42
+ expect(@provider).to receive(:pkguti).with('-t', 'http://example.net/repo', '-y', '-i', 'TESTpkg')
46
43
  @provider.install
47
44
  end
48
45
 
49
46
  it "should support multiple temp repo URLs as array" do
50
47
  @resource[:ensure] = :latest
51
48
  @resource[:source] = [ 'http://example.net/repo', 'http://example.net/foo' ]
52
- @provider.expects(:pkguti).with('-t', 'http://example.net/repo', '-t', 'http://example.net/foo', '-y', '-i', 'TESTpkg')
49
+ expect(@provider).to receive(:pkguti).with('-t', 'http://example.net/repo', '-t', 'http://example.net/foo', '-y', '-i', 'TESTpkg')
53
50
  @provider.install
54
51
  end
55
52
  end
56
53
 
57
54
  describe "when updating" do
58
55
  it "should use a command without versioned package" do
59
- @provider.expects(:pkguti).with('-y', '-u', 'TESTpkg')
56
+ expect(@provider).to receive(:pkguti).with('-y', '-u', 'TESTpkg')
60
57
  @provider.update
61
58
  end
62
59
 
63
60
  it "should support a single temp repo URL" do
64
61
  @resource[:source] = "http://example.net/repo"
65
- @provider.expects(:pkguti).with('-t', 'http://example.net/repo', '-y', '-u', 'TESTpkg')
62
+ expect(@provider).to receive(:pkguti).with('-t', 'http://example.net/repo', '-y', '-u', 'TESTpkg')
66
63
  @provider.update
67
64
  end
68
65
 
69
66
  it "should support multiple temp repo URLs as array" do
70
67
  @resource[:source] = [ 'http://example.net/repo', 'http://example.net/foo' ]
71
- @provider.expects(:pkguti).with('-t', 'http://example.net/repo', '-t', 'http://example.net/foo', '-y', '-u', 'TESTpkg')
68
+ expect(@provider).to receive(:pkguti).with('-t', 'http://example.net/repo', '-t', 'http://example.net/foo', '-y', '-u', 'TESTpkg')
72
69
  @provider.update
73
70
  end
74
71
  end
75
72
 
76
73
  describe "when uninstalling" do
77
74
  it "should call the remove operation" do
78
- @provider.expects(:pkguti).with('-y', '-r', 'TESTpkg')
75
+ expect(@provider).to receive(:pkguti).with('-y', '-r', 'TESTpkg')
79
76
  @provider.uninstall
80
77
  end
81
78
 
82
79
  it "should support a single temp repo URL" do
83
80
  @resource[:source] = "http://example.net/repo"
84
- @provider.expects(:pkguti).with('-t', 'http://example.net/repo', '-y', '-r', 'TESTpkg')
81
+ expect(@provider).to receive(:pkguti).with('-t', 'http://example.net/repo', '-y', '-r', 'TESTpkg')
85
82
  @provider.uninstall
86
83
  end
87
84
 
88
85
  it "should support multiple temp repo URLs as array" do
89
86
  @resource[:source] = [ 'http://example.net/repo', 'http://example.net/foo' ]
90
- @provider.expects(:pkguti).with('-t', 'http://example.net/repo', '-t', 'http://example.net/foo', '-y', '-r', 'TESTpkg')
87
+ expect(@provider).to receive(:pkguti).with('-t', 'http://example.net/repo', '-t', 'http://example.net/foo', '-y', '-r', 'TESTpkg')
91
88
  @provider.uninstall
92
89
  end
93
90
  end
@@ -97,7 +94,7 @@ describe provider do
97
94
  fake_data = "
98
95
  noisy output here
99
96
  TESTpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
100
- provider.expects(:pkguti).with('-c', '--single', 'TESTpkg').returns fake_data
97
+ expect(described_class).to receive(:pkguti).with('-c', '--single', 'TESTpkg').and_return(fake_data)
101
98
  expect(@provider.latest).to eq("1.4.5,REV=2007.11.20")
102
99
  end
103
100
 
@@ -106,7 +103,7 @@ TESTpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
106
103
  fake_data = "
107
104
  noisy output here
108
105
  TESTpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
109
- provider.expects(:pkguti).with('-t', 'http://example.net/repo', '-c', '--single', 'TESTpkg').returns fake_data
106
+ expect(described_class).to receive(:pkguti).with('-t', 'http://example.net/repo', '-c', '--single', 'TESTpkg').and_return(fake_data)
110
107
  expect(@provider.latest).to eq("1.4.5,REV=2007.11.20")
111
108
  end
112
109
 
@@ -114,19 +111,19 @@ TESTpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
114
111
  fake_data = "
115
112
  noisy output here
116
113
  TESTpkg 1.4.5,REV=2007.11.18 SAME"
117
- provider.expects(:pkguti).with('-c', '--single', 'TESTpkg').returns fake_data
114
+ expect(described_class).to receive(:pkguti).with('-c', '--single', 'TESTpkg').and_return(fake_data)
118
115
  expect(@provider.latest).to eq("1.4.5,REV=2007.11.18")
119
116
  end
120
117
 
121
118
  it "should handle a non-existent package" do
122
119
  fake_data = "noisy output here
123
120
  Not in catalog"
124
- provider.expects(:pkguti).with('-c', '--single', 'TESTpkg').returns fake_data
121
+ expect(described_class).to receive(:pkguti).with('-c', '--single', 'TESTpkg').and_return(fake_data)
125
122
  expect(@provider.latest).to eq(nil)
126
123
  end
127
124
 
128
125
  it "should warn on unknown pkgutil noise" do
129
- provider.expects(:pkguti).with('-c', '--single', 'TESTpkg').returns("testingnoise")
126
+ expect(described_class).to receive(:pkguti).with('-c', '--single', 'TESTpkg').and_return("testingnoise")
130
127
  expect(@provider.latest).to eq(nil)
131
128
  end
132
129
 
@@ -140,7 +137,7 @@ gpg: Good signature from \"Distribution Manager <dm@blastwave.org>\"
140
137
  ==> 2770 packages loaded from /var/opt/csw/pkgutil/catalog.mirror.opencsw.org_opencsw_unstable_i386_5.11
141
138
  package installed catalog
142
139
  TESTpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
143
- provider.expects(:pkguti).with('-c', '--single', 'TESTpkg').returns fake_data
140
+ expect(described_class).to receive(:pkguti).with('-c', '--single', 'TESTpkg').and_return(fake_data)
144
141
  expect(@provider.latest).to eq("1.4.5,REV=2007.11.20")
145
142
  end
146
143
 
@@ -148,7 +145,7 @@ TESTpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
148
145
  fake_data = "
149
146
  noisy output here
150
147
  REALpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
151
- provider.expects(:pkguti).with('-c', '--single', 'TESTpkg').returns fake_data
148
+ expect(described_class).to receive(:pkguti).with('-c', '--single', 'TESTpkg').and_return(fake_data)
152
149
  expect(@provider.query[:name]).to eq("TESTpkg")
153
150
  end
154
151
  end
@@ -156,80 +153,79 @@ REALpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
156
153
  describe "when querying current version" do
157
154
  it "should return TESTpkg's version string" do
158
155
  fake_data = "TESTpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
159
- provider.expects(:pkguti).with('-c', '--single', 'TESTpkg').returns fake_data
156
+ expect(described_class).to receive(:pkguti).with('-c', '--single', 'TESTpkg').and_return(fake_data)
160
157
  expect(@provider.query[:ensure]).to eq("1.4.5,REV=2007.11.18")
161
158
  end
162
159
 
163
160
  it "should handle a package that isn't installed" do
164
161
  fake_data = "TESTpkg notinst 1.4.5,REV=2007.11.20"
165
- provider.expects(:pkguti).with('-c', '--single', 'TESTpkg').returns fake_data
162
+ expect(described_class).to receive(:pkguti).with('-c', '--single', 'TESTpkg').and_return(fake_data)
166
163
  expect(@provider.query[:ensure]).to eq(:absent)
167
164
  end
168
165
 
169
166
  it "should handle a non-existent package" do
170
167
  fake_data = "noisy output here
171
168
  Not in catalog"
172
- provider.expects(:pkguti).with('-c', '--single', 'TESTpkg').returns fake_data
169
+ expect(described_class).to receive(:pkguti).with('-c', '--single', 'TESTpkg').and_return(fake_data)
173
170
  expect(@provider.query[:ensure]).to eq(:absent)
174
171
  end
175
172
 
176
173
  it "should support a temp repo URL" do
177
174
  @resource[:source] = "http://example.net/repo"
178
175
  fake_data = "TESTpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
179
- provider.expects(:pkguti).with('-t', 'http://example.net/repo', '-c', '--single', 'TESTpkg').returns fake_data
176
+ expect(described_class).to receive(:pkguti).with('-t', 'http://example.net/repo', '-c', '--single', 'TESTpkg').and_return(fake_data)
180
177
  expect(@provider.query[:ensure]).to eq("1.4.5,REV=2007.11.18")
181
178
  end
182
179
  end
183
180
 
184
181
  describe "when querying current instances" do
185
182
  it "should warn on unknown pkgutil noise" do
186
- provider.expects(:pkguti).with(['-a']).returns("testingnoise")
187
- provider.expects(:pkguti).with(['-c']).returns("testingnoise")
188
- Puppet.expects(:warning).times(2)
189
- provider.expects(:new).never
190
- expect(provider.instances).to eq([])
183
+ expect(described_class).to receive(:pkguti).with(['-a']).and_return("testingnoise")
184
+ expect(described_class).to receive(:pkguti).with(['-c']).and_return("testingnoise")
185
+ expect(Puppet).to receive(:warning).twice
186
+ expect(described_class).not_to receive(:new)
187
+ expect(described_class.instances).to eq([])
191
188
  end
192
189
 
193
190
  it "should return TESTpkg's version string" do
194
191
  fake_data = "TESTpkg TESTpkg 1.4.5,REV=2007.11.20"
195
- provider.expects(:pkguti).with(['-a']).returns fake_data
192
+ expect(described_class).to receive(:pkguti).with(['-a']).and_return(fake_data)
196
193
 
197
194
  fake_data = "TESTpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
198
- provider.expects(:pkguti).with(['-c']).returns fake_data
195
+ expect(described_class).to receive(:pkguti).with(['-c']).and_return(fake_data)
199
196
 
200
- testpkg = mock 'pkg1'
201
- provider.expects(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "TESTpkg", :provider => :pkgutil).returns testpkg
202
- expect(provider.instances).to eq([testpkg])
197
+ testpkg = double('pkg1')
198
+ expect(described_class).to receive(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "TESTpkg", :provider => :pkgutil).and_return(testpkg)
199
+ expect(described_class.instances).to eq([testpkg])
203
200
  end
204
201
 
205
202
  it "should also return both TESTpkg and mypkg alias instances" do
206
203
  fake_data = "mypkg TESTpkg 1.4.5,REV=2007.11.20"
207
- provider.expects(:pkguti).with(['-a']).returns fake_data
204
+ expect(described_class).to receive(:pkguti).with(['-a']).and_return(fake_data)
208
205
 
209
206
  fake_data = "TESTpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
210
- provider.expects(:pkguti).with(['-c']).returns fake_data
207
+ expect(described_class).to receive(:pkguti).with(['-c']).and_return(fake_data)
211
208
 
212
- testpkg = mock 'pkg1'
213
- provider.expects(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "TESTpkg", :provider => :pkgutil).returns testpkg
209
+ testpkg = double('pkg1')
210
+ expect(described_class).to receive(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "TESTpkg", :provider => :pkgutil).and_return(testpkg)
214
211
 
215
- aliaspkg = mock 'pkg2'
216
- provider.expects(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "mypkg", :provider => :pkgutil).returns aliaspkg
212
+ aliaspkg = double('pkg2')
213
+ expect(described_class).to receive(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "mypkg", :provider => :pkgutil).and_return(aliaspkg)
217
214
 
218
- expect(provider.instances).to eq([testpkg,aliaspkg])
215
+ expect(described_class.instances).to eq([testpkg,aliaspkg])
219
216
  end
220
217
 
221
218
  it "shouldn't mind noise in the -a output" do
222
219
  fake_data = "noisy output here"
223
- provider.expects(:pkguti).with(['-a']).returns fake_data
220
+ expect(described_class).to receive(:pkguti).with(['-a']).and_return(fake_data)
224
221
 
225
222
  fake_data = "TESTpkg 1.4.5,REV=2007.11.18 1.4.5,REV=2007.11.20"
226
- provider.expects(:pkguti).with(['-c']).returns fake_data
223
+ expect(described_class).to receive(:pkguti).with(['-c']).and_return(fake_data)
227
224
 
228
- testpkg = mock 'pkg1'
229
- provider.expects(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "TESTpkg", :provider => :pkgutil).returns testpkg
225
+ testpkg = double('pkg1')
226
+ expect(described_class).to receive(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "TESTpkg", :provider => :pkgutil).and_return(testpkg)
230
227
 
231
- expect(provider.instances).to eq([testpkg])
228
+ expect(described_class.instances).to eq([testpkg])
232
229
  end
233
230
  end
234
-
235
231
  end