puppet 6.4.0-universal-darwin → 6.4.1-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 (646) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +7 -11
  4. data/lib/puppet/application/device.rb +97 -82
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/application/ssl.rb +2 -2
  7. data/lib/puppet/configurer.rb +5 -4
  8. data/lib/puppet/defaults.rb +33 -11
  9. data/lib/puppet/indirector/request.rb +28 -15
  10. data/lib/puppet/ssl.rb +1 -1
  11. data/lib/puppet/ssl/certificate.rb +1 -1
  12. data/lib/puppet/ssl/error.rb +1 -1
  13. data/lib/puppet/ssl/host.rb +0 -47
  14. data/lib/puppet/ssl/ssl_provider.rb +2 -2
  15. data/lib/puppet/ssl/state_machine.rb +16 -17
  16. data/lib/puppet/ssl/validator/default_validator.rb +4 -4
  17. data/lib/puppet/ssl/verifier.rb +1 -1
  18. data/lib/puppet/transaction/event_manager.rb +1 -5
  19. data/lib/puppet/util/connection.rb +15 -8
  20. data/lib/puppet/util/monkey_patches.rb +20 -1
  21. data/lib/puppet/version.rb +1 -1
  22. data/locales/puppet.pot +135 -68
  23. data/man/man5/puppet.conf.5 +9 -9
  24. data/man/man8/puppet-agent.8 +1 -1
  25. data/man/man8/puppet-apply.8 +1 -1
  26. data/man/man8/puppet-catalog.8 +1 -1
  27. data/man/man8/puppet-config.8 +1 -1
  28. data/man/man8/puppet-describe.8 +1 -1
  29. data/man/man8/puppet-device.8 +1 -1
  30. data/man/man8/puppet-doc.8 +1 -1
  31. data/man/man8/puppet-epp.8 +1 -1
  32. data/man/man8/puppet-facts.8 +1 -1
  33. data/man/man8/puppet-filebucket.8 +1 -1
  34. data/man/man8/puppet-generate.8 +1 -1
  35. data/man/man8/puppet-help.8 +1 -1
  36. data/man/man8/puppet-key.8 +1 -1
  37. data/man/man8/puppet-lookup.8 +1 -1
  38. data/man/man8/puppet-man.8 +1 -1
  39. data/man/man8/puppet-module.8 +1 -1
  40. data/man/man8/puppet-node.8 +1 -1
  41. data/man/man8/puppet-parser.8 +1 -1
  42. data/man/man8/puppet-plugin.8 +1 -1
  43. data/man/man8/puppet-report.8 +1 -1
  44. data/man/man8/puppet-resource.8 +1 -1
  45. data/man/man8/puppet-script.8 +1 -1
  46. data/man/man8/puppet-ssl.8 +1 -1
  47. data/man/man8/puppet-status.8 +1 -1
  48. data/man/man8/puppet.8 +2 -2
  49. data/spec/integration/agent/logging_spec.rb +5 -7
  50. data/spec/integration/application/apply_spec.rb +18 -16
  51. data/spec/integration/application/doc_spec.rb +1 -2
  52. data/spec/integration/application/lookup_spec.rb +5 -5
  53. data/spec/integration/configurer_spec.rb +5 -6
  54. data/spec/integration/defaults_spec.rb +5 -6
  55. data/spec/integration/directory_environments_spec.rb +1 -1
  56. data/spec/integration/faces/config_spec.rb +3 -4
  57. data/spec/integration/faces/documentation_spec.rb +0 -1
  58. data/spec/integration/faces/plugin_spec.rb +1 -1
  59. data/spec/integration/file_bucket/file_spec.rb +2 -4
  60. data/spec/integration/file_serving/content_spec.rb +0 -1
  61. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  62. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  63. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  64. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  65. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  66. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  67. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  68. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  69. data/spec/integration/network/authconfig_spec.rb +23 -24
  70. data/spec/integration/network/formats_spec.rb +0 -1
  71. data/spec/integration/network/http_pool_spec.rb +3 -3
  72. data/spec/integration/node/environment_spec.rb +0 -1
  73. data/spec/integration/node/facts_spec.rb +9 -10
  74. data/spec/integration/node_spec.rb +6 -7
  75. data/spec/integration/parser/catalog_spec.rb +1 -5
  76. data/spec/integration/parser/collection_spec.rb +1 -2
  77. data/spec/integration/parser/compiler_spec.rb +6 -6
  78. data/spec/integration/parser/scope_spec.rb +1 -1
  79. data/spec/integration/parser/undef_param_spec.rb +1 -1
  80. data/spec/integration/provider/service/init_spec.rb +4 -5
  81. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  82. data/spec/integration/provider/service/windows_spec.rb +1 -2
  83. data/spec/integration/reference/providers_spec.rb +1 -2
  84. data/spec/integration/reports_spec.rb +1 -2
  85. data/spec/integration/resource/catalog_spec.rb +14 -17
  86. data/spec/integration/resource/type_collection_spec.rb +4 -5
  87. data/spec/integration/rest/client_spec.rb +1 -1
  88. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  89. data/spec/integration/ssl/host_spec.rb +1 -2
  90. data/spec/integration/ssl/key_spec.rb +0 -1
  91. data/spec/integration/test/test_helper_spec.rb +0 -1
  92. data/spec/integration/transaction/report_spec.rb +6 -11
  93. data/spec/integration/transaction_spec.rb +18 -19
  94. data/spec/integration/type/exec_spec.rb +0 -1
  95. data/spec/integration/type/file_spec.rb +13 -14
  96. data/spec/integration/type/package_spec.rb +19 -23
  97. data/spec/integration/type/tidy_spec.rb +1 -2
  98. data/spec/integration/type_spec.rb +0 -1
  99. data/spec/integration/util/autoload_spec.rb +1 -2
  100. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  101. data/spec/integration/util/settings_spec.rb +0 -1
  102. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  103. data/spec/integration/util/windows/principal_spec.rb +0 -1
  104. data/spec/integration/util/windows/process_spec.rb +4 -6
  105. data/spec/integration/util/windows/registry_spec.rb +41 -51
  106. data/spec/integration/util/windows/security_spec.rb +2 -4
  107. data/spec/integration/util/windows/user_spec.rb +18 -20
  108. data/spec/integration/util_spec.rb +4 -7
  109. data/spec/lib/puppet_spec/compiler.rb +1 -1
  110. data/spec/lib/puppet_spec/files.rb +0 -1
  111. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  112. data/spec/lib/puppet_spec/scope.rb +1 -2
  113. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  114. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  115. data/spec/shared_behaviours/file_serving.rb +6 -8
  116. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  117. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  118. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  119. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  120. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  121. data/spec/spec_helper.rb +10 -1
  122. data/spec/unit/agent/disabler_spec.rb +4 -5
  123. data/spec/unit/agent/locker_spec.rb +12 -13
  124. data/spec/unit/agent_spec.rb +80 -85
  125. data/spec/unit/application/agent_spec.rb +88 -94
  126. data/spec/unit/application/apply_spec.rb +82 -83
  127. data/spec/unit/application/config_spec.rb +0 -1
  128. data/spec/unit/application/describe_spec.rb +6 -7
  129. data/spec/unit/application/device_spec.rb +379 -384
  130. data/spec/unit/application/doc_spec.rb +44 -46
  131. data/spec/unit/application/face_base_spec.rb +61 -62
  132. data/spec/unit/application/facts_spec.rb +3 -4
  133. data/spec/unit/application/filebucket_spec.rb +66 -74
  134. data/spec/unit/application/indirection_base_spec.rb +8 -6
  135. data/spec/unit/application/lookup_spec.rb +26 -26
  136. data/spec/unit/application/resource_spec.rb +42 -48
  137. data/spec/unit/application/ssl_spec.rb +9 -9
  138. data/spec/unit/application_spec.rb +82 -92
  139. data/spec/unit/capability_spec.rb +6 -6
  140. data/spec/unit/certificate_factory_spec.rb +3 -5
  141. data/spec/unit/configurer/downloader_spec.rb +20 -21
  142. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  143. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  144. data/spec/unit/configurer_spec.rb +189 -192
  145. data/spec/unit/confine/exists_spec.rb +17 -15
  146. data/spec/unit/confine/false_spec.rb +5 -6
  147. data/spec/unit/confine/feature_spec.rb +7 -5
  148. data/spec/unit/confine/true_spec.rb +5 -6
  149. data/spec/unit/confine/variable_spec.rb +14 -15
  150. data/spec/unit/confine_collection_spec.rb +28 -29
  151. data/spec/unit/confine_spec.rb +13 -14
  152. data/spec/unit/confiner_spec.rb +10 -11
  153. data/spec/unit/context/trusted_information_spec.rb +1 -1
  154. data/spec/unit/daemon_spec.rb +35 -36
  155. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  156. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  157. data/spec/unit/datatypes_spec.rb +3 -4
  158. data/spec/unit/defaults_spec.rb +18 -13
  159. data/spec/unit/environments_spec.rb +7 -7
  160. data/spec/unit/etc_spec.rb +30 -32
  161. data/spec/unit/external/pson_spec.rb +0 -1
  162. data/spec/unit/face/catalog_spec.rb +0 -1
  163. data/spec/unit/face/config_spec.rb +31 -35
  164. data/spec/unit/face/epp_face_spec.rb +3 -4
  165. data/spec/unit/face/facts_spec.rb +5 -6
  166. data/spec/unit/face/generate_spec.rb +4 -5
  167. data/spec/unit/face/help_spec.rb +7 -8
  168. data/spec/unit/face/key_spec.rb +0 -1
  169. data/spec/unit/face/man_spec.rb +1 -2
  170. data/spec/unit/face/module/install_spec.rb +3 -5
  171. data/spec/unit/face/module/list_spec.rb +2 -12
  172. data/spec/unit/face/module/search_spec.rb +11 -9
  173. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  174. data/spec/unit/face/node_spec.rb +23 -24
  175. data/spec/unit/face/parser_spec.rb +3 -3
  176. data/spec/unit/face/plugin_spec.rb +36 -9
  177. data/spec/unit/face/status_spec.rb +0 -1
  178. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  179. data/spec/unit/file_bucket/file_spec.rb +0 -2
  180. data/spec/unit/file_serving/base_spec.rb +14 -15
  181. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  182. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  183. data/spec/unit/file_serving/content_spec.rb +10 -11
  184. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  185. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  186. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  187. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  188. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  189. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  190. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  191. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  192. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  193. data/spec/unit/file_serving/mount_spec.rb +0 -1
  194. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  195. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  196. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  197. data/spec/unit/file_system_spec.rb +4 -4
  198. data/spec/unit/forge/errors_spec.rb +1 -1
  199. data/spec/unit/forge/forge_spec.rb +13 -14
  200. data/spec/unit/forge/module_release_spec.rb +18 -18
  201. data/spec/unit/forge/repository_spec.rb +29 -30
  202. data/spec/unit/forge_spec.rb +15 -11
  203. data/spec/unit/functions/binary_file_spec.rb +3 -3
  204. data/spec/unit/functions/contain_spec.rb +0 -2
  205. data/spec/unit/functions/defined_spec.rb +0 -1
  206. data/spec/unit/functions/epp_spec.rb +2 -2
  207. data/spec/unit/functions/find_file_spec.rb +7 -7
  208. data/spec/unit/functions/include_spec.rb +0 -4
  209. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  210. data/spec/unit/functions/lookup_spec.rb +1 -2
  211. data/spec/unit/functions/module_directory_spec.rb +12 -12
  212. data/spec/unit/functions/require_spec.rb +0 -3
  213. data/spec/unit/functions/shared.rb +5 -8
  214. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  215. data/spec/unit/functions4_spec.rb +9 -10
  216. data/spec/unit/gettext/config_spec.rb +4 -4
  217. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  218. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  219. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  220. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  221. data/spec/unit/hiera_puppet_spec.rb +20 -20
  222. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  223. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  224. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  225. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  226. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  227. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  228. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  229. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  230. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  231. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  232. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  233. data/spec/unit/indirector/envelope_spec.rb +1 -2
  234. data/spec/unit/indirector/exec_spec.rb +4 -5
  235. data/spec/unit/indirector/face_spec.rb +9 -9
  236. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  237. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  238. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  239. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  240. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  241. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  242. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  243. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  244. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  245. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  246. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  247. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  248. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  249. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  250. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  251. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  252. data/spec/unit/indirector/file_server_spec.rb +87 -87
  253. data/spec/unit/indirector/indirection_spec.rb +242 -226
  254. data/spec/unit/indirector/json_spec.rb +7 -9
  255. data/spec/unit/indirector/key/file_spec.rb +21 -22
  256. data/spec/unit/indirector/memory_spec.rb +6 -7
  257. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  258. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  259. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  260. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  261. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  262. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  263. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  264. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  265. data/spec/unit/indirector/none_spec.rb +5 -5
  266. data/spec/unit/indirector/plain_spec.rb +7 -8
  267. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  268. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  269. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  270. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  271. data/spec/unit/indirector/request_spec.rb +11 -12
  272. data/spec/unit/indirector/resource/ral_spec.rb +47 -54
  273. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  274. data/spec/unit/indirector/rest_spec.rb +113 -110
  275. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  276. data/spec/unit/indirector/status/local_spec.rb +0 -1
  277. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  278. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  279. data/spec/unit/indirector/terminus_spec.rb +27 -27
  280. data/spec/unit/indirector/yaml_spec.rb +5 -6
  281. data/spec/unit/indirector_spec.rb +1 -2
  282. data/spec/unit/info_service_spec.rb +1 -1
  283. data/spec/unit/interface/action_builder_spec.rb +0 -1
  284. data/spec/unit/interface/action_manager_spec.rb +0 -1
  285. data/spec/unit/interface/action_spec.rb +2 -3
  286. data/spec/unit/interface/documentation_spec.rb +0 -1
  287. data/spec/unit/interface/face_collection_spec.rb +19 -12
  288. data/spec/unit/interface_spec.rb +3 -3
  289. data/spec/unit/man_spec.rb +3 -4
  290. data/spec/unit/module_spec.rb +46 -51
  291. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  292. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  293. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  294. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  295. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  296. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  297. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  298. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  299. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  300. data/spec/unit/module_tool/tar_spec.rb +12 -13
  301. data/spec/unit/module_tool_spec.rb +7 -12
  302. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  303. data/spec/unit/network/authconfig_spec.rb +17 -18
  304. data/spec/unit/network/authorization_spec.rb +4 -5
  305. data/spec/unit/network/authstore_spec.rb +0 -1
  306. data/spec/unit/network/format_handler_spec.rb +0 -1
  307. data/spec/unit/network/format_spec.rb +9 -10
  308. data/spec/unit/network/format_support_spec.rb +28 -29
  309. data/spec/unit/network/formats_spec.rb +4 -5
  310. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  311. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  312. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  313. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  314. data/spec/unit/network/http/api_spec.rb +0 -2
  315. data/spec/unit/network/http/compression_spec.rb +21 -22
  316. data/spec/unit/network/http/connection_spec.rb +35 -35
  317. data/spec/unit/network/http/factory_spec.rb +5 -6
  318. data/spec/unit/network/http/handler_spec.rb +9 -18
  319. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  320. data/spec/unit/network/http/pool_spec.rb +33 -34
  321. data/spec/unit/network/http/request_spec.rb +0 -2
  322. data/spec/unit/network/http/response_spec.rb +11 -13
  323. data/spec/unit/network/http/route_spec.rb +0 -1
  324. data/spec/unit/network/http/session_spec.rb +2 -3
  325. data/spec/unit/network/http/site_spec.rb +0 -1
  326. data/spec/unit/network/http_pool_spec.rb +19 -10
  327. data/spec/unit/network/http_spec.rb +0 -1
  328. data/spec/unit/network/resolver_spec.rb +25 -26
  329. data/spec/unit/network/rights_spec.rb +52 -53
  330. data/spec/unit/node/environment_spec.rb +14 -15
  331. data/spec/unit/node/facts_spec.rb +5 -7
  332. data/spec/unit/node_spec.rb +4 -10
  333. data/spec/unit/other/selinux_spec.rb +0 -1
  334. data/spec/unit/parameter/boolean_spec.rb +1 -2
  335. data/spec/unit/parameter/package_options_spec.rb +1 -2
  336. data/spec/unit/parameter/path_spec.rb +0 -1
  337. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  338. data/spec/unit/parameter/value_spec.rb +0 -1
  339. data/spec/unit/parameter_spec.rb +9 -9
  340. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  341. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  342. data/spec/unit/parser/compiler_spec.rb +84 -96
  343. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  344. data/spec/unit/parser/files_spec.rb +0 -1
  345. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  346. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  347. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  348. data/spec/unit/parser/functions/file_spec.rb +13 -14
  349. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  350. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  351. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  352. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  353. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  354. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  355. data/spec/unit/parser/functions/split_spec.rb +0 -1
  356. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  357. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  358. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  359. data/spec/unit/parser/functions/template_spec.rb +13 -13
  360. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  361. data/spec/unit/parser/functions_spec.rb +6 -7
  362. data/spec/unit/parser/relationship_spec.rb +0 -1
  363. data/spec/unit/parser/resource_spec.rb +42 -42
  364. data/spec/unit/parser/scope_spec.rb +39 -35
  365. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  366. data/spec/unit/parser/type_loader_spec.rb +17 -19
  367. data/spec/unit/pops/adaptable_spec.rb +0 -1
  368. data/spec/unit/pops/benchmark_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  371. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  372. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  373. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  374. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  375. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  376. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  377. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  378. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  379. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  380. data/spec/unit/pops/factory_spec.rb +3 -4
  381. data/spec/unit/pops/issues_spec.rb +19 -20
  382. data/spec/unit/pops/loaders/loader_spec.rb +9 -5
  383. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  384. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  385. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  386. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  387. data/spec/unit/pops/migration_spec.rb +3 -5
  388. data/spec/unit/pops/model/model_spec.rb +0 -1
  389. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  390. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  391. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  392. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  393. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  394. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  395. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  396. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  397. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  398. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  399. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  400. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  401. data/spec/unit/pops/pn_spec.rb +0 -1
  402. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  403. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  404. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  405. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  406. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  407. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  408. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  409. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  410. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  411. data/spec/unit/pops/visitor_spec.rb +0 -1
  412. data/spec/unit/property/boolean_spec.rb +1 -1
  413. data/spec/unit/property/ensure_spec.rb +0 -1
  414. data/spec/unit/property/keyvalue_spec.rb +32 -34
  415. data/spec/unit/property/list_spec.rb +26 -27
  416. data/spec/unit/property/ordered_list_spec.rb +10 -14
  417. data/spec/unit/property_spec.rb +42 -43
  418. data/spec/unit/provider/aix_object_spec.rb +47 -45
  419. data/spec/unit/provider/command_spec.rb +9 -9
  420. data/spec/unit/provider/exec/posix_spec.rb +8 -9
  421. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  422. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  423. data/spec/unit/provider/exec_spec.rb +0 -1
  424. data/spec/unit/provider/file/posix_spec.rb +22 -24
  425. data/spec/unit/provider/file/windows_spec.rb +15 -17
  426. data/spec/unit/provider/group/aix_spec.rb +3 -2
  427. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  428. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  429. data/spec/unit/provider/group/pw_spec.rb +11 -11
  430. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  431. data/spec/unit/provider/ldap_spec.rb +61 -62
  432. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  433. data/spec/unit/provider/nameservice_spec.rb +38 -40
  434. data/spec/unit/provider/package/aix_spec.rb +15 -15
  435. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  436. data/spec/unit/provider/package/apt_spec.rb +44 -27
  437. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  438. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  439. data/spec/unit/provider/package/base_spec.rb +4 -4
  440. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  441. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  442. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  443. data/spec/unit/provider/package/gem_spec.rb +51 -43
  444. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  445. data/spec/unit/provider/package/macports_spec.rb +46 -42
  446. data/spec/unit/provider/package/nim_spec.rb +30 -39
  447. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  448. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  449. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  450. data/spec/unit/provider/package/pip_spec.rb +71 -72
  451. data/spec/unit/provider/package/pkg_spec.rb +113 -114
  452. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  453. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  454. data/spec/unit/provider/package/pkgng_spec.rb +21 -22
  455. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  456. data/spec/unit/provider/package/portage_spec.rb +71 -75
  457. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  458. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  459. data/spec/unit/provider/package/sun_spec.rb +16 -18
  460. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  461. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  462. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  463. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  464. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  465. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  466. data/spec/unit/provider/package/windows_spec.rb +36 -32
  467. data/spec/unit/provider/package/yum_spec.rb +7 -7
  468. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  469. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  470. data/spec/unit/provider/service/base_spec.rb +4 -5
  471. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  472. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  473. data/spec/unit/provider/service/debian_spec.rb +38 -38
  474. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  475. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  476. data/spec/unit/provider/service/init_spec.rb +53 -52
  477. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  478. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  479. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  480. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  481. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  482. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  483. data/spec/unit/provider/service/runit_spec.rb +29 -27
  484. data/spec/unit/provider/service/smf_spec.rb +74 -66
  485. data/spec/unit/provider/service/src_spec.rb +46 -47
  486. data/spec/unit/provider/service/systemd_spec.rb +113 -122
  487. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  488. data/spec/unit/provider/service/windows_spec.rb +33 -41
  489. data/spec/unit/provider/user/aix_spec.rb +31 -31
  490. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  491. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  492. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  493. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  494. data/spec/unit/provider/user/pw_spec.rb +37 -35
  495. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  496. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  497. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  498. data/spec/unit/provider_spec.rb +35 -35
  499. data/spec/unit/puppet_pal_2pec.rb +4 -5
  500. data/spec/unit/puppet_pal_spec.rb +0 -1
  501. data/spec/unit/puppet_spec.rb +6 -7
  502. data/spec/unit/relationship_spec.rb +0 -1
  503. data/spec/unit/reports/http_spec.rb +22 -24
  504. data/spec/unit/reports/store_spec.rb +3 -4
  505. data/spec/unit/reports_spec.rb +12 -14
  506. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  507. data/spec/unit/resource/catalog_spec.rb +72 -68
  508. data/spec/unit/resource/status_spec.rb +6 -8
  509. data/spec/unit/resource/type_collection_spec.rb +17 -18
  510. data/spec/unit/resource/type_spec.rb +34 -35
  511. data/spec/unit/resource_spec.rb +36 -32
  512. data/spec/unit/rest/client_spec.rb +56 -25
  513. data/spec/unit/rest/route_spec.rb +5 -5
  514. data/spec/unit/scheduler/job_spec.rb +0 -1
  515. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  516. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  517. data/spec/unit/settings/array_setting_spec.rb +1 -1
  518. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  519. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  520. data/spec/unit/settings/config_file_spec.rb +0 -1
  521. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  522. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  523. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  524. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  525. data/spec/unit/settings/file_setting_spec.rb +44 -46
  526. data/spec/unit/settings/path_setting_spec.rb +1 -2
  527. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  528. data/spec/unit/settings/string_setting_spec.rb +14 -15
  529. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  530. data/spec/unit/settings/value_translator_spec.rb +0 -1
  531. data/spec/unit/settings_spec.rb +228 -235
  532. data/spec/unit/ssl/base_spec.rb +14 -15
  533. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  534. data/spec/unit/ssl/certificate_spec.rb +23 -25
  535. data/spec/unit/ssl/digest_spec.rb +0 -1
  536. data/spec/unit/ssl/host_spec.rb +147 -130
  537. data/spec/unit/ssl/key_spec.rb +30 -31
  538. data/spec/unit/ssl/ssl_provider_spec.rb +24 -24
  539. data/spec/unit/ssl/state_machine_spec.rb +50 -58
  540. data/spec/unit/ssl/validator_spec.rb +43 -54
  541. data/spec/unit/ssl/verifier_spec.rb +10 -10
  542. data/spec/unit/task_spec.rb +44 -45
  543. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  544. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  545. data/spec/unit/transaction/event_spec.rb +16 -15
  546. data/spec/unit/transaction/persistence_spec.rb +16 -17
  547. data/spec/unit/transaction/report_spec.rb +11 -12
  548. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  549. data/spec/unit/transaction_spec.rb +100 -101
  550. data/spec/unit/type/component_spec.rb +0 -1
  551. data/spec/unit/type/exec_spec.rb +60 -56
  552. data/spec/unit/type/file/checksum_spec.rb +9 -10
  553. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  554. data/spec/unit/type/file/content_spec.rb +58 -61
  555. data/spec/unit/type/file/ctime_spec.rb +0 -1
  556. data/spec/unit/type/file/ensure_spec.rb +12 -13
  557. data/spec/unit/type/file/group_spec.rb +5 -7
  558. data/spec/unit/type/file/mode_spec.rb +4 -6
  559. data/spec/unit/type/file/mtime_spec.rb +0 -1
  560. data/spec/unit/type/file/owner_spec.rb +6 -8
  561. data/spec/unit/type/file/selinux_spec.rb +17 -19
  562. data/spec/unit/type/file/source_spec.rb +104 -101
  563. data/spec/unit/type/file/type_spec.rb +0 -1
  564. data/spec/unit/type/file_spec.rb +195 -185
  565. data/spec/unit/type/filebucket_spec.rb +4 -5
  566. data/spec/unit/type/group_spec.rb +6 -8
  567. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  568. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  569. data/spec/unit/type/package_spec.rb +56 -57
  570. data/spec/unit/type/resources_spec.rb +72 -74
  571. data/spec/unit/type/schedule_spec.rb +24 -26
  572. data/spec/unit/type/service_spec.rb +49 -49
  573. data/spec/unit/type/stage_spec.rb +0 -1
  574. data/spec/unit/type/tidy_spec.rb +61 -62
  575. data/spec/unit/type/user_spec.rb +24 -25
  576. data/spec/unit/type/whit_spec.rb +0 -1
  577. data/spec/unit/type_spec.rb +55 -54
  578. data/spec/unit/util/at_fork_spec.rb +18 -19
  579. data/spec/unit/util/autoload_spec.rb +55 -56
  580. data/spec/unit/util/backups_spec.rb +34 -35
  581. data/spec/unit/util/character_encoding_spec.rb +5 -5
  582. data/spec/unit/util/checksums_spec.rb +38 -39
  583. data/spec/unit/util/colors_spec.rb +1 -2
  584. data/spec/unit/util/command_line_spec.rb +24 -25
  585. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  586. data/spec/unit/util/diff_spec.rb +7 -8
  587. data/spec/unit/util/errors_spec.rb +0 -1
  588. data/spec/unit/util/execution_spec.rb +185 -161
  589. data/spec/unit/util/execution_stub_spec.rb +0 -1
  590. data/spec/unit/util/feature_spec.rb +23 -14
  591. data/spec/unit/util/filetype_spec.rb +49 -49
  592. data/spec/unit/util/http_proxy_spec.rb +12 -12
  593. data/spec/unit/util/inifile_spec.rb +26 -31
  594. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  595. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  596. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  597. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  598. data/spec/unit/util/lockfile_spec.rb +0 -1
  599. data/spec/unit/util/log/destinations_spec.rb +30 -33
  600. data/spec/unit/util/log_spec.rb +35 -36
  601. data/spec/unit/util/logging_spec.rb +58 -72
  602. data/spec/unit/util/metric_spec.rb +0 -1
  603. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  604. data/spec/unit/util/multi_match_spec.rb +0 -1
  605. data/spec/unit/util/network_device/config_spec.rb +0 -1
  606. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  607. data/spec/unit/util/network_device_spec.rb +7 -9
  608. data/spec/unit/util/package_spec.rb +0 -1
  609. data/spec/unit/util/pidlock_spec.rb +21 -22
  610. data/spec/unit/util/plist_spec.rb +40 -33
  611. data/spec/unit/util/posix_spec.rb +54 -51
  612. data/spec/unit/util/rdoc_spec.rb +9 -10
  613. data/spec/unit/util/reference_spec.rb +0 -1
  614. data/spec/unit/util/resource_template_spec.rb +20 -20
  615. data/spec/unit/util/retry_action_spec.rb +7 -8
  616. data/spec/unit/util/rubygems_spec.rb +7 -8
  617. data/spec/unit/util/run_mode_spec.rb +3 -4
  618. data/spec/unit/util/selinux_spec.rb +79 -72
  619. data/spec/unit/util/splayer_spec.rb +8 -9
  620. data/spec/unit/util/ssl_spec.rb +0 -1
  621. data/spec/unit/util/storage_spec.rb +3 -4
  622. data/spec/unit/util/suidmanager_spec.rb +45 -54
  623. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  624. data/spec/unit/util/tag_set_spec.rb +0 -1
  625. data/spec/unit/util/tagging_spec.rb +0 -1
  626. data/spec/unit/util/terminal_spec.rb +9 -10
  627. data/spec/unit/util/user_attr_spec.rb +1 -2
  628. data/spec/unit/util/warnings_spec.rb +3 -4
  629. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  630. data/spec/unit/util/watcher_spec.rb +51 -21
  631. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  632. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  633. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  634. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  635. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  636. data/spec/unit/util/windows/file_spec.rb +0 -1
  637. data/spec/unit/util/windows/root_certs_spec.rb +1 -2
  638. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  639. data/spec/unit/util/windows/service_spec.rb +66 -68
  640. data/spec/unit/util/windows/sid_spec.rb +11 -13
  641. data/spec/unit/util/windows/string_spec.rb +0 -1
  642. data/spec/unit/util_spec.rb +55 -57
  643. data/spec/unit/version_spec.rb +6 -6
  644. data/spec/unit/x509/cert_provider_spec.rb +14 -14
  645. data/spec/unit/x509/pem_store_spec.rb +5 -5
  646. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/metric'
@@ -1,9 +1,7 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/monkey_patches'
5
4
 
6
-
7
5
  describe Symbol do
8
6
  after :all do
9
7
  $unique_warnings.delete('symbol_comparison') if $unique_warnings
@@ -54,7 +52,7 @@ describe OpenSSL::SSL::SSLContext do
54
52
  end
55
53
 
56
54
  it 'sets parameters on initialization' do
57
- described_class.any_instance.expects(:set_params)
55
+ expect_any_instance_of(described_class).to receive(:set_params)
58
56
  subject
59
57
  end
60
58
 
@@ -73,7 +71,7 @@ describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
73
71
  let(:samecert) { cert.dup() }
74
72
 
75
73
  def with_root_certs(certs)
76
- Puppet::Util::Windows::RootCerts.expects(:instance).returns(certs)
74
+ expect(Puppet::Util::Windows::RootCerts).to receive(:instance).and_return(certs)
77
75
  end
78
76
 
79
77
  it "adds a root cert to the store" do
@@ -84,7 +82,7 @@ describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
84
82
 
85
83
  it "doesn't warn when calling set_default_paths multiple times" do
86
84
  with_root_certs([cert])
87
- store.expects(:warn).never
85
+ expect(store).not_to receive(:warn)
88
86
 
89
87
  store.set_default_paths
90
88
  store.set_default_paths
@@ -95,8 +93,8 @@ describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
95
93
  expect(cert.hash).to_not eq(samecert.hash)
96
94
  with_root_certs([cert, samecert])
97
95
 
98
- store.expects(:add_cert).with(cert).once
99
- store.expects(:add_cert).with(samecert).never
96
+ expect(store).to receive(:add_cert).with(cert).once
97
+ expect(store).not_to receive(:add_cert).with(samecert)
100
98
 
101
99
  store.set_default_paths
102
100
  end
@@ -108,7 +106,7 @@ describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
108
106
  with_root_certs([cert])
109
107
  store.add_cert(cert)
110
108
 
111
- store.expects(:warn).with('Failed to add /DC=com/DC=microsoft/CN=Microsoft Root Certificate Authority')
109
+ expect(store).to receive(:warn).with('Failed to add CN=Microsoft Root Certificate Authority,DC=microsoft,DC=com')
112
110
 
113
111
  store.set_default_paths
114
112
  end
@@ -117,7 +115,7 @@ describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
117
115
  with_root_certs([cert])
118
116
  store.add_cert(cert)
119
117
 
120
- store.expects(:warn).never
118
+ expect(store).not_to receive(:warn)
121
119
 
122
120
  store.set_default_paths
123
121
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/util/multi_match'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/network_device/config'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/network_device/transport/base'
@@ -13,28 +12,28 @@ describe Puppet::Util::NetworkDevice::Transport::Base do
13
12
 
14
13
  describe "when sending commands" do
15
14
  it "should send the command to the telnet session" do
16
- @transport.expects(:send).with("line")
15
+ expect(@transport).to receive(:send).with("line")
17
16
  @transport.command("line")
18
17
  end
19
18
 
20
19
  it "should expect an output matching the given prompt" do
21
- @transport.expects(:expect).with(/prompt/)
20
+ expect(@transport).to receive(:expect).with(/prompt/)
22
21
  @transport.command("line", :prompt => /prompt/)
23
22
  end
24
23
 
25
24
  it "should expect an output matching the default prompt" do
26
25
  @transport.default_prompt = /defprompt/
27
- @transport.expects(:expect).with(/defprompt/)
26
+ expect(@transport).to receive(:expect).with(/defprompt/)
28
27
  @transport.command("line")
29
28
  end
30
29
 
31
30
  it "should yield telnet output to the given block" do
32
- @transport.expects(:expect).yields("output")
31
+ expect(@transport).to receive(:expect).and_yield("output")
33
32
  @transport.command("line") { |out| expect(out).to eq("output") }
34
33
  end
35
34
 
36
35
  it "should return telnet output to the caller" do
37
- @transport.expects(:expect).returns("output")
36
+ expect(@transport).to receive(:expect).and_return("output")
38
37
  expect(@transport.command("line")).to eq("output")
39
38
  end
40
39
  end
@@ -1,11 +1,9 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'ostruct'
5
4
  require 'puppet/util/network_device'
6
5
 
7
6
  describe Puppet::Util::NetworkDevice do
8
-
9
7
  before(:each) do
10
8
  @device = OpenStruct.new(:name => "name", :provider => "test", :url => "telnet://admin:password@127.0.0.1", :options => { :debug => false })
11
9
  end
@@ -23,25 +21,25 @@ describe Puppet::Util::NetworkDevice do
23
21
 
24
22
  describe "when initializing the remote network device singleton" do
25
23
  it "should load the network device code" do
26
- Puppet::Util::NetworkDevice.expects(:require)
24
+ expect(Puppet::Util::NetworkDevice).to receive(:require)
27
25
  Puppet::Util::NetworkDevice.init(@device)
28
26
  end
29
27
 
30
28
  it "should create a network device instance" do
31
- Puppet::Util::NetworkDevice.stubs(:require)
32
- Puppet::Util::NetworkDevice::Test::Device.expects(:new).with("telnet://admin:password@127.0.0.1", :debug => false)
29
+ allow(Puppet::Util::NetworkDevice).to receive(:require)
30
+ expect(Puppet::Util::NetworkDevice::Test::Device).to receive(:new).with("telnet://admin:password@127.0.0.1", :debug => false)
33
31
  Puppet::Util::NetworkDevice.init(@device)
34
32
  end
35
33
 
36
34
  it "should raise an error if the remote device instance can't be created" do
37
- Puppet::Util::NetworkDevice.stubs(:require).raises("error")
35
+ allow(Puppet::Util::NetworkDevice).to receive(:require).and_raise("error")
38
36
  expect { Puppet::Util::NetworkDevice.init(@device) }.to raise_error(RuntimeError, /Can't load test for name/)
39
37
  end
40
38
 
41
39
  it "should let caller to access the singleton device" do
42
- device = stub 'device'
43
- Puppet::Util::NetworkDevice.stubs(:require)
44
- Puppet::Util::NetworkDevice::Test::Device.expects(:new).returns(device)
40
+ device = double('device')
41
+ allow(Puppet::Util::NetworkDevice).to receive(:require)
42
+ expect(Puppet::Util::NetworkDevice::Test::Device).to receive(:new).and_return(device)
45
43
  Puppet::Util::NetworkDevice.init(@device)
46
44
 
47
45
  expect(Puppet::Util::NetworkDevice.current).to eq(device)
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/package'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/pidlock'
@@ -24,9 +23,9 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
24
23
  it "should become locked" do
25
24
  @lock.lock
26
25
  if Puppet::Util::Platform.windows?
27
- Puppet::Util::Windows::Process.stubs(:get_process_image_name_by_pid).with(@lock.lock_pid).returns('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
26
+ allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(@lock.lock_pid).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
28
27
  else
29
- Puppet::Util::Execution.stubs(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).returns('puppet')
28
+ allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).and_return('puppet')
30
29
  end
31
30
  expect(@lock).to be_locked
32
31
  end
@@ -56,7 +55,7 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
56
55
  end
57
56
 
58
57
  it 'should create an empty lock file even when pid is missing' do
59
- Process.stubs(:pid).returns('')
58
+ allow(Process).to receive(:pid).and_return('')
60
59
  @lock.lock
61
60
  expect(Puppet::FileSystem.exist?(@lock.file_path)).to be_truthy
62
61
  expect(Puppet::FileSystem.read(@lock.file_path)).to be_empty
@@ -64,12 +63,12 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
64
63
 
65
64
  it 'should replace an existing empty lockfile with a pid, given a subsequent lock call made against a valid pid' do
66
65
  # empty pid results in empty lockfile
67
- Process.stubs(:pid).returns('')
66
+ allow(Process).to receive(:pid).and_return('')
68
67
  @lock.lock
69
68
  expect(Puppet::FileSystem.exist?(@lock.file_path)).to be_truthy
70
69
 
71
70
  # next lock call with valid pid kills existing empty lockfile
72
- Process.stubs(:pid).returns(1234)
71
+ allow(Process).to receive(:pid).and_return(1234)
73
72
  @lock.lock
74
73
  expect(Puppet::FileSystem.exist?(@lock.file_path)).to be_truthy
75
74
  expect(Puppet::FileSystem.read(@lock.file_path)).to eq('1234')
@@ -107,15 +106,15 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
107
106
  it "should return true if locked" do
108
107
  @lock.lock
109
108
  if Puppet::Util::Platform.windows?
110
- Puppet::Util::Windows::Process.stubs(:get_process_image_name_by_pid).with(@lock.lock_pid).returns('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
109
+ allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(@lock.lock_pid).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
111
110
  else
112
- Puppet::Util::Execution.stubs(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).returns('puppet')
111
+ allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).and_return('puppet')
113
112
  end
114
113
  expect(@lock).to be_locked
115
114
  end
116
115
 
117
116
  it "should remove the lockfile when pid is missing" do
118
- Process.stubs(:pid).returns('')
117
+ allow(Process).to receive(:pid).and_return('')
119
118
  @lock.lock
120
119
  expect(@lock.locked?).to be_falsey
121
120
  expect(Puppet::FileSystem.exist?(@lock.file_path)).to be_falsey
@@ -125,7 +124,7 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
125
124
  describe '#lock_pid' do
126
125
  it 'should return nil if the pid is empty' do
127
126
  # fake pid to get empty lockfile
128
- Process.stubs(:pid).returns('')
127
+ allow(Process).to receive(:pid).and_return('')
129
128
  @lock.lock
130
129
  expect(@lock.lock_pid).to eq(nil)
131
130
  end
@@ -134,15 +133,15 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
134
133
  describe "with a stale lock" do
135
134
  before(:each) do
136
135
  # fake our pid to be 1234
137
- Process.stubs(:pid).returns(1234)
136
+ allow(Process).to receive(:pid).and_return(1234)
138
137
  # lock the file
139
138
  @lock.lock
140
139
  # fake our pid to be a different pid, to simulate someone else
141
140
  # holding the lock
142
- Process.stubs(:pid).returns(6789)
141
+ allow(Process).to receive(:pid).and_return(6789)
143
142
 
144
- Process.stubs(:kill).with(0, 6789)
145
- Process.stubs(:kill).with(0, 1234).raises(Errno::ESRCH)
143
+ allow(Process).to receive(:kill).with(0, 6789)
144
+ allow(Process).to receive(:kill).with(0, 1234).and_raise(Errno::ESRCH)
146
145
  end
147
146
 
148
147
  it "should not be locked" do
@@ -157,9 +156,9 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
157
156
 
158
157
  it "should replace with new locks" do
159
158
  if Puppet::Util::Platform.windows?
160
- Puppet::Util::Windows::Process.stubs(:get_process_image_name_by_pid).with(6789).returns('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
159
+ allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(6789).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
161
160
  else
162
- Puppet::Util::Execution.stubs(:execute).with(['ps', '-p', 6789, '-o', 'comm=']).returns('puppet')
161
+ allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 6789, '-o', 'comm=']).and_return('puppet')
163
162
  end
164
163
  @lock.lock
165
164
  expect(Puppet::FileSystem.exist?(@lockfile)).to be_truthy
@@ -184,20 +183,20 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
184
183
  describe "with another process lock" do
185
184
  before(:each) do
186
185
  # fake our pid to be 1234
187
- Process.stubs(:pid).returns(1234)
186
+ allow(Process).to receive(:pid).and_return(1234)
188
187
  if Puppet::Util::Platform.windows?
189
- Puppet::Util::Windows::Process.stubs(:get_process_image_name_by_pid).with(1234).returns('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
188
+ allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(1234).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
190
189
  else
191
- Puppet::Util::Execution.stubs(:execute).with(['ps', '-p', 1234, '-o', 'comm=']).returns('puppet')
190
+ allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'comm=']).and_return('puppet')
192
191
  end
193
192
  # lock the file
194
193
  @lock.lock
195
194
  # fake our pid to be a different pid, to simulate someone else
196
195
  # holding the lock
197
- Process.stubs(:pid).returns(6789)
196
+ allow(Process).to receive(:pid).and_return(6789)
198
197
 
199
- Process.stubs(:kill).with(0, 6789)
200
- Process.stubs(:kill).with(0, 1234)
198
+ allow(Process).to receive(:kill).with(0, 6789)
199
+ allow(Process).to receive(:kill).with(0, 1234)
201
200
  end
202
201
 
203
202
  it "should be locked" do
@@ -69,55 +69,60 @@ describe Puppet::Util::Plist, :if => Puppet.features.cfpropertylist? do
69
69
 
70
70
  describe "#read_plist_file" do
71
71
  it "calls #convert_cfpropertylist_to_native_types on a plist object when a valid binary plist is read" do
72
- subject.stubs(:read_file_with_offset).with(plist_path, 8).returns(binary_plist_magic_number)
73
- subject.stubs(:new_cfpropertylist).with({:file => plist_path}).returns('plist_object')
74
- subject.expects(:convert_cfpropertylist_to_native_types).with('plist_object').returns('plist_hash')
72
+ allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return(binary_plist_magic_number)
73
+ allow(subject).to receive(:new_cfpropertylist).with({:file => plist_path}).and_return('plist_object')
74
+ expect(subject).to receive(:convert_cfpropertylist_to_native_types).with('plist_object').and_return('plist_hash')
75
75
  expect(subject.read_plist_file(plist_path)).to eq('plist_hash')
76
76
  end
77
+
77
78
  it "returns a valid hash when a valid XML plist is read" do
78
- subject.stubs(:read_file_with_offset).with(plist_path, 8).returns('notbinary')
79
- subject.stubs(:open_file_with_args).with(plist_path, 'r:UTF-8').returns(valid_xml_plist)
79
+ allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return('notbinary')
80
+ allow(subject).to receive(:open_file_with_args).with(plist_path, 'r:UTF-8').and_return(valid_xml_plist)
80
81
  expect(subject.read_plist_file(plist_path)).to eq(valid_xml_plist_hash)
81
82
  end
83
+
82
84
  it "raises a debug message and replaces a bad XML plist doctype should one be encountered" do
83
- subject.stubs(:read_file_with_offset).with(plist_path, 8).returns('notbinary')
84
- subject.stubs(:open_file_with_args).with(plist_path, 'r:UTF-8').returns(bad_xml_doctype)
85
- subject.expects(:new_cfpropertylist).with({:data => good_xml_doctype}).returns('plist_object')
86
- subject.stubs(:convert_cfpropertylist_to_native_types).with('plist_object').returns('plist_hash')
87
- Puppet.expects(:debug).with("Had to fix plist with incorrect DOCTYPE declaration: #{plist_path}")
85
+ allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return('notbinary')
86
+ allow(subject).to receive(:open_file_with_args).with(plist_path, 'r:UTF-8').and_return(bad_xml_doctype)
87
+ expect(subject).to receive(:new_cfpropertylist).with({:data => good_xml_doctype}).and_return('plist_object')
88
+ allow(subject).to receive(:convert_cfpropertylist_to_native_types).with('plist_object').and_return('plist_hash')
89
+ expect(Puppet).to receive(:debug).with("Had to fix plist with incorrect DOCTYPE declaration: #{plist_path}")
88
90
  expect(subject.read_plist_file(plist_path)).to eq('plist_hash')
89
91
  end
92
+
90
93
  it "attempts to read pure xml using plutil when reading an improperly formatted service plist" do
91
- subject.stubs(:read_file_with_offset).with(plist_path, 8).returns('notbinary')
92
- subject.stubs(:open_file_with_args).with(plist_path, 'r:UTF-8').returns(invalid_xml_plist)
93
- Puppet.expects(:debug).with(regexp_matches(/^Failed with CFFormatError/))
94
- Puppet.expects(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
95
- Puppet::Util::Execution.expects(:execute)
94
+ allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return('notbinary')
95
+ allow(subject).to receive(:open_file_with_args).with(plist_path, 'r:UTF-8').and_return(invalid_xml_plist)
96
+ expect(Puppet).to receive(:debug).with(/^Failed with CFFormatError/)
97
+ expect(Puppet).to receive(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
98
+ expect(Puppet::Util::Execution).to receive(:execute)
96
99
  .with(['/usr/bin/plutil', '-convert', 'xml1', '-o', '-', plist_path],
97
100
  {:failonfail => true, :combine => true})
98
- .returns(Puppet::Util::Execution::ProcessOutput.new(valid_xml_plist, 0))
101
+ .and_return(Puppet::Util::Execution::ProcessOutput.new(valid_xml_plist, 0))
99
102
  expect(subject.read_plist_file(plist_path)).to eq(valid_xml_plist_hash)
100
103
  end
104
+
101
105
  it "returns nil when direct parsing and plutil conversion both fail" do
102
- subject.stubs(:read_file_with_offset).with(plist_path, 8).returns('notbinary')
103
- subject.stubs(:open_file_with_args).with(plist_path, 'r:UTF-8').returns(non_plist_data)
104
- Puppet.expects(:debug).with(regexp_matches(/^Failed with (CFFormatError|NoMethodError)/))
105
- Puppet.expects(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
106
- Puppet::Util::Execution.expects(:execute)
106
+ allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return('notbinary')
107
+ allow(subject).to receive(:open_file_with_args).with(plist_path, 'r:UTF-8').and_return(non_plist_data)
108
+ expect(Puppet).to receive(:debug).with(/^Failed with (CFFormatError|NoMethodError)/)
109
+ expect(Puppet).to receive(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
110
+ expect(Puppet::Util::Execution).to receive(:execute)
107
111
  .with(['/usr/bin/plutil', '-convert', 'xml1', '-o', '-', plist_path],
108
112
  {:failonfail => true, :combine => true})
109
- .raises(Puppet::ExecutionFailure, 'boom')
113
+ .and_raise(Puppet::ExecutionFailure, 'boom')
110
114
  expect(subject.read_plist_file(plist_path)).to eq(nil)
111
115
  end
116
+
112
117
  it "returns nil when file is a non-plist binary blob" do
113
- subject.stubs(:read_file_with_offset).with(plist_path, 8).returns('notbinary')
114
- subject.stubs(:open_file_with_args).with(plist_path, 'r:UTF-8').returns(binary_data)
115
- Puppet.expects(:debug).with(regexp_matches(/^Failed with (CFFormatError|ArgumentError)/))
116
- Puppet.expects(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
117
- Puppet::Util::Execution.expects(:execute)
118
+ allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return('notbinary')
119
+ allow(subject).to receive(:open_file_with_args).with(plist_path, 'r:UTF-8').and_return(binary_data)
120
+ expect(Puppet).to receive(:debug).with(/^Failed with (CFFormatError|ArgumentError)/)
121
+ expect(Puppet).to receive(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
122
+ expect(Puppet::Util::Execution).to receive(:execute)
118
123
  .with(['/usr/bin/plutil', '-convert', 'xml1', '-o', '-', plist_path],
119
124
  {:failonfail => true, :combine => true})
120
- .raises(Puppet::ExecutionFailure, 'boom')
125
+ .and_raise(Puppet::ExecutionFailure, 'boom')
121
126
  expect(subject.read_plist_file(plist_path)).to eq(nil)
122
127
  end
123
128
  end
@@ -126,15 +131,17 @@ describe Puppet::Util::Plist, :if => Puppet.features.cfpropertylist? do
126
131
  it "returns a valid hash when a valid XML plist is provided" do
127
132
  expect(subject.parse_plist(valid_xml_plist)).to eq(valid_xml_plist_hash)
128
133
  end
134
+
129
135
  it "raises a debug message and replaces a bad XML plist doctype should one be encountered" do
130
- subject.expects(:new_cfpropertylist).with({:data => good_xml_doctype}).returns('plist_object')
131
- subject.stubs(:convert_cfpropertylist_to_native_types).with('plist_object')
132
- Puppet.expects(:debug).with("Had to fix plist with incorrect DOCTYPE declaration: #{plist_path}")
136
+ expect(subject).to receive(:new_cfpropertylist).with({:data => good_xml_doctype}).and_return('plist_object')
137
+ allow(subject).to receive(:convert_cfpropertylist_to_native_types).with('plist_object')
138
+ expect(Puppet).to receive(:debug).with("Had to fix plist with incorrect DOCTYPE declaration: #{plist_path}")
133
139
  subject.parse_plist(bad_xml_doctype, plist_path)
134
140
  end
141
+
135
142
  it "raises a debug message with malformed plist" do
136
- subject.stubs(:convert_cfpropertylist_to_native_types).with('plist_object')
137
- Puppet.expects(:debug).with(regexp_matches(/^Failed with CFFormatError/))
143
+ allow(subject).to receive(:convert_cfpropertylist_to_native_types).with('plist_object')
144
+ expect(Puppet).to receive(:debug).with(/^Failed with CFFormatError/)
138
145
  subject.parse_plist("<plist><dict><key>Foo</key>")
139
146
  end
140
147
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/posix'
@@ -21,16 +20,20 @@ describe Puppet::Util::POSIX do
21
20
  ['group3', ['user1']],
22
21
  ['group4', ['user2']]
23
22
  ].map do |(name, members)|
24
- group_struct = stub("Group #{name}")
25
- group_struct.stubs(:name).returns(name)
26
- group_struct.stubs(:mem).returns(members)
23
+ group_struct = double("Group #{name}")
24
+ allow(group_struct).to receive(:name).and_return(name)
25
+ allow(group_struct).to receive(:mem).and_return(members)
27
26
 
28
27
  group_struct
29
28
  end
30
29
  end
31
30
 
32
31
  before(:each) do
33
- Puppet::Etc.stubs(:group).multiple_yields(*mock_groups)
32
+ etc_stub = receive(:group)
33
+ mock_groups.each do |mock_group|
34
+ etc_stub = etc_stub.and_yield(mock_group)
35
+ end
36
+ allow(Puppet::Etc).to etc_stub
34
37
  end
35
38
 
36
39
  it 'returns the groups of the given user' do
@@ -70,7 +73,7 @@ describe Puppet::Util::POSIX do
70
73
 
71
74
  describe "when retrieving a posix field" do
72
75
  before do
73
- @thing = stub 'thing', :field => "asdf"
76
+ @thing = double('thing', :field => "asdf")
74
77
  end
75
78
 
76
79
  it "should fail if no id was passed" do
@@ -80,23 +83,23 @@ describe Puppet::Util::POSIX do
80
83
  describe "and the id is an integer" do
81
84
  it "should log an error and return nil if the specified id is greater than the maximum allowed ID" do
82
85
  Puppet[:maximum_uid] = 100
83
- Puppet.expects(:err)
86
+ expect(Puppet).to receive(:err)
84
87
 
85
88
  expect(@posix.get_posix_field("asdf", "bar", 200)).to be_nil
86
89
  end
87
90
 
88
91
  it "should use the method return by :methodbyid and return the specified field" do
89
- Etc.expects(:getgrgid).returns @thing
92
+ expect(Etc).to receive(:getgrgid).and_return(@thing)
90
93
 
91
- @thing.expects(:field).returns "myval"
94
+ expect(@thing).to receive(:field).and_return("myval")
92
95
 
93
96
  expect(@posix.get_posix_field(:gr, :field, 200)).to eq("myval")
94
97
  end
95
98
 
96
99
  it "should return nil if the method throws an exception" do
97
- Etc.expects(:getgrgid).raises ArgumentError
100
+ expect(Etc).to receive(:getgrgid).and_raise(ArgumentError)
98
101
 
99
- @thing.expects(:field).never
102
+ expect(@thing).not_to receive(:field)
100
103
 
101
104
  expect(@posix.get_posix_field(:gr, :field, 200)).to be_nil
102
105
  end
@@ -104,17 +107,17 @@ describe Puppet::Util::POSIX do
104
107
 
105
108
  describe "and the id is not an integer" do
106
109
  it "should use the method return by :methodbyid and return the specified field" do
107
- Etc.expects(:getgrnam).returns @thing
110
+ expect(Etc).to receive(:getgrnam).and_return(@thing)
108
111
 
109
- @thing.expects(:field).returns "myval"
112
+ expect(@thing).to receive(:field).and_return("myval")
110
113
 
111
114
  expect(@posix.get_posix_field(:gr, :field, "asdf")).to eq("myval")
112
115
  end
113
116
 
114
117
  it "should return nil if the method throws an exception" do
115
- Etc.expects(:getgrnam).raises ArgumentError
118
+ expect(Etc).to receive(:getgrnam).and_raise(ArgumentError)
116
119
 
117
- @thing.expects(:field).never
120
+ expect(@thing).not_to receive(:field)
118
121
 
119
122
  expect(@posix.get_posix_field(:gr, :field, "asdf")).to be_nil
120
123
  end
@@ -123,32 +126,32 @@ describe Puppet::Util::POSIX do
123
126
 
124
127
  describe "when returning the gid" do
125
128
  before do
126
- @posix.stubs(:get_posix_field)
129
+ allow(@posix).to receive(:get_posix_field)
127
130
  end
128
131
 
129
132
  describe "and the group is an integer" do
130
133
  it "should convert integers specified as a string into an integer" do
131
- @posix.expects(:get_posix_field).with(:group, :name, 100)
134
+ expect(@posix).to receive(:get_posix_field).with(:group, :name, 100)
132
135
 
133
136
  @posix.gid("100")
134
137
  end
135
138
 
136
139
  it "should look up the name for the group" do
137
- @posix.expects(:get_posix_field).with(:group, :name, 100)
140
+ expect(@posix).to receive(:get_posix_field).with(:group, :name, 100)
138
141
 
139
142
  @posix.gid(100)
140
143
  end
141
144
 
142
145
  it "should return nil if the group cannot be found" do
143
- @posix.expects(:get_posix_field).once.returns nil
144
- @posix.expects(:search_posix_field).never
146
+ expect(@posix).to receive(:get_posix_field).once.and_return(nil)
147
+ expect(@posix).not_to receive(:search_posix_field)
145
148
 
146
149
  expect(@posix.gid(100)).to be_nil
147
150
  end
148
151
 
149
152
  it "should use the found name to look up the id" do
150
- @posix.expects(:get_posix_field).with(:group, :name, 100).returns "asdf"
151
- @posix.expects(:get_posix_field).with(:group, :gid, "asdf").returns 100
153
+ expect(@posix).to receive(:get_posix_field).with(:group, :name, 100).and_return("asdf")
154
+ expect(@posix).to receive(:get_posix_field).with(:group, :gid, "asdf").and_return(100)
152
155
 
153
156
  expect(@posix.gid(100)).to eq(100)
154
157
  end
@@ -156,10 +159,10 @@ describe Puppet::Util::POSIX do
156
159
  # LAK: This is because some platforms have a broken Etc module that always return
157
160
  # the same group.
158
161
  it "should use :search_posix_field if the discovered id does not match the passed-in id" do
159
- @posix.expects(:get_posix_field).with(:group, :name, 100).returns "asdf"
160
- @posix.expects(:get_posix_field).with(:group, :gid, "asdf").returns 50
162
+ expect(@posix).to receive(:get_posix_field).with(:group, :name, 100).and_return("asdf")
163
+ expect(@posix).to receive(:get_posix_field).with(:group, :gid, "asdf").and_return(50)
161
164
 
162
- @posix.expects(:search_posix_field).with(:group, :gid, 100).returns "asdf"
165
+ expect(@posix).to receive(:search_posix_field).with(:group, :gid, 100).and_return("asdf")
163
166
 
164
167
  expect(@posix.gid(100)).to eq("asdf")
165
168
  end
@@ -167,30 +170,30 @@ describe Puppet::Util::POSIX do
167
170
 
168
171
  describe "and the group is a string" do
169
172
  it "should look up the gid for the group" do
170
- @posix.expects(:get_posix_field).with(:group, :gid, "asdf")
173
+ expect(@posix).to receive(:get_posix_field).with(:group, :gid, "asdf")
171
174
 
172
175
  @posix.gid("asdf")
173
176
  end
174
177
 
175
178
  it "should return nil if the group cannot be found" do
176
- @posix.expects(:get_posix_field).once.returns nil
177
- @posix.expects(:search_posix_field).never
179
+ expect(@posix).to receive(:get_posix_field).once.and_return(nil)
180
+ expect(@posix).not_to receive(:search_posix_field)
178
181
 
179
182
  expect(@posix.gid("asdf")).to be_nil
180
183
  end
181
184
 
182
185
  it "should use the found gid to look up the nam" do
183
- @posix.expects(:get_posix_field).with(:group, :gid, "asdf").returns 100
184
- @posix.expects(:get_posix_field).with(:group, :name, 100).returns "asdf"
186
+ expect(@posix).to receive(:get_posix_field).with(:group, :gid, "asdf").and_return(100)
187
+ expect(@posix).to receive(:get_posix_field).with(:group, :name, 100).and_return("asdf")
185
188
 
186
189
  expect(@posix.gid("asdf")).to eq(100)
187
190
  end
188
191
 
189
192
  it "should use :search_posix_field if the discovered name does not match the passed-in name" do
190
- @posix.expects(:get_posix_field).with(:group, :gid, "asdf").returns 100
191
- @posix.expects(:get_posix_field).with(:group, :name, 100).returns "boo"
193
+ expect(@posix).to receive(:get_posix_field).with(:group, :gid, "asdf").and_return(100)
194
+ expect(@posix).to receive(:get_posix_field).with(:group, :name, 100).and_return("boo")
192
195
 
193
- @posix.expects(:search_posix_field).with(:group, :gid, "asdf").returns "asdf"
196
+ expect(@posix).to receive(:search_posix_field).with(:group, :gid, "asdf").and_return("asdf")
194
197
 
195
198
  expect(@posix.gid("asdf")).to eq("asdf")
196
199
  end
@@ -199,32 +202,32 @@ describe Puppet::Util::POSIX do
199
202
 
200
203
  describe "when returning the uid" do
201
204
  before do
202
- @posix.stubs(:get_posix_field)
205
+ allow(@posix).to receive(:get_posix_field)
203
206
  end
204
207
 
205
208
  describe "and the group is an integer" do
206
209
  it "should convert integers specified as a string into an integer" do
207
- @posix.expects(:get_posix_field).with(:passwd, :name, 100)
210
+ expect(@posix).to receive(:get_posix_field).with(:passwd, :name, 100)
208
211
 
209
212
  @posix.uid("100")
210
213
  end
211
214
 
212
215
  it "should look up the name for the group" do
213
- @posix.expects(:get_posix_field).with(:passwd, :name, 100)
216
+ expect(@posix).to receive(:get_posix_field).with(:passwd, :name, 100)
214
217
 
215
218
  @posix.uid(100)
216
219
  end
217
220
 
218
221
  it "should return nil if the group cannot be found" do
219
- @posix.expects(:get_posix_field).once.returns nil
220
- @posix.expects(:search_posix_field).never
222
+ expect(@posix).to receive(:get_posix_field).once.and_return(nil)
223
+ expect(@posix).not_to receive(:search_posix_field)
221
224
 
222
225
  expect(@posix.uid(100)).to be_nil
223
226
  end
224
227
 
225
228
  it "should use the found name to look up the id" do
226
- @posix.expects(:get_posix_field).with(:passwd, :name, 100).returns "asdf"
227
- @posix.expects(:get_posix_field).with(:passwd, :uid, "asdf").returns 100
229
+ expect(@posix).to receive(:get_posix_field).with(:passwd, :name, 100).and_return("asdf")
230
+ expect(@posix).to receive(:get_posix_field).with(:passwd, :uid, "asdf").and_return(100)
228
231
 
229
232
  expect(@posix.uid(100)).to eq(100)
230
233
  end
@@ -232,10 +235,10 @@ describe Puppet::Util::POSIX do
232
235
  # LAK: This is because some platforms have a broken Etc module that always return
233
236
  # the same group.
234
237
  it "should use :search_posix_field if the discovered id does not match the passed-in id" do
235
- @posix.expects(:get_posix_field).with(:passwd, :name, 100).returns "asdf"
236
- @posix.expects(:get_posix_field).with(:passwd, :uid, "asdf").returns 50
238
+ expect(@posix).to receive(:get_posix_field).with(:passwd, :name, 100).and_return("asdf")
239
+ expect(@posix).to receive(:get_posix_field).with(:passwd, :uid, "asdf").and_return(50)
237
240
 
238
- @posix.expects(:search_posix_field).with(:passwd, :uid, 100).returns "asdf"
241
+ expect(@posix).to receive(:search_posix_field).with(:passwd, :uid, 100).and_return("asdf")
239
242
 
240
243
  expect(@posix.uid(100)).to eq("asdf")
241
244
  end
@@ -243,30 +246,30 @@ describe Puppet::Util::POSIX do
243
246
 
244
247
  describe "and the group is a string" do
245
248
  it "should look up the uid for the group" do
246
- @posix.expects(:get_posix_field).with(:passwd, :uid, "asdf")
249
+ expect(@posix).to receive(:get_posix_field).with(:passwd, :uid, "asdf")
247
250
 
248
251
  @posix.uid("asdf")
249
252
  end
250
253
 
251
254
  it "should return nil if the group cannot be found" do
252
- @posix.expects(:get_posix_field).once.returns nil
253
- @posix.expects(:search_posix_field).never
255
+ expect(@posix).to receive(:get_posix_field).once.and_return(nil)
256
+ expect(@posix).not_to receive(:search_posix_field)
254
257
 
255
258
  expect(@posix.uid("asdf")).to be_nil
256
259
  end
257
260
 
258
261
  it "should use the found uid to look up the nam" do
259
- @posix.expects(:get_posix_field).with(:passwd, :uid, "asdf").returns 100
260
- @posix.expects(:get_posix_field).with(:passwd, :name, 100).returns "asdf"
262
+ expect(@posix).to receive(:get_posix_field).with(:passwd, :uid, "asdf").and_return(100)
263
+ expect(@posix).to receive(:get_posix_field).with(:passwd, :name, 100).and_return("asdf")
261
264
 
262
265
  expect(@posix.uid("asdf")).to eq(100)
263
266
  end
264
267
 
265
268
  it "should use :search_posix_field if the discovered name does not match the passed-in name" do
266
- @posix.expects(:get_posix_field).with(:passwd, :uid, "asdf").returns 100
267
- @posix.expects(:get_posix_field).with(:passwd, :name, 100).returns "boo"
269
+ expect(@posix).to receive(:get_posix_field).with(:passwd, :uid, "asdf").and_return(100)
270
+ expect(@posix).to receive(:get_posix_field).with(:passwd, :name, 100).and_return("boo")
268
271
 
269
- @posix.expects(:search_posix_field).with(:passwd, :uid, "asdf").returns "asdf"
272
+ expect(@posix).to receive(:search_posix_field).with(:passwd, :uid, "asdf").and_return("asdf")
270
273
 
271
274
  expect(@posix.uid("asdf")).to eq("asdf")
272
275
  end