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

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

Potentially problematic release.


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

Files changed (632) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +4 -8
  4. data/lib/puppet/application/device.rb +99 -83
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/configurer.rb +5 -4
  7. data/lib/puppet/defaults.rb +31 -11
  8. data/lib/puppet/indirector/request.rb +26 -15
  9. data/lib/puppet/network/http/connection.rb +15 -7
  10. data/lib/puppet/transaction/event_manager.rb +1 -5
  11. data/lib/puppet/type/file/source.rb +0 -1
  12. data/lib/puppet/util/connection.rb +15 -6
  13. data/lib/puppet/util/http_proxy.rb +3 -2
  14. data/lib/puppet/version.rb +1 -1
  15. data/locales/puppet.pot +99 -40
  16. data/man/man5/puppet.conf.5 +8 -8
  17. data/man/man8/puppet-agent.8 +1 -1
  18. data/man/man8/puppet-apply.8 +1 -1
  19. data/man/man8/puppet-catalog.8 +1 -1
  20. data/man/man8/puppet-config.8 +1 -1
  21. data/man/man8/puppet-describe.8 +1 -1
  22. data/man/man8/puppet-device.8 +1 -1
  23. data/man/man8/puppet-doc.8 +1 -1
  24. data/man/man8/puppet-epp.8 +1 -1
  25. data/man/man8/puppet-facts.8 +1 -1
  26. data/man/man8/puppet-filebucket.8 +1 -1
  27. data/man/man8/puppet-generate.8 +1 -1
  28. data/man/man8/puppet-help.8 +1 -1
  29. data/man/man8/puppet-key.8 +1 -1
  30. data/man/man8/puppet-lookup.8 +1 -1
  31. data/man/man8/puppet-man.8 +1 -1
  32. data/man/man8/puppet-module.8 +1 -1
  33. data/man/man8/puppet-node.8 +1 -1
  34. data/man/man8/puppet-parser.8 +1 -1
  35. data/man/man8/puppet-plugin.8 +1 -1
  36. data/man/man8/puppet-report.8 +1 -1
  37. data/man/man8/puppet-resource.8 +1 -1
  38. data/man/man8/puppet-script.8 +1 -1
  39. data/man/man8/puppet-ssl.8 +1 -1
  40. data/man/man8/puppet-status.8 +1 -1
  41. data/man/man8/puppet.8 +2 -2
  42. data/spec/integration/agent/logging_spec.rb +5 -7
  43. data/spec/integration/application/apply_spec.rb +18 -16
  44. data/spec/integration/application/doc_spec.rb +1 -2
  45. data/spec/integration/application/lookup_spec.rb +5 -5
  46. data/spec/integration/configurer_spec.rb +5 -6
  47. data/spec/integration/defaults_spec.rb +5 -6
  48. data/spec/integration/directory_environments_spec.rb +1 -1
  49. data/spec/integration/faces/config_spec.rb +3 -4
  50. data/spec/integration/faces/documentation_spec.rb +0 -1
  51. data/spec/integration/faces/plugin_spec.rb +1 -1
  52. data/spec/integration/file_bucket/file_spec.rb +2 -4
  53. data/spec/integration/file_serving/content_spec.rb +0 -1
  54. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  55. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  56. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  57. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  58. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  59. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  60. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  61. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  62. data/spec/integration/network/authconfig_spec.rb +23 -24
  63. data/spec/integration/network/formats_spec.rb +0 -1
  64. data/spec/integration/node/environment_spec.rb +0 -1
  65. data/spec/integration/node/facts_spec.rb +9 -10
  66. data/spec/integration/node_spec.rb +6 -7
  67. data/spec/integration/parser/catalog_spec.rb +1 -5
  68. data/spec/integration/parser/collection_spec.rb +1 -2
  69. data/spec/integration/parser/compiler_spec.rb +6 -6
  70. data/spec/integration/parser/scope_spec.rb +1 -1
  71. data/spec/integration/parser/undef_param_spec.rb +1 -1
  72. data/spec/integration/provider/service/init_spec.rb +4 -5
  73. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  74. data/spec/integration/provider/service/windows_spec.rb +1 -2
  75. data/spec/integration/reference/providers_spec.rb +1 -2
  76. data/spec/integration/reports_spec.rb +1 -2
  77. data/spec/integration/resource/catalog_spec.rb +14 -17
  78. data/spec/integration/resource/type_collection_spec.rb +4 -5
  79. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  80. data/spec/integration/ssl/host_spec.rb +1 -2
  81. data/spec/integration/ssl/key_spec.rb +0 -1
  82. data/spec/integration/test/test_helper_spec.rb +0 -1
  83. data/spec/integration/transaction/report_spec.rb +6 -11
  84. data/spec/integration/transaction_spec.rb +18 -19
  85. data/spec/integration/type/exec_spec.rb +0 -1
  86. data/spec/integration/type/file_spec.rb +13 -14
  87. data/spec/integration/type/package_spec.rb +19 -23
  88. data/spec/integration/type/tidy_spec.rb +1 -2
  89. data/spec/integration/type_spec.rb +0 -1
  90. data/spec/integration/util/autoload_spec.rb +1 -2
  91. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  92. data/spec/integration/util/settings_spec.rb +0 -1
  93. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  94. data/spec/integration/util/windows/principal_spec.rb +0 -1
  95. data/spec/integration/util/windows/process_spec.rb +4 -6
  96. data/spec/integration/util/windows/registry_spec.rb +41 -51
  97. data/spec/integration/util/windows/security_spec.rb +2 -4
  98. data/spec/integration/util/windows/user_spec.rb +18 -20
  99. data/spec/integration/util_spec.rb +4 -7
  100. data/spec/lib/puppet_spec/compiler.rb +1 -1
  101. data/spec/lib/puppet_spec/files.rb +0 -1
  102. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  103. data/spec/lib/puppet_spec/scope.rb +1 -2
  104. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  105. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  106. data/spec/shared_behaviours/file_serving.rb +6 -8
  107. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  108. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  109. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  110. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  111. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  112. data/spec/spec_helper.rb +10 -1
  113. data/spec/unit/agent/disabler_spec.rb +4 -5
  114. data/spec/unit/agent/locker_spec.rb +12 -13
  115. data/spec/unit/agent_spec.rb +80 -85
  116. data/spec/unit/application/agent_spec.rb +88 -93
  117. data/spec/unit/application/apply_spec.rb +82 -83
  118. data/spec/unit/application/config_spec.rb +0 -1
  119. data/spec/unit/application/describe_spec.rb +6 -7
  120. data/spec/unit/application/device_spec.rb +395 -419
  121. data/spec/unit/application/doc_spec.rb +44 -46
  122. data/spec/unit/application/face_base_spec.rb +61 -62
  123. data/spec/unit/application/facts_spec.rb +3 -4
  124. data/spec/unit/application/filebucket_spec.rb +66 -74
  125. data/spec/unit/application/indirection_base_spec.rb +8 -6
  126. data/spec/unit/application/lookup_spec.rb +26 -26
  127. data/spec/unit/application/resource_spec.rb +42 -48
  128. data/spec/unit/application/ssl_spec.rb +3 -3
  129. data/spec/unit/application_spec.rb +82 -92
  130. data/spec/unit/capability_spec.rb +6 -6
  131. data/spec/unit/certificate_factory_spec.rb +3 -5
  132. data/spec/unit/configurer/downloader_spec.rb +20 -21
  133. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  134. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  135. data/spec/unit/configurer_spec.rb +189 -192
  136. data/spec/unit/confine/exists_spec.rb +17 -15
  137. data/spec/unit/confine/false_spec.rb +5 -6
  138. data/spec/unit/confine/feature_spec.rb +7 -5
  139. data/spec/unit/confine/true_spec.rb +5 -6
  140. data/spec/unit/confine/variable_spec.rb +14 -15
  141. data/spec/unit/confine_collection_spec.rb +28 -29
  142. data/spec/unit/confine_spec.rb +13 -14
  143. data/spec/unit/confiner_spec.rb +10 -11
  144. data/spec/unit/context/trusted_information_spec.rb +1 -1
  145. data/spec/unit/daemon_spec.rb +35 -36
  146. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  147. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  148. data/spec/unit/datatypes_spec.rb +3 -4
  149. data/spec/unit/defaults_spec.rb +18 -13
  150. data/spec/unit/environments_spec.rb +7 -7
  151. data/spec/unit/etc_spec.rb +30 -32
  152. data/spec/unit/external/pson_spec.rb +0 -1
  153. data/spec/unit/face/catalog_spec.rb +0 -1
  154. data/spec/unit/face/config_spec.rb +31 -35
  155. data/spec/unit/face/epp_face_spec.rb +3 -4
  156. data/spec/unit/face/facts_spec.rb +5 -6
  157. data/spec/unit/face/generate_spec.rb +4 -5
  158. data/spec/unit/face/help_spec.rb +7 -8
  159. data/spec/unit/face/key_spec.rb +0 -1
  160. data/spec/unit/face/man_spec.rb +1 -2
  161. data/spec/unit/face/module/install_spec.rb +3 -5
  162. data/spec/unit/face/module/list_spec.rb +2 -12
  163. data/spec/unit/face/module/search_spec.rb +11 -9
  164. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  165. data/spec/unit/face/node_spec.rb +23 -24
  166. data/spec/unit/face/parser_spec.rb +3 -3
  167. data/spec/unit/face/plugin_spec.rb +36 -9
  168. data/spec/unit/face/status_spec.rb +0 -1
  169. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  170. data/spec/unit/file_bucket/file_spec.rb +0 -2
  171. data/spec/unit/file_serving/base_spec.rb +14 -15
  172. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  173. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  174. data/spec/unit/file_serving/content_spec.rb +10 -11
  175. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  176. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  177. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  178. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  179. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  180. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  181. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  182. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  183. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  184. data/spec/unit/file_serving/mount_spec.rb +0 -1
  185. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  186. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  187. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  188. data/spec/unit/file_system_spec.rb +2 -2
  189. data/spec/unit/forge/errors_spec.rb +1 -1
  190. data/spec/unit/forge/forge_spec.rb +13 -14
  191. data/spec/unit/forge/module_release_spec.rb +18 -18
  192. data/spec/unit/forge/repository_spec.rb +29 -30
  193. data/spec/unit/forge_spec.rb +15 -11
  194. data/spec/unit/functions/binary_file_spec.rb +3 -3
  195. data/spec/unit/functions/contain_spec.rb +0 -2
  196. data/spec/unit/functions/defined_spec.rb +0 -1
  197. data/spec/unit/functions/epp_spec.rb +2 -2
  198. data/spec/unit/functions/find_file_spec.rb +7 -7
  199. data/spec/unit/functions/include_spec.rb +0 -4
  200. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  201. data/spec/unit/functions/lookup_spec.rb +1 -2
  202. data/spec/unit/functions/module_directory_spec.rb +12 -12
  203. data/spec/unit/functions/require_spec.rb +0 -3
  204. data/spec/unit/functions/shared.rb +5 -8
  205. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  206. data/spec/unit/functions4_spec.rb +9 -10
  207. data/spec/unit/gettext/config_spec.rb +4 -4
  208. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  209. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  210. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  211. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  212. data/spec/unit/hiera_puppet_spec.rb +20 -20
  213. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  214. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  215. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  216. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  217. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  218. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  219. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  220. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  221. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  222. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  223. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  224. data/spec/unit/indirector/envelope_spec.rb +1 -2
  225. data/spec/unit/indirector/exec_spec.rb +4 -5
  226. data/spec/unit/indirector/face_spec.rb +9 -9
  227. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  228. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  229. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  230. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  231. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  232. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  233. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  234. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  235. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  236. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  237. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  238. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  239. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  240. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  241. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  242. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  243. data/spec/unit/indirector/file_server_spec.rb +87 -87
  244. data/spec/unit/indirector/indirection_spec.rb +242 -226
  245. data/spec/unit/indirector/json_spec.rb +7 -9
  246. data/spec/unit/indirector/key/file_spec.rb +21 -22
  247. data/spec/unit/indirector/memory_spec.rb +6 -7
  248. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  249. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  250. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  251. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  252. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  253. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  254. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  255. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  256. data/spec/unit/indirector/none_spec.rb +5 -5
  257. data/spec/unit/indirector/plain_spec.rb +7 -8
  258. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  259. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  260. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  261. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  262. data/spec/unit/indirector/request_spec.rb +11 -12
  263. data/spec/unit/indirector/resource/ral_spec.rb +46 -54
  264. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  265. data/spec/unit/indirector/rest_spec.rb +113 -110
  266. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  267. data/spec/unit/indirector/status/local_spec.rb +0 -1
  268. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  269. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  270. data/spec/unit/indirector/terminus_spec.rb +27 -27
  271. data/spec/unit/indirector/yaml_spec.rb +5 -6
  272. data/spec/unit/indirector_spec.rb +1 -2
  273. data/spec/unit/info_service_spec.rb +1 -1
  274. data/spec/unit/interface/action_builder_spec.rb +0 -1
  275. data/spec/unit/interface/action_manager_spec.rb +0 -1
  276. data/spec/unit/interface/action_spec.rb +2 -3
  277. data/spec/unit/interface/documentation_spec.rb +0 -1
  278. data/spec/unit/interface/face_collection_spec.rb +19 -12
  279. data/spec/unit/interface_spec.rb +3 -3
  280. data/spec/unit/man_spec.rb +3 -4
  281. data/spec/unit/module_spec.rb +46 -51
  282. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  283. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  284. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  285. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  286. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  287. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  288. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  289. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  290. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  291. data/spec/unit/module_tool/tar_spec.rb +12 -13
  292. data/spec/unit/module_tool_spec.rb +7 -12
  293. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  294. data/spec/unit/network/authconfig_spec.rb +17 -18
  295. data/spec/unit/network/authorization_spec.rb +4 -5
  296. data/spec/unit/network/authstore_spec.rb +0 -1
  297. data/spec/unit/network/format_handler_spec.rb +0 -1
  298. data/spec/unit/network/format_spec.rb +9 -10
  299. data/spec/unit/network/format_support_spec.rb +28 -29
  300. data/spec/unit/network/formats_spec.rb +4 -5
  301. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  302. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  303. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  304. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  305. data/spec/unit/network/http/api_spec.rb +0 -2
  306. data/spec/unit/network/http/compression_spec.rb +21 -22
  307. data/spec/unit/network/http/connection_spec.rb +41 -36
  308. data/spec/unit/network/http/factory_spec.rb +5 -6
  309. data/spec/unit/network/http/handler_spec.rb +9 -18
  310. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  311. data/spec/unit/network/http/pool_spec.rb +28 -29
  312. data/spec/unit/network/http/request_spec.rb +0 -2
  313. data/spec/unit/network/http/response_spec.rb +11 -13
  314. data/spec/unit/network/http/route_spec.rb +0 -1
  315. data/spec/unit/network/http/session_spec.rb +1 -2
  316. data/spec/unit/network/http/site_spec.rb +0 -1
  317. data/spec/unit/network/http_pool_spec.rb +18 -9
  318. data/spec/unit/network/http_spec.rb +0 -1
  319. data/spec/unit/network/resolver_spec.rb +25 -26
  320. data/spec/unit/network/rights_spec.rb +52 -53
  321. data/spec/unit/node/environment_spec.rb +14 -15
  322. data/spec/unit/node/facts_spec.rb +5 -7
  323. data/spec/unit/node_spec.rb +4 -10
  324. data/spec/unit/other/selinux_spec.rb +0 -1
  325. data/spec/unit/parameter/boolean_spec.rb +1 -2
  326. data/spec/unit/parameter/package_options_spec.rb +1 -2
  327. data/spec/unit/parameter/path_spec.rb +0 -1
  328. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  329. data/spec/unit/parameter/value_spec.rb +0 -1
  330. data/spec/unit/parameter_spec.rb +9 -9
  331. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  332. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  333. data/spec/unit/parser/compiler_spec.rb +84 -96
  334. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  335. data/spec/unit/parser/files_spec.rb +0 -1
  336. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  337. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  338. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  339. data/spec/unit/parser/functions/file_spec.rb +13 -14
  340. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  341. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  342. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  343. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  344. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  345. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  346. data/spec/unit/parser/functions/split_spec.rb +0 -1
  347. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  348. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  349. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  350. data/spec/unit/parser/functions/template_spec.rb +13 -13
  351. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  352. data/spec/unit/parser/functions_spec.rb +6 -7
  353. data/spec/unit/parser/relationship_spec.rb +0 -1
  354. data/spec/unit/parser/resource_spec.rb +42 -42
  355. data/spec/unit/parser/scope_spec.rb +39 -35
  356. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  357. data/spec/unit/parser/type_loader_spec.rb +17 -19
  358. data/spec/unit/pops/adaptable_spec.rb +0 -1
  359. data/spec/unit/pops/benchmark_spec.rb +0 -1
  360. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  361. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  362. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  363. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  364. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  365. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  366. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  367. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  368. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  371. data/spec/unit/pops/factory_spec.rb +3 -4
  372. data/spec/unit/pops/issues_spec.rb +19 -20
  373. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  374. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  375. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  376. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  377. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  378. data/spec/unit/pops/migration_spec.rb +3 -5
  379. data/spec/unit/pops/model/model_spec.rb +0 -1
  380. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  381. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  382. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  383. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  384. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  385. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  386. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  387. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  388. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  389. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  390. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  391. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  392. data/spec/unit/pops/pn_spec.rb +0 -1
  393. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  394. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  395. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  396. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  397. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  398. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  399. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  400. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  401. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  402. data/spec/unit/pops/visitor_spec.rb +0 -1
  403. data/spec/unit/property/boolean_spec.rb +1 -1
  404. data/spec/unit/property/ensure_spec.rb +0 -1
  405. data/spec/unit/property/keyvalue_spec.rb +32 -34
  406. data/spec/unit/property/list_spec.rb +26 -27
  407. data/spec/unit/property/ordered_list_spec.rb +10 -14
  408. data/spec/unit/property_spec.rb +42 -43
  409. data/spec/unit/provider/aix_object_spec.rb +47 -45
  410. data/spec/unit/provider/command_spec.rb +9 -9
  411. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  412. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  413. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  414. data/spec/unit/provider/exec_spec.rb +0 -1
  415. data/spec/unit/provider/file/posix_spec.rb +22 -24
  416. data/spec/unit/provider/file/windows_spec.rb +15 -17
  417. data/spec/unit/provider/group/aix_spec.rb +3 -2
  418. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  419. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  420. data/spec/unit/provider/group/pw_spec.rb +11 -11
  421. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  422. data/spec/unit/provider/ldap_spec.rb +61 -62
  423. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  424. data/spec/unit/provider/nameservice_spec.rb +38 -40
  425. data/spec/unit/provider/package/aix_spec.rb +15 -15
  426. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  427. data/spec/unit/provider/package/apt_spec.rb +44 -27
  428. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  429. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  430. data/spec/unit/provider/package/base_spec.rb +4 -4
  431. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  432. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  433. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  434. data/spec/unit/provider/package/gem_spec.rb +51 -43
  435. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  436. data/spec/unit/provider/package/macports_spec.rb +46 -42
  437. data/spec/unit/provider/package/nim_spec.rb +30 -39
  438. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  439. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  440. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  441. data/spec/unit/provider/package/pip_spec.rb +71 -72
  442. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  443. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  444. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  445. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  446. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  447. data/spec/unit/provider/package/portage_spec.rb +70 -74
  448. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  449. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  450. data/spec/unit/provider/package/sun_spec.rb +16 -18
  451. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  452. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  453. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  454. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  455. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  456. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  457. data/spec/unit/provider/package/windows_spec.rb +36 -32
  458. data/spec/unit/provider/package/yum_spec.rb +7 -7
  459. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  460. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  461. data/spec/unit/provider/service/base_spec.rb +4 -5
  462. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  463. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  464. data/spec/unit/provider/service/debian_spec.rb +38 -38
  465. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  466. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  467. data/spec/unit/provider/service/init_spec.rb +53 -52
  468. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  469. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  470. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  471. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  472. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  473. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  474. data/spec/unit/provider/service/runit_spec.rb +29 -27
  475. data/spec/unit/provider/service/smf_spec.rb +74 -66
  476. data/spec/unit/provider/service/src_spec.rb +46 -47
  477. data/spec/unit/provider/service/systemd_spec.rb +104 -113
  478. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  479. data/spec/unit/provider/service/windows_spec.rb +33 -41
  480. data/spec/unit/provider/user/aix_spec.rb +31 -31
  481. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  482. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  483. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  484. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  485. data/spec/unit/provider/user/pw_spec.rb +37 -35
  486. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  487. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  488. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  489. data/spec/unit/provider_spec.rb +35 -35
  490. data/spec/unit/puppet_pal_2pec.rb +4 -5
  491. data/spec/unit/puppet_pal_spec.rb +0 -1
  492. data/spec/unit/puppet_spec.rb +6 -7
  493. data/spec/unit/relationship_spec.rb +0 -1
  494. data/spec/unit/reports/http_spec.rb +21 -23
  495. data/spec/unit/reports/store_spec.rb +3 -4
  496. data/spec/unit/reports_spec.rb +12 -14
  497. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  498. data/spec/unit/resource/catalog_spec.rb +72 -68
  499. data/spec/unit/resource/status_spec.rb +6 -8
  500. data/spec/unit/resource/type_collection_spec.rb +17 -18
  501. data/spec/unit/resource/type_spec.rb +34 -35
  502. data/spec/unit/resource_spec.rb +36 -32
  503. data/spec/unit/rest/client_spec.rb +58 -27
  504. data/spec/unit/rest/route_spec.rb +5 -5
  505. data/spec/unit/scheduler/job_spec.rb +0 -1
  506. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  507. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  508. data/spec/unit/settings/array_setting_spec.rb +1 -1
  509. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  510. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  511. data/spec/unit/settings/config_file_spec.rb +0 -1
  512. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  513. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  514. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  515. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  516. data/spec/unit/settings/file_setting_spec.rb +44 -46
  517. data/spec/unit/settings/path_setting_spec.rb +1 -2
  518. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  519. data/spec/unit/settings/string_setting_spec.rb +14 -15
  520. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  521. data/spec/unit/settings/value_translator_spec.rb +0 -1
  522. data/spec/unit/settings_spec.rb +228 -235
  523. data/spec/unit/ssl/base_spec.rb +14 -15
  524. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  525. data/spec/unit/ssl/certificate_spec.rb +23 -25
  526. data/spec/unit/ssl/digest_spec.rb +0 -1
  527. data/spec/unit/ssl/host_spec.rb +166 -149
  528. data/spec/unit/ssl/key_spec.rb +30 -31
  529. data/spec/unit/ssl/validator_spec.rb +38 -39
  530. data/spec/unit/task_spec.rb +44 -45
  531. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  532. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  533. data/spec/unit/transaction/event_spec.rb +16 -15
  534. data/spec/unit/transaction/persistence_spec.rb +16 -17
  535. data/spec/unit/transaction/report_spec.rb +11 -12
  536. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  537. data/spec/unit/transaction_spec.rb +100 -101
  538. data/spec/unit/type/component_spec.rb +0 -1
  539. data/spec/unit/type/exec_spec.rb +60 -56
  540. data/spec/unit/type/file/checksum_spec.rb +9 -10
  541. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  542. data/spec/unit/type/file/content_spec.rb +58 -61
  543. data/spec/unit/type/file/ctime_spec.rb +0 -1
  544. data/spec/unit/type/file/ensure_spec.rb +12 -13
  545. data/spec/unit/type/file/group_spec.rb +5 -7
  546. data/spec/unit/type/file/mode_spec.rb +4 -6
  547. data/spec/unit/type/file/mtime_spec.rb +0 -1
  548. data/spec/unit/type/file/owner_spec.rb +6 -8
  549. data/spec/unit/type/file/selinux_spec.rb +17 -19
  550. data/spec/unit/type/file/source_spec.rb +104 -101
  551. data/spec/unit/type/file/type_spec.rb +0 -1
  552. data/spec/unit/type/file_spec.rb +195 -185
  553. data/spec/unit/type/filebucket_spec.rb +4 -5
  554. data/spec/unit/type/group_spec.rb +6 -8
  555. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  556. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  557. data/spec/unit/type/package_spec.rb +56 -57
  558. data/spec/unit/type/resources_spec.rb +72 -74
  559. data/spec/unit/type/schedule_spec.rb +24 -26
  560. data/spec/unit/type/service_spec.rb +48 -48
  561. data/spec/unit/type/stage_spec.rb +0 -1
  562. data/spec/unit/type/tidy_spec.rb +61 -62
  563. data/spec/unit/type/user_spec.rb +24 -25
  564. data/spec/unit/type/whit_spec.rb +0 -1
  565. data/spec/unit/type_spec.rb +55 -54
  566. data/spec/unit/util/at_fork_spec.rb +18 -19
  567. data/spec/unit/util/autoload_spec.rb +55 -56
  568. data/spec/unit/util/backups_spec.rb +34 -35
  569. data/spec/unit/util/character_encoding_spec.rb +5 -5
  570. data/spec/unit/util/checksums_spec.rb +38 -39
  571. data/spec/unit/util/colors_spec.rb +1 -2
  572. data/spec/unit/util/command_line_spec.rb +24 -25
  573. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  574. data/spec/unit/util/diff_spec.rb +7 -8
  575. data/spec/unit/util/errors_spec.rb +0 -1
  576. data/spec/unit/util/execution_spec.rb +185 -161
  577. data/spec/unit/util/execution_stub_spec.rb +0 -1
  578. data/spec/unit/util/feature_spec.rb +21 -14
  579. data/spec/unit/util/filetype_spec.rb +49 -49
  580. data/spec/unit/util/http_proxy_spec.rb +12 -12
  581. data/spec/unit/util/inifile_spec.rb +26 -31
  582. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  583. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  584. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  585. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  586. data/spec/unit/util/lockfile_spec.rb +0 -1
  587. data/spec/unit/util/log/destinations_spec.rb +30 -33
  588. data/spec/unit/util/log_spec.rb +35 -36
  589. data/spec/unit/util/logging_spec.rb +58 -72
  590. data/spec/unit/util/metric_spec.rb +0 -1
  591. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  592. data/spec/unit/util/multi_match_spec.rb +0 -1
  593. data/spec/unit/util/network_device/config_spec.rb +0 -1
  594. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  595. data/spec/unit/util/network_device_spec.rb +7 -9
  596. data/spec/unit/util/package_spec.rb +0 -1
  597. data/spec/unit/util/pidlock_spec.rb +21 -22
  598. data/spec/unit/util/plist_spec.rb +40 -33
  599. data/spec/unit/util/posix_spec.rb +54 -51
  600. data/spec/unit/util/rdoc_spec.rb +9 -10
  601. data/spec/unit/util/reference_spec.rb +0 -1
  602. data/spec/unit/util/resource_template_spec.rb +20 -20
  603. data/spec/unit/util/retry_action_spec.rb +7 -8
  604. data/spec/unit/util/rubygems_spec.rb +7 -8
  605. data/spec/unit/util/run_mode_spec.rb +3 -4
  606. data/spec/unit/util/selinux_spec.rb +79 -72
  607. data/spec/unit/util/splayer_spec.rb +8 -9
  608. data/spec/unit/util/ssl_spec.rb +0 -1
  609. data/spec/unit/util/storage_spec.rb +3 -4
  610. data/spec/unit/util/suidmanager_spec.rb +45 -54
  611. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  612. data/spec/unit/util/tag_set_spec.rb +0 -1
  613. data/spec/unit/util/tagging_spec.rb +0 -1
  614. data/spec/unit/util/terminal_spec.rb +9 -10
  615. data/spec/unit/util/user_attr_spec.rb +1 -2
  616. data/spec/unit/util/warnings_spec.rb +3 -4
  617. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  618. data/spec/unit/util/watcher_spec.rb +51 -21
  619. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  620. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  621. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  622. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  623. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  624. data/spec/unit/util/windows/file_spec.rb +0 -1
  625. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  626. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  627. data/spec/unit/util/windows/service_spec.rb +66 -68
  628. data/spec/unit/util/windows/sid_spec.rb +11 -13
  629. data/spec/unit/util/windows/string_spec.rb +0 -1
  630. data/spec/unit/util_spec.rb +55 -57
  631. data/spec/unit/version_spec.rb +6 -6
  632. metadata +2 -2
@@ -1,8 +1,7 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  describe Puppet::Settings::PathSetting do
5
- subject { described_class.new(:settings => mock('settings'), :desc => "test") }
4
+ subject { described_class.new(:settings => double('settings'), :desc => "test") }
6
5
 
7
6
  context "#munge" do
8
7
  it "should expand all path elements" do
@@ -1,4 +1,3 @@
1
- #!/usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/settings'
@@ -6,7 +5,7 @@ require 'puppet/settings/priority_setting'
6
5
  require 'puppet/util/platform'
7
6
 
8
7
  describe Puppet::Settings::PrioritySetting do
9
- let(:setting) { described_class.new(:settings => mock('settings'), :desc => "test") }
8
+ let(:setting) { described_class.new(:settings => double('settings'), :desc => "test") }
10
9
 
11
10
  it "is of type :priority" do
12
11
  expect(setting.type).to eq(:priority)
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/settings'
@@ -8,21 +7,21 @@ describe Puppet::Settings::StringSetting do
8
7
  StringSetting = Puppet::Settings::StringSetting
9
8
 
10
9
  before(:each) do
11
- @test_setting_name = :test_setting
10
+ @test_setting_name = :test_setting
12
11
  @test_setting_default = "my_crazy_default/$var"
13
12
  @application_setting = "application/$var"
14
- @application_defaults = { }
13
+ @application_defaults = { }
15
14
  Puppet::Settings::REQUIRED_APP_SETTINGS.each do |key|
16
15
  @application_defaults[key] = "foo"
17
16
  end
18
17
  @application_defaults[:run_mode] = :user
19
18
  @settings = Puppet::Settings.new
20
19
  @application_defaults.each { |k,v| @settings.define_settings :main, k => {:default=>"", :desc => "blah"} }
21
- @settings.define_settings :main, :var => { :default => "interpolate!",
22
- :type => :string,
20
+ @settings.define_settings :main, :var => { :default => "interpolate!",
21
+ :type => :string,
23
22
  :desc => "my var desc" },
24
- @test_setting_name => { :default => @test_setting_default,
25
- :type => :string,
23
+ @test_setting_name => { :default => @test_setting_default,
24
+ :type => :string,
26
25
  :desc => "my test desc" }
27
26
  @test_setting = @settings.setting(@test_setting_name)
28
27
  end
@@ -32,40 +31,40 @@ describe Puppet::Settings::StringSetting do
32
31
  it "should return the setting default" do
33
32
  expect(@test_setting.default).to eq(@test_setting_default)
34
33
  end
35
-
34
+
36
35
  it "should be uninterpolated" do
37
36
  expect(@test_setting.default).not_to match(/interpolate/)
38
37
  end
39
38
  end
40
-
39
+
41
40
  describe "checking application defaults first" do
42
41
  describe "if application defaults set" do
43
42
  before(:each) do
44
43
  @settings.initialize_app_defaults @application_defaults.merge @test_setting_name => @application_setting
45
44
  end
46
-
45
+
47
46
  it "should return the application-set default" do
48
47
  expect(@test_setting.default(true)).to eq(@application_setting)
49
48
  end
50
-
49
+
51
50
  it "should be uninterpolated" do
52
51
  expect(@test_setting.default(true)).not_to match(/interpolate/)
53
52
  end
54
-
53
+
55
54
  end
56
-
55
+
57
56
  describe "if application defaults not set" do
58
57
  it "should return the regular default" do
59
58
  expect(@test_setting.default(true)).to eq(@test_setting_default)
60
59
  end
61
-
60
+
62
61
  it "should be uninterpolated" do
63
62
  expect(@test_setting.default(true)).not_to match(/interpolate/)
64
63
  end
65
64
  end
66
65
  end
67
66
  end
68
-
67
+
69
68
  describe "#value" do
70
69
  it "should be interpolated" do
71
70
  expect(@test_setting.value).to match(/interpolate/)
@@ -1,8 +1,7 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  describe Puppet::Settings::TerminusSetting do
5
- let(:setting) { described_class.new(:settings => mock('settings'), :desc => "test") }
4
+ let(:setting) { described_class.new(:settings => double('settings'), :desc => "test") }
6
5
 
7
6
  describe "#munge" do
8
7
  it "converts strings to symbols" do
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby -S rspec
2
1
  require 'spec_helper'
3
2
  require 'puppet/settings/value_translator'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'ostruct'
4
3
  require 'puppet/settings/errors'
@@ -291,37 +290,36 @@ describe Puppet::Settings do
291
290
  end
292
291
 
293
292
  it "should identify configured settings in memory" do
294
- @settings.instance_variable_get(:@value_sets)[:memory].expects(:lookup).with(:myval).returns('foo')
293
+ expect(@settings.instance_variable_get(:@value_sets)[:memory]).to receive(:lookup).with(:myval).and_return('foo')
295
294
  expect(@settings.set_by_config?(:myval)).to be_truthy
296
295
  end
297
296
 
298
297
  it "should identify configured settings from CLI" do
299
- @settings.instance_variable_get(:@value_sets)[:cli].expects(:lookup).with(:myval).returns('foo')
298
+ expect(@settings.instance_variable_get(:@value_sets)[:cli]).to receive(:lookup).with(:myval).and_return('foo')
300
299
  expect(@settings.set_by_config?(:myval)).to be_truthy
301
300
  end
302
301
 
303
302
  it "should not identify configured settings from environment by default" do
304
- Puppet.lookup(:environments).expects(:get_conf).with(Puppet[:environment].to_sym).never
303
+ expect(Puppet.lookup(:environments)).not_to receive(:get_conf).with(Puppet[:environment].to_sym)
305
304
  expect(@settings.set_by_config?(:manifest)).to be_falsey
306
305
  end
307
306
 
308
307
  it "should identify configured settings from environment by when an environment is specified" do
309
- foo = mock('environment', :manifest => 'foo')
310
- Puppet.lookup(:environments).expects(:get_conf).with(Puppet[:environment].to_sym).returns(foo)
308
+ foo = double('environment', :manifest => 'foo')
309
+ expect(Puppet.lookup(:environments)).to receive(:get_conf).with(Puppet[:environment].to_sym).and_return(foo)
311
310
  expect(@settings.set_by_config?(:manifest, Puppet[:environment])).to be_truthy
312
311
  end
313
312
 
314
313
  it "should identify configured settings from the preferred run mode" do
315
314
  user_config_text = "[#{@settings.preferred_run_mode}]\nmyval = foo"
316
- seq = sequence "config_file_sequence"
317
315
 
318
- Puppet.features.stubs(:root?).returns(false)
319
- Puppet::FileSystem.expects(:exist?).
316
+ allow(Puppet.features).to receive(:root?).and_return(false)
317
+ expect(Puppet::FileSystem).to receive(:exist?).
320
318
  with(user_config_file_default_location).
321
- returns(true).in_sequence(seq)
322
- @settings.expects(:read_file).
319
+ and_return(true).ordered
320
+ expect(@settings).to receive(:read_file).
323
321
  with(user_config_file_default_location).
324
- returns(user_config_text).in_sequence(seq)
322
+ and_return(user_config_text).ordered
325
323
 
326
324
  @settings.send(:parse_config_files)
327
325
  expect(@settings.set_by_config?(:myval)).to be_truthy
@@ -329,15 +327,14 @@ describe Puppet::Settings do
329
327
 
330
328
  it "should identify configured settings from the specified run mode" do
331
329
  user_config_text = "[master]\nmyval = foo"
332
- seq = sequence "config_file_sequence"
333
330
 
334
- Puppet.features.stubs(:root?).returns(false)
335
- Puppet::FileSystem.expects(:exist?).
331
+ allow(Puppet.features).to receive(:root?).and_return(false)
332
+ expect(Puppet::FileSystem).to receive(:exist?).
336
333
  with(user_config_file_default_location).
337
- returns(true).in_sequence(seq)
338
- @settings.expects(:read_file).
334
+ and_return(true).ordered
335
+ expect(@settings).to receive(:read_file).
339
336
  with(user_config_file_default_location).
340
- returns(user_config_text).in_sequence(seq)
337
+ and_return(user_config_text).ordered
341
338
 
342
339
  @settings.send(:parse_config_files)
343
340
  expect(@settings.set_by_config?(:myval, nil, :master)).to be_truthy
@@ -345,15 +342,14 @@ describe Puppet::Settings do
345
342
 
346
343
  it "should not identify configured settings from an unspecified run mode" do
347
344
  user_config_text = "[zaz]\nmyval = foo"
348
- seq = sequence "config_file_sequence"
349
345
 
350
- Puppet.features.stubs(:root?).returns(false)
351
- Puppet::FileSystem.expects(:exist?).
346
+ allow(Puppet.features).to receive(:root?).and_return(false)
347
+ expect(Puppet::FileSystem).to receive(:exist?).
352
348
  with(user_config_file_default_location).
353
- returns(true).in_sequence(seq)
354
- @settings.expects(:read_file).
349
+ and_return(true).ordered
350
+ expect(@settings).to receive(:read_file).
355
351
  with(user_config_file_default_location).
356
- returns(user_config_text).in_sequence(seq)
352
+ and_return(user_config_text).ordered
357
353
 
358
354
  @settings.send(:parse_config_files)
359
355
  expect(@settings.set_by_config?(:myval)).to be_falsey
@@ -361,15 +357,14 @@ describe Puppet::Settings do
361
357
 
362
358
  it "should identify configured settings from the main section" do
363
359
  user_config_text = "[main]\nmyval = foo"
364
- seq = sequence "config_file_sequence"
365
360
 
366
- Puppet.features.stubs(:root?).returns(false)
367
- Puppet::FileSystem.expects(:exist?).
361
+ allow(Puppet.features).to receive(:root?).and_return(false)
362
+ expect(Puppet::FileSystem).to receive(:exist?).
368
363
  with(user_config_file_default_location).
369
- returns(true).in_sequence(seq)
370
- @settings.expects(:read_file).
364
+ and_return(true).ordered
365
+ expect(@settings).to receive(:read_file).
371
366
  with(user_config_file_default_location).
372
- returns(user_config_text).in_sequence(seq)
367
+ and_return(user_config_text).ordered
373
368
 
374
369
  @settings.send(:parse_config_files)
375
370
  expect(@settings.set_by_config?(:myval)).to be_truthy
@@ -379,14 +374,14 @@ describe Puppet::Settings do
379
374
  @settings.define_settings :mysection,
380
375
  :one => { :default => "whah", :desc => "yay" },
381
376
  :two => { :default => "$one yay", :desc => "bah" }
382
- @settings.expects(:unsafe_flush_cache)
377
+ expect(@settings).to receive(:unsafe_flush_cache)
383
378
  expect(@settings[:two]).to eq("whah yay")
384
379
  @settings.handlearg("--one", "else")
385
380
  expect(@settings[:two]).to eq("else yay")
386
381
  end
387
382
 
388
383
  it "should clear the cache when the preferred_run_mode is changed" do
389
- @settings.expects(:flush_cache)
384
+ expect(@settings).to receive(:flush_cache)
390
385
  @settings.preferred_run_mode = :master
391
386
  end
392
387
 
@@ -397,7 +392,7 @@ describe Puppet::Settings do
397
392
  end
398
393
 
399
394
  it "should clear the list of used sections" do
400
- @settings.expects(:clearused)
395
+ expect(@settings).to receive(:clearused)
401
396
  @settings[:myval] = "yay"
402
397
  end
403
398
 
@@ -423,7 +418,7 @@ describe Puppet::Settings do
423
418
  end
424
419
 
425
420
  it "should call the hook when value written" do
426
- @settings.setting(:hooker).expects(:handle).with("something").once
421
+ expect(@settings.setting(:hooker)).to receive(:handle).with("something").once
427
422
  @settings[:hooker] = "something"
428
423
  end
429
424
  end
@@ -437,7 +432,7 @@ describe Puppet::Settings do
437
432
 
438
433
  describe "when nil" do
439
434
  it "should generate a warning" do
440
- Puppet.expects(:warning)
435
+ expect(Puppet).to receive(:warning)
441
436
  @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => nil, :hook => lambda { |v| hook_values << v }})
442
437
  end
443
438
  it "should use default" do
@@ -482,7 +477,7 @@ describe Puppet::Settings do
482
477
  app_defaults[:run_mode] = :user
483
478
  @settings.define_settings(:main, PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS)
484
479
 
485
- @settings.setting(:hooker).expects(:handle).with("yay").once
480
+ expect(@settings.setting(:hooker)).to receive(:handle).with("yay").once
486
481
 
487
482
  @settings.initialize_app_defaults app_defaults
488
483
  end
@@ -557,7 +552,7 @@ describe Puppet::Settings do
557
552
  :four => { :default => "$two $three FOUR", :desc => "d"},
558
553
  :five => { :default => nil, :desc => "e" },
559
554
  :code => { :default => "", :desc => "my code"}
560
- Puppet::FileSystem.stubs(:exist?).returns true
555
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
561
556
  end
562
557
 
563
558
  it "should provide a mechanism for returning set values" do
@@ -614,7 +609,7 @@ describe Puppet::Settings do
614
609
 
615
610
  it "should not interpolate the value of the :code setting" do
616
611
  @code = @settings.setting(:code)
617
- @code.expects(:munge).never
612
+ expect(@code).not_to receive(:munge)
618
613
 
619
614
  expect(@settings[:code]).to eq("")
620
615
  end
@@ -638,7 +633,7 @@ describe Puppet::Settings do
638
633
  :config => { :type => :file, :default => "/my/file", :desc => "a" },
639
634
  :one => { :default => "ONE", :desc => "a" },
640
635
  :two => { :default => "TWO", :desc => "b" }
641
- Puppet::FileSystem.stubs(:exist?).returns true
636
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
642
637
  @settings.preferred_run_mode = :agent
643
638
  end
644
639
 
@@ -648,7 +643,7 @@ describe Puppet::Settings do
648
643
 
649
644
  it "should return values set on the cli before values set in the configuration file" do
650
645
  text = "[main]\none = fileval\n"
651
- @settings.stubs(:read_file).returns(text)
646
+ allow(@settings).to receive(:read_file).and_return(text)
652
647
  @settings.handlearg("--one", "clival")
653
648
  @settings.send(:parse_config_files)
654
649
 
@@ -657,7 +652,7 @@ describe Puppet::Settings do
657
652
 
658
653
  it "should return values set in the mode-specific section before values set in the main section" do
659
654
  text = "[main]\none = mainval\n[agent]\none = modeval\n"
660
- @settings.stubs(:read_file).returns(text)
655
+ allow(@settings).to receive(:read_file).and_return(text)
661
656
  @settings.send(:parse_config_files)
662
657
 
663
658
  expect(@settings[:one]).to eq("modeval")
@@ -665,7 +660,7 @@ describe Puppet::Settings do
665
660
 
666
661
  it "should not return values outside of its search path" do
667
662
  text = "[other]\none = oval\n"
668
- @settings.stubs(:read_file).returns(text)
663
+ allow(@settings).to receive(:read_file).and_return(text)
669
664
  @settings.send(:parse_config_files)
670
665
  expect(@settings[:one]).to eq("ONE")
671
666
  end
@@ -684,9 +679,9 @@ describe Puppet::Settings do
684
679
 
685
680
  describe "when root" do
686
681
  it "should look for the main config file default location config settings haven't been overridden'" do
687
- Puppet.features.stubs(:root?).returns(true)
688
- Puppet::FileSystem.expects(:exist?).with(main_config_file_default_location).returns(false)
689
- Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).never
682
+ allow(Puppet.features).to receive(:root?).and_return(true)
683
+ expect(Puppet::FileSystem).to receive(:exist?).with(main_config_file_default_location).and_return(false)
684
+ expect(Puppet::FileSystem).not_to receive(:exist?).with(user_config_file_default_location)
690
685
 
691
686
  @settings.send(:parse_config_files)
692
687
  end
@@ -694,10 +689,9 @@ describe Puppet::Settings do
694
689
 
695
690
  describe "when not root" do
696
691
  it "should look for user config file default location if config settings haven't been overridden'" do
697
- Puppet.features.stubs(:root?).returns(false)
692
+ allow(Puppet.features).to receive(:root?).and_return(false)
698
693
 
699
- seq = sequence "load config files"
700
- Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).returns(false).in_sequence(seq)
694
+ expect(Puppet::FileSystem).to receive(:exist?).with(user_config_file_default_location).and_return(false)
701
695
 
702
696
  @settings.send(:parse_config_files)
703
697
  end
@@ -705,26 +699,26 @@ describe Puppet::Settings do
705
699
 
706
700
  describe "when the file exists" do
707
701
  it "fails if the file is not readable" do
708
- Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).returns(true)
709
- @settings.expects(:read_file).raises('Permission denied')
702
+ expect(Puppet::FileSystem).to receive(:exist?).with(user_config_file_default_location).and_return(true)
703
+ expect(@settings).to receive(:read_file).and_raise('Permission denied')
710
704
 
711
705
  expect{ @settings.send(:parse_config_files) }.to raise_error(RuntimeError, /Could not load #{user_config_file_default_location}: Permission denied/)
712
706
  end
713
707
 
714
708
  it "does not fail if the file is not readable and when `require_config` is false" do
715
- Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).returns(true)
716
- @settings.expects(:read_file).raises('Permission denied')
709
+ expect(Puppet::FileSystem).to receive(:exist?).with(user_config_file_default_location).and_return(true)
710
+ expect(@settings).to receive(:read_file).and_raise('Permission denied')
717
711
 
718
- @settings.expects(:parse_config).never
719
- Puppet.expects(:log_exception)
712
+ expect(@settings).not_to receive(:parse_config)
713
+ expect(Puppet).to receive(:log_exception)
720
714
 
721
715
  expect{ @settings.send(:parse_config_files, false) }.not_to raise_error
722
716
  end
723
717
 
724
718
  it "reads the file if it is readable" do
725
- Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).returns(true)
726
- @settings.expects(:read_file).returns('server = host.string')
727
- @settings.expects(:parse_config)
719
+ expect(Puppet::FileSystem).to receive(:exist?).with(user_config_file_default_location).and_return(true)
720
+ expect(@settings).to receive(:read_file).and_return('server = host.string')
721
+ expect(@settings).to receive(:parse_config)
728
722
 
729
723
  @settings.send(:parse_config_files)
730
724
  end
@@ -732,8 +726,8 @@ describe Puppet::Settings do
732
726
 
733
727
  describe "when the file does not exist" do
734
728
  it "does not attempt to parse the config file" do
735
- Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).returns(false)
736
- @settings.expects(:parse_config).never
729
+ expect(Puppet::FileSystem).to receive(:exist?).with(user_config_file_default_location).and_return(false)
730
+ expect(@settings).not_to receive(:parse_config)
737
731
 
738
732
  @settings.send(:parse_config_files)
739
733
  end
@@ -743,8 +737,8 @@ describe Puppet::Settings do
743
737
  describe "when parsing its configuration" do
744
738
  before do
745
739
  @settings = Puppet::Settings.new
746
- @settings.stubs(:service_user_available?).returns true
747
- @settings.stubs(:service_group_available?).returns true
740
+ allow(@settings).to receive(:service_user_available?).and_return(true)
741
+ allow(@settings).to receive(:service_group_available?).and_return(true)
748
742
  @file = make_absolute("/some/file")
749
743
  @userconfig = make_absolute("/test/userconfigfile")
750
744
  @settings.define_settings :section, :user => { :default => "suser", :desc => "doc" }, :group => { :default => "sgroup", :desc => "doc" }
@@ -753,9 +747,9 @@ describe Puppet::Settings do
753
747
  :one => { :default => "ONE", :desc => "a" },
754
748
  :two => { :default => "$one TWO", :desc => "b" },
755
749
  :three => { :default => "$one $two THREE", :desc => "c" }
756
- @settings.stubs(:user_config_file).returns(@userconfig)
757
- Puppet::FileSystem.stubs(:exist?).with(@file).returns true
758
- Puppet::FileSystem.stubs(:exist?).with(@userconfig).returns false
750
+ allow(@settings).to receive(:user_config_file).and_return(@userconfig)
751
+ allow(Puppet::FileSystem).to receive(:exist?).with(@file).and_return(true)
752
+ allow(Puppet::FileSystem).to receive(:exist?).with(@userconfig).and_return(false)
759
753
  end
760
754
 
761
755
  it "should not ignore the report setting" do
@@ -767,27 +761,27 @@ describe Puppet::Settings do
767
761
  [puppetd]
768
762
  report=true
769
763
  CONF
770
- Puppet::FileSystem.expects(:exist?).with(myfile).returns(true)
771
- @settings.expects(:read_file).returns(text)
764
+ expect(Puppet::FileSystem).to receive(:exist?).with(myfile).and_return(true)
765
+ expect(@settings).to receive(:read_file).and_return(text)
772
766
  @settings.send(:parse_config_files)
773
767
  expect(@settings[:report]).to be_truthy
774
768
  end
775
769
 
776
770
  it "should use its current ':config' value for the file to parse" do
777
- myfile = make_absolute("/my/file") # do not stub expand_path here, as this leads to a stack overflow, when mocha tries to use it
771
+ myfile = make_absolute("/my/file")
778
772
  @settings[:config] = myfile
779
773
 
780
- Puppet::FileSystem.expects(:exist?).with(myfile).returns(true)
774
+ expect(Puppet::FileSystem).to receive(:exist?).with(myfile).and_return(true)
781
775
 
782
- Puppet::FileSystem.expects(:read).with(myfile, :encoding => 'utf-8').returns "[main]"
776
+ expect(Puppet::FileSystem).to receive(:read).with(myfile, :encoding => 'utf-8').and_return("[main]")
783
777
 
784
778
  @settings.send(:parse_config_files)
785
779
  end
786
780
 
787
781
  it "should not try to parse non-existent files" do
788
- Puppet::FileSystem.expects(:exist?).with(@file).returns false
782
+ expect(Puppet::FileSystem).to receive(:exist?).with(@file).and_return(false)
789
783
 
790
- File.expects(:read).with(@file).never
784
+ expect(File).not_to receive(:read).with(@file)
791
785
 
792
786
  @settings.send(:parse_config_files)
793
787
  end
@@ -796,7 +790,7 @@ describe Puppet::Settings do
796
790
  text = "[main]
797
791
  one = fileval
798
792
  "
799
- @settings.expects(:read_file).returns(text)
793
+ expect(@settings).to receive(:read_file).and_return(text)
800
794
  @settings.send(:parse_config_files)
801
795
  expect(@settings[:one]).to eq("fileval")
802
796
  end
@@ -804,7 +798,7 @@ describe Puppet::Settings do
804
798
  #484 - this should probably be in the regression area
805
799
  it "should not throw an exception on unknown parameters" do
806
800
  text = "[main]\nnosuchparam = mval\n"
807
- @settings.expects(:read_file).returns(text)
801
+ expect(@settings).to receive(:read_file).and_return(text)
808
802
  expect { @settings.send(:parse_config_files) }.not_to raise_error
809
803
  end
810
804
 
@@ -813,7 +807,7 @@ describe Puppet::Settings do
813
807
  one = true
814
808
  two = false
815
809
  "
816
- @settings.expects(:read_file).returns(text)
810
+ expect(@settings).to receive(:read_file).and_return(text)
817
811
  @settings.send(:parse_config_files)
818
812
  expect(@settings[:one]).to eq(true)
819
813
  expect(@settings[:two]).to eq(false)
@@ -823,7 +817,7 @@ describe Puppet::Settings do
823
817
  text = "[main]
824
818
  one = 65
825
819
  "
826
- @settings.expects(:read_file).returns(text)
820
+ expect(@settings).to receive(:read_file).and_return(text)
827
821
  @settings.send(:parse_config_files)
828
822
  expect(@settings[:one]).to eq(65)
829
823
  end
@@ -866,7 +860,7 @@ describe Puppet::Settings do
866
860
  text = "[master]
867
861
  myfile = #{otherfile} {mode = 664}
868
862
  "
869
- @settings.expects(:read_file).returns(text)
863
+ expect(@settings).to receive(:read_file).and_return(text)
870
864
 
871
865
  # will start initialization as user
872
866
  expect(@settings.preferred_run_mode).to eq(:user)
@@ -897,7 +891,7 @@ describe Puppet::Settings do
897
891
  [agent]
898
892
  myfile = #{file} {mode = 664}
899
893
  "
900
- @settings.expects(:read_file).returns(text)
894
+ expect(@settings).to receive(:read_file).and_return(text)
901
895
 
902
896
  # will start initialization as user
903
897
  expect(@settings.preferred_run_mode).to eq(:user)
@@ -919,7 +913,7 @@ describe Puppet::Settings do
919
913
  text = "[main]
920
914
  mysetting = setval
921
915
  "
922
- @settings.expects(:read_file).returns(text)
916
+ expect(@settings).to receive(:read_file).and_return(text)
923
917
  @settings.send(:parse_config_files)
924
918
  expect(values).to eq(["setval"])
925
919
  end
@@ -933,7 +927,7 @@ describe Puppet::Settings do
933
927
  [main]
934
928
  mysetting = other
935
929
  "
936
- @settings.expects(:read_file).returns(text)
930
+ expect(@settings).to receive(:read_file).and_return(text)
937
931
  @settings.send(:parse_config_files)
938
932
  expect(values).to eq(["setval"])
939
933
  end
@@ -946,7 +940,7 @@ describe Puppet::Settings do
946
940
  text = "[main]
947
941
  mysetting = $base/setval
948
942
  "
949
- @settings.expects(:read_file).returns(text)
943
+ expect(@settings).to receive(:read_file).and_return(text)
950
944
  @settings.send(:parse_config_files)
951
945
  expect(values).to eq(["yay/setval"])
952
946
  end
@@ -968,7 +962,7 @@ describe Puppet::Settings do
968
962
  deferred=$confdir/goose
969
963
  EOD
970
964
 
971
- @settings.stubs(:read_file).returns(text)
965
+ allow(@settings).to receive(:read_file).and_return(text)
972
966
  @settings.initialize_global_settings
973
967
 
974
968
  expect(hook_invoked).to be_falsey
@@ -993,7 +987,7 @@ describe Puppet::Settings do
993
987
  can_cause_problems=$confdir/goose
994
988
  EOD
995
989
 
996
- @settings.stubs(:read_file).returns(text)
990
+ allow(@settings).to receive(:read_file).and_return(text)
997
991
  @settings.initialize_global_settings
998
992
  @settings.initialize_app_defaults(:logdir => '/path/to/logdir', :confdir => '/path/to/confdir', :vardir => '/path/to/vardir', :codedir => '/path/to/codedir')
999
993
 
@@ -1006,7 +1000,7 @@ describe Puppet::Settings do
1006
1000
  text = "[main]
1007
1001
  myarg =
1008
1002
  "
1009
- @settings.stubs(:read_file).returns(text)
1003
+ allow(@settings).to receive(:read_file).and_return(text)
1010
1004
  @settings.send(:parse_config_files)
1011
1005
  expect(@settings[:myarg]).to eq("")
1012
1006
  end
@@ -1023,8 +1017,8 @@ describe Puppet::Settings do
1023
1017
  }
1024
1018
 
1025
1019
  def assert_accessing_setting_is_deprecated(settings, setting)
1026
- Puppet.expects(:deprecation_warning).with("Accessing '#{setting}' as a setting is deprecated.")
1027
- Puppet.expects(:deprecation_warning).with("Modifying '#{setting}' as a setting is deprecated.")
1020
+ expect(Puppet).to receive(:deprecation_warning).with("Accessing '#{setting}' as a setting is deprecated.")
1021
+ expect(Puppet).to receive(:deprecation_warning).with("Modifying '#{setting}' as a setting is deprecated.")
1028
1022
  settings[setting.intern] = apath = File.expand_path('foo')
1029
1023
  expect(settings[setting.intern]).to eq(apath)
1030
1024
  end
@@ -1051,7 +1045,7 @@ describe Puppet::Settings do
1051
1045
  end
1052
1046
 
1053
1047
  it "warns when set in puppet.conf" do
1054
- Puppet.expects(:deprecation_warning).with(regexp_matches(/completely_deprecated_setting is deprecated\./), 'setting-completely_deprecated_setting')
1048
+ expect(Puppet).to receive(:deprecation_warning).with(/completely_deprecated_setting is deprecated\./, 'setting-completely_deprecated_setting')
1055
1049
 
1056
1050
  completely_deprecated_settings.parse_config(<<-CONF)
1057
1051
  completely_deprecated_setting='should warn'
@@ -1060,7 +1054,7 @@ describe Puppet::Settings do
1060
1054
  end
1061
1055
 
1062
1056
  it "warns when set on the commandline" do
1063
- Puppet.expects(:deprecation_warning).with(regexp_matches(/completely_deprecated_setting is deprecated\./), 'setting-completely_deprecated_setting')
1057
+ expect(Puppet).to receive(:deprecation_warning).with(/completely_deprecated_setting is deprecated\./, 'setting-completely_deprecated_setting')
1064
1058
 
1065
1059
  args = ["--completely_deprecated_setting", "/some/value"]
1066
1060
  completely_deprecated_settings.send(:parse_global_options, args)
@@ -1085,7 +1079,7 @@ describe Puppet::Settings do
1085
1079
  end
1086
1080
 
1087
1081
  it "warns for a deprecated setting allowed on the command line set in puppet.conf" do
1088
- Puppet.expects(:deprecation_warning).with(regexp_matches(/partially_deprecated_setting is deprecated in puppet\.conf/), 'puppet-conf-setting-partially_deprecated_setting')
1082
+ expect(Puppet).to receive(:deprecation_warning).with(/partially_deprecated_setting is deprecated in puppet\.conf/, 'puppet-conf-setting-partially_deprecated_setting')
1089
1083
  partially_deprecated_settings.parse_config(<<-CONF)
1090
1084
  partially_deprecated_setting='should warn'
1091
1085
  CONF
@@ -1093,7 +1087,7 @@ describe Puppet::Settings do
1093
1087
  end
1094
1088
 
1095
1089
  it "does not warn when manifest is set on command line" do
1096
- Puppet.expects(:deprecation_warning).never
1090
+ expect(Puppet).not_to receive(:deprecation_warning)
1097
1091
 
1098
1092
  args = ["--partially_deprecated_setting", "/some/value"]
1099
1093
  partially_deprecated_settings.send(:parse_global_options, args)
@@ -1110,7 +1104,6 @@ describe Puppet::Settings do
1110
1104
  describe "when there are multiple config files" do
1111
1105
  let(:main_config_text) { "[main]\none = main\ntwo = main2" }
1112
1106
  let(:user_config_text) { "[main]\none = user\n" }
1113
- let(:seq) { sequence "config_file_sequence" }
1114
1107
 
1115
1108
  before :each do
1116
1109
  @settings = Puppet::Settings.new
@@ -1123,13 +1116,13 @@ describe Puppet::Settings do
1123
1116
 
1124
1117
  context "running non-root without explicit config file" do
1125
1118
  before :each do
1126
- Puppet.features.stubs(:root?).returns(false)
1127
- Puppet::FileSystem.expects(:exist?).
1119
+ allow(Puppet.features).to receive(:root?).and_return(false)
1120
+ expect(Puppet::FileSystem).to receive(:exist?).
1128
1121
  with(user_config_file_default_location).
1129
- returns(true).in_sequence(seq)
1130
- @settings.expects(:read_file).
1122
+ and_return(true).ordered
1123
+ expect(@settings).to receive(:read_file).
1131
1124
  with(user_config_file_default_location).
1132
- returns(user_config_text).in_sequence(seq)
1125
+ and_return(user_config_text).ordered
1133
1126
  end
1134
1127
 
1135
1128
  it "should return values from the user config file" do
@@ -1145,13 +1138,13 @@ describe Puppet::Settings do
1145
1138
 
1146
1139
  context "running as root without explicit config file" do
1147
1140
  before :each do
1148
- Puppet.features.stubs(:root?).returns(true)
1149
- Puppet::FileSystem.expects(:exist?).
1141
+ allow(Puppet.features).to receive(:root?).and_return(true)
1142
+ expect(Puppet::FileSystem).to receive(:exist?).
1150
1143
  with(main_config_file_default_location).
1151
- returns(true).in_sequence(seq)
1152
- @settings.expects(:read_file).
1144
+ and_return(true).ordered
1145
+ expect(@settings).to receive(:read_file).
1153
1146
  with(main_config_file_default_location).
1154
- returns(main_config_text).in_sequence(seq)
1147
+ and_return(main_config_text).ordered
1155
1148
  end
1156
1149
 
1157
1150
  it "should return values from the main config file" do
@@ -1167,14 +1160,14 @@ describe Puppet::Settings do
1167
1160
 
1168
1161
  context "running with an explicit config file as a user (e.g. Apache + Passenger)" do
1169
1162
  before :each do
1170
- Puppet.features.stubs(:root?).returns(false)
1163
+ allow(Puppet.features).to receive(:root?).and_return(false)
1171
1164
  @settings[:confdir] = File.dirname(main_config_file_default_location)
1172
- Puppet::FileSystem.expects(:exist?).
1165
+ expect(Puppet::FileSystem).to receive(:exist?).
1173
1166
  with(main_config_file_default_location).
1174
- returns(true).in_sequence(seq)
1175
- @settings.expects(:read_file).
1167
+ and_return(true).ordered
1168
+ expect(@settings).to receive(:read_file).
1176
1169
  with(main_config_file_default_location).
1177
- returns(main_config_text).in_sequence(seq)
1170
+ and_return(main_config_text).ordered
1178
1171
  end
1179
1172
 
1180
1173
  it "should return values from the main config file" do
@@ -1199,16 +1192,16 @@ describe Puppet::Settings do
1199
1192
  :one => { :default => "ONE", :desc => "a" },
1200
1193
  :two => { :default => "$one TWO", :desc => "b" },
1201
1194
  :three => { :default => "$one $two THREE", :desc => "c" }
1202
- Puppet::FileSystem.stubs(:exist?).with(@file).returns true
1203
- Puppet::FileSystem.stubs(:exist?).with(@userconfig).returns false
1204
- @settings.stubs(:user_config_file).returns(@userconfig)
1195
+ allow(Puppet::FileSystem).to receive(:exist?).with(@file).and_return(true)
1196
+ allow(Puppet::FileSystem).to receive(:exist?).with(@userconfig).and_return(false)
1197
+ allow(@settings).to receive(:user_config_file).and_return(@userconfig)
1205
1198
  end
1206
1199
 
1207
1200
  it "does not create the WatchedFile instance and should not parse if the file does not exist" do
1208
- Puppet::FileSystem.expects(:exist?).with(@file).returns false
1209
- Puppet::Util::WatchedFile.expects(:new).never
1201
+ expect(Puppet::FileSystem).to receive(:exist?).with(@file).and_return(false)
1202
+ expect(Puppet::Util::WatchedFile).not_to receive(:new)
1210
1203
 
1211
- @settings.expects(:parse_config_files).never
1204
+ expect(@settings).not_to receive(:parse_config_files)
1212
1205
 
1213
1206
  @settings.reparse_config_files
1214
1207
  end
@@ -1216,38 +1209,38 @@ describe Puppet::Settings do
1216
1209
  context "and watched file exists" do
1217
1210
  before do
1218
1211
  @watched_file = Puppet::Util::WatchedFile.new(@file)
1219
- Puppet::Util::WatchedFile.expects(:new).with(@file).returns @watched_file
1212
+ expect(Puppet::Util::WatchedFile).to receive(:new).with(@file).and_return(@watched_file)
1220
1213
  end
1221
1214
 
1222
1215
  it "uses a WatchedFile instance to determine if the file has changed" do
1223
- @watched_file.expects(:changed?)
1216
+ expect(@watched_file).to receive(:changed?)
1224
1217
 
1225
1218
  @settings.reparse_config_files
1226
1219
  end
1227
1220
 
1228
1221
  it "does not reparse if the file has not changed" do
1229
- @watched_file.expects(:changed?).returns false
1222
+ expect(@watched_file).to receive(:changed?).and_return(false)
1230
1223
 
1231
- @settings.expects(:parse_config_files).never
1224
+ expect(@settings).not_to receive(:parse_config_files)
1232
1225
 
1233
1226
  @settings.reparse_config_files
1234
1227
  end
1235
1228
 
1236
1229
  it "reparses if the file has changed" do
1237
- @watched_file.expects(:changed?).returns true
1230
+ expect(@watched_file).to receive(:changed?).and_return(true)
1238
1231
 
1239
- @settings.expects(:parse_config_files)
1232
+ expect(@settings).to receive(:parse_config_files)
1240
1233
 
1241
1234
  @settings.reparse_config_files
1242
1235
  end
1243
1236
 
1244
1237
  it "replaces in-memory values with on-file values" do
1245
- @watched_file.stubs(:changed?).returns(true)
1238
+ allow(@watched_file).to receive(:changed?).and_return(true)
1246
1239
  @settings[:one] = "init"
1247
1240
 
1248
1241
  # Now replace the value
1249
1242
  text = "[main]\none = disk-replace\n"
1250
- @settings.stubs(:read_file).returns(text)
1243
+ allow(@settings).to receive(:read_file).and_return(text)
1251
1244
  @settings.reparse_config_files
1252
1245
  expect(@settings[:one]).to eq("disk-replace")
1253
1246
  end
@@ -1257,7 +1250,7 @@ describe Puppet::Settings do
1257
1250
  @settings.handlearg("--one", "clival")
1258
1251
 
1259
1252
  text = "[main]\none = on-disk\n"
1260
- @settings.stubs(:read_file).returns(text)
1253
+ allow(@settings).to receive(:read_file).and_return(text)
1261
1254
  @settings.send(:parse_config_files)
1262
1255
 
1263
1256
  expect(@settings[:one]).to eq("clival")
@@ -1266,13 +1259,13 @@ describe Puppet::Settings do
1266
1259
  it "should remove in-memory values that are no longer set in the file" do
1267
1260
  # Init the value
1268
1261
  text = "[main]\none = disk-init\n"
1269
- @settings.expects(:read_file).returns(text)
1262
+ expect(@settings).to receive(:read_file).and_return(text)
1270
1263
  @settings.send(:parse_config_files)
1271
1264
  expect(@settings[:one]).to eq("disk-init")
1272
1265
 
1273
1266
  # Now replace the value
1274
1267
  text = "[main]\ntwo = disk-replace\n"
1275
- @settings.expects(:read_file).returns(text)
1268
+ expect(@settings).to receive(:read_file).and_return(text)
1276
1269
  @settings.send(:parse_config_files)
1277
1270
 
1278
1271
  # The originally-overridden value should be replaced with the default
@@ -1285,13 +1278,13 @@ describe Puppet::Settings do
1285
1278
  it "should retain in-memory values if the file has a syntax error" do
1286
1279
  # Init the value
1287
1280
  text = "[main]\none = initial-value\n"
1288
- @settings.expects(:read_file).with(@file).returns(text)
1281
+ expect(@settings).to receive(:read_file).with(@file).and_return(text)
1289
1282
  @settings.send(:parse_config_files)
1290
1283
  expect(@settings[:one]).to eq("initial-value")
1291
1284
 
1292
1285
  # Now replace the value with something bogus
1293
1286
  text = "[main]\nkenny = killed-by-what-follows\n1 is 2, blah blah florp\n"
1294
- @settings.expects(:read_file).with(@file).returns(text)
1287
+ expect(@settings).to receive(:read_file).with(@file).and_return(text)
1295
1288
  @settings.send(:parse_config_files)
1296
1289
 
1297
1290
  # The originally-overridden value should not be replaced with the default
@@ -1309,7 +1302,7 @@ describe Puppet::Settings do
1309
1302
  describe "when creating a catalog" do
1310
1303
  before do
1311
1304
  @settings = Puppet::Settings.new
1312
- @settings.stubs(:service_user_available?).returns true
1305
+ allow(@settings).to receive(:service_user_available?).and_return(true)
1313
1306
  @prefix = Puppet.features.posix? ? "" : "C:"
1314
1307
  end
1315
1308
 
@@ -1343,15 +1336,15 @@ describe Puppet::Settings do
1343
1336
 
1344
1337
  it "should ignore files whose :to_resource method returns nil" do
1345
1338
  @settings.define_settings :main, :maindir => { :type => :directory, :default => @prefix+"/maindir", :desc => "a" }
1346
- @settings.setting(:maindir).expects(:to_resource).returns nil
1339
+ expect(@settings.setting(:maindir)).to receive(:to_resource).and_return(nil)
1347
1340
 
1348
- Puppet::Resource::Catalog.any_instance.expects(:add_resource).never
1341
+ expect_any_instance_of(Puppet::Resource::Catalog).not_to receive(:add_resource)
1349
1342
  @settings.to_catalog
1350
1343
  end
1351
1344
 
1352
1345
  describe "on Microsoft Windows", :if => Puppet::Util::Platform.windows? do
1353
1346
  before :each do
1354
- Puppet.features.stubs(:root?).returns true
1347
+ allow(Puppet.features).to receive(:root?).and_return(true)
1355
1348
 
1356
1349
  @settings.define_settings :foo,
1357
1350
  :mkusers => { :type => :boolean, :default => true, :desc => "e" },
@@ -1400,7 +1393,7 @@ describe Puppet::Settings do
1400
1393
  envpath = "#{envdir}#{File::PATH_SEPARATOR}/some/other/envdir"
1401
1394
  @settings[:environmentpath] = envpath
1402
1395
  Dir.mkdir(envdir)
1403
- Puppet.features.stubs(:root?).returns false
1396
+ allow(Puppet.features).to receive(:root?).and_return(false)
1404
1397
  catalog = @settings.to_catalog
1405
1398
  resource = catalog.resource('File', File.join(envdir, 'production'))
1406
1399
  expect(resource[:mode]).to eq('0750')
@@ -1413,9 +1406,9 @@ describe Puppet::Settings do
1413
1406
  envpath = "#{envdir}#{File::PATH_SEPARATOR}/some/other/envdir"
1414
1407
  @settings[:environmentpath] = envpath
1415
1408
  Dir.mkdir(envdir)
1416
- Puppet.features.stubs(:root?).returns true
1417
- @settings.stubs(:service_user_available?).returns true
1418
- @settings.stubs(:service_group_available?).returns true
1409
+ allow(Puppet.features).to receive(:root?).and_return(true)
1410
+ allow(@settings).to receive(:service_user_available?).and_return(true)
1411
+ allow(@settings).to receive(:service_group_available?).and_return(true)
1419
1412
  catalog = @settings.to_catalog
1420
1413
  resource = catalog.resource('File', File.join(envdir, 'production'))
1421
1414
  expect(resource[:mode]).to eq('0750')
@@ -1428,9 +1421,9 @@ describe Puppet::Settings do
1428
1421
  envpath = "#{envdir}#{File::PATH_SEPARATOR}/some/other/envdir"
1429
1422
  @settings[:environmentpath] = envpath
1430
1423
  Dir.mkdir(envdir)
1431
- Puppet.features.stubs(:root?).returns true
1432
- @settings.stubs(:service_user_available?).returns false
1433
- @settings.stubs(:service_group_available?).returns false
1424
+ allow(Puppet.features).to receive(:root?).and_return(true)
1425
+ allow(@settings).to receive(:service_user_available?).and_return(false)
1426
+ allow(@settings).to receive(:service_group_available?).and_return(false)
1434
1427
  catalog = @settings.to_catalog
1435
1428
  resource = catalog.resource('File', File.join(envdir, 'production'))
1436
1429
  expect(resource[:mode]).to eq('0750')
@@ -1471,9 +1464,9 @@ describe Puppet::Settings do
1471
1464
  end
1472
1465
 
1473
1466
  before do
1474
- Puppet.features.stubs(:root?).returns true
1467
+ allow(Puppet.features).to receive(:root?).and_return(true)
1475
1468
  # stubbed to false, as Windows catalogs don't add users / groups
1476
- Puppet::Util::Platform.stubs(:windows?).returns false
1469
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
1477
1470
 
1478
1471
  @settings.define_settings :foo,
1479
1472
  :mkusers => { :type => :boolean, :default => true, :desc => "e" },
@@ -1497,7 +1490,7 @@ describe Puppet::Settings do
1497
1490
  end
1498
1491
 
1499
1492
  it "should not add users or groups to the catalog if :mkusers not running as root" do
1500
- Puppet.features.stubs(:root?).returns false
1493
+ allow(Puppet.features).to receive(:root?).and_return(false)
1501
1494
 
1502
1495
  catalog = @settings.to_catalog
1503
1496
  expect(catalog.resource(:user, "suser")).to be_nil
@@ -1505,7 +1498,7 @@ describe Puppet::Settings do
1505
1498
  end
1506
1499
 
1507
1500
  it "should not add users or groups to the catalog if :mkusers is not a valid setting" do
1508
- Puppet.features.stubs(:root?).returns true
1501
+ allow(Puppet.features).to receive(:root?).and_return(true)
1509
1502
  settings = Puppet::Settings.new
1510
1503
  settings.define_settings :other, :otherdir => {:type => :directory, :default => "/otherdir", :desc => "a", :owner => "service", :group => "service"}
1511
1504
 
@@ -1516,8 +1509,8 @@ describe Puppet::Settings do
1516
1509
 
1517
1510
  it "should not add users or groups to the catalog if :mkusers is a valid setting but is disabled" do
1518
1511
  @settings[:mkusers] = false
1519
- @settings.stubs(:service_user_available?).returns(false)
1520
- @settings.stubs(:service_group_available?).returns(false)
1512
+ allow(@settings).to receive(:service_user_available?).and_return(false)
1513
+ allow(@settings).to receive(:service_group_available?).and_return(false)
1521
1514
 
1522
1515
  catalog = @settings.to_catalog
1523
1516
  expect(catalog.resource(:user, "suser")).to be_nil
@@ -1541,7 +1534,7 @@ describe Puppet::Settings do
1541
1534
  end
1542
1535
 
1543
1536
  it "should not attempt to manage the root user" do
1544
- Puppet.features.stubs(:root?).returns true
1537
+ allow(Puppet.features).to receive(:root?).and_return(true)
1545
1538
  @settings.define_settings :foo, :foodir => {:type => :directory, :default => "/foodir", :desc => "a", :owner => "root", :group => "service"}
1546
1539
 
1547
1540
  expect(@settings.to_catalog.resource(:user, "root")).to be_nil
@@ -1560,15 +1553,15 @@ describe Puppet::Settings do
1560
1553
  :maindir => { :type => :directory, :default => "/maindir", :desc => "a"},
1561
1554
  :seconddir => { :type => :directory, :default => "/seconddir", :desc => "a"}
1562
1555
 
1563
- main = stub 'main_resource', :ref => "File[/maindir]"
1564
- main.expects(:to_manifest).returns "maindir"
1565
- main.expects(:'[]').with(:alias).returns nil
1566
- second = stub 'second_resource', :ref => "File[/seconddir]"
1567
- second.expects(:to_manifest).returns "seconddir"
1568
- second.expects(:'[]').with(:alias).returns nil
1556
+ main = double('main_resource', :ref => "File[/maindir]")
1557
+ expect(main).to receive(:to_manifest).and_return("maindir")
1558
+ expect(main).to receive(:'[]').with(:alias).and_return(nil)
1559
+ second = double('second_resource', :ref => "File[/seconddir]")
1560
+ expect(second).to receive(:to_manifest).and_return("seconddir")
1561
+ expect(second).to receive(:'[]').with(:alias).and_return(nil)
1569
1562
 
1570
- @settings.setting(:maindir).expects(:to_resource).returns main
1571
- @settings.setting(:seconddir).expects(:to_resource).returns second
1563
+ expect(@settings.setting(:maindir)).to receive(:to_resource).and_return(main)
1564
+ expect(@settings.setting(:seconddir)).to receive(:to_resource).and_return(second)
1572
1565
 
1573
1566
  expect(@settings.to_manifest.split("\n\n").sort).to eq(%w{maindir seconddir})
1574
1567
  end
@@ -1577,8 +1570,8 @@ describe Puppet::Settings do
1577
1570
  describe "when using sections of the configuration to manage the local host" do
1578
1571
  before do
1579
1572
  @settings = Puppet::Settings.new
1580
- @settings.stubs(:service_user_available?).returns true
1581
- @settings.stubs(:service_group_available?).returns true
1573
+ allow(@settings).to receive(:service_user_available?).and_return(true)
1574
+ allow(@settings).to receive(:service_group_available?).and_return(true)
1582
1575
  @settings.define_settings :main, :noop => { :default => false, :desc => "", :type => :boolean }
1583
1576
  @settings.define_settings :main,
1584
1577
  :maindir => { :type => :directory, :default => make_absolute("/maindir"), :desc => "a" },
@@ -1590,44 +1583,44 @@ describe Puppet::Settings do
1590
1583
  end
1591
1584
 
1592
1585
  it "should create a catalog with the specified sections" do
1593
- @settings.expects(:to_catalog).with(:main, :other).returns Puppet::Resource::Catalog.new("foo")
1586
+ expect(@settings).to receive(:to_catalog).with(:main, :other).and_return(Puppet::Resource::Catalog.new("foo"))
1594
1587
  @settings.use(:main, :other)
1595
1588
  end
1596
1589
 
1597
1590
  it "should canonicalize the sections" do
1598
- @settings.expects(:to_catalog).with(:main, :other).returns Puppet::Resource::Catalog.new("foo")
1591
+ expect(@settings).to receive(:to_catalog).with(:main, :other).and_return(Puppet::Resource::Catalog.new("foo"))
1599
1592
  @settings.use("main", "other")
1600
1593
  end
1601
1594
 
1602
1595
  it "should ignore sections that have already been used" do
1603
- @settings.expects(:to_catalog).with(:main).returns Puppet::Resource::Catalog.new("foo")
1596
+ expect(@settings).to receive(:to_catalog).with(:main).and_return(Puppet::Resource::Catalog.new("foo"))
1604
1597
  @settings.use(:main)
1605
- @settings.expects(:to_catalog).with(:other).returns Puppet::Resource::Catalog.new("foo")
1598
+ expect(@settings).to receive(:to_catalog).with(:other).and_return(Puppet::Resource::Catalog.new("foo"))
1606
1599
  @settings.use(:main, :other)
1607
1600
  end
1608
1601
 
1609
1602
  it "should convert the created catalog to a RAL catalog" do
1610
1603
  @catalog = Puppet::Resource::Catalog.new("foo")
1611
- @settings.expects(:to_catalog).with(:main).returns @catalog
1604
+ expect(@settings).to receive(:to_catalog).with(:main).and_return(@catalog)
1612
1605
 
1613
- @catalog.expects(:to_ral).returns @catalog
1606
+ expect(@catalog).to receive(:to_ral).and_return(@catalog)
1614
1607
  @settings.use(:main)
1615
1608
  end
1616
1609
 
1617
1610
  it "should specify that it is not managing a host catalog" do
1618
1611
  catalog = Puppet::Resource::Catalog.new("foo")
1619
- catalog.expects(:apply)
1620
- @settings.expects(:to_catalog).returns catalog
1612
+ expect(catalog).to receive(:apply)
1613
+ expect(@settings).to receive(:to_catalog).and_return(catalog)
1621
1614
 
1622
- catalog.stubs(:to_ral).returns catalog
1615
+ allow(catalog).to receive(:to_ral).and_return(catalog)
1623
1616
 
1624
- catalog.expects(:host_config=).with false
1617
+ expect(catalog).to receive(:host_config=).with(false)
1625
1618
 
1626
1619
  @settings.use(:main)
1627
1620
  end
1628
1621
 
1629
1622
  it "should support a method for re-using all currently used sections" do
1630
- @settings.expects(:to_catalog).with(:main, :third).times(2).returns Puppet::Resource::Catalog.new("foo")
1623
+ expect(@settings).to receive(:to_catalog).with(:main, :third).exactly(2).times.and_return(Puppet::Resource::Catalog.new("foo"))
1631
1624
 
1632
1625
  @settings.use(:main, :third)
1633
1626
  @settings.reuse
@@ -1635,13 +1628,13 @@ describe Puppet::Settings do
1635
1628
 
1636
1629
  it "should fail with an appropriate message if any resources fail" do
1637
1630
  @catalog = Puppet::Resource::Catalog.new("foo")
1638
- @catalog.stubs(:to_ral).returns @catalog
1639
- @settings.expects(:to_catalog).returns @catalog
1631
+ allow(@catalog).to receive(:to_ral).and_return(@catalog)
1632
+ expect(@settings).to receive(:to_catalog).and_return(@catalog)
1640
1633
 
1641
- @trans = mock("transaction")
1642
- @catalog.expects(:apply).yields(@trans)
1634
+ @trans = double("transaction")
1635
+ expect(@catalog).to receive(:apply).and_yield(@trans)
1643
1636
 
1644
- @trans.expects(:any_failed?).returns(true)
1637
+ expect(@trans).to receive(:any_failed?).and_return(true)
1645
1638
 
1646
1639
  resource = Puppet::Type.type(:notify).new(:title => 'failed')
1647
1640
  status = Puppet::Resource::Status.new(resource)
@@ -1654,9 +1647,9 @@ describe Puppet::Settings do
1654
1647
  report = Puppet::Transaction::Report.new('apply')
1655
1648
  report.add_resource_status(status)
1656
1649
 
1657
- @trans.expects(:report).returns report
1650
+ expect(@trans).to receive(:report).and_return(report)
1658
1651
 
1659
- @settings.expects(:raise).with(includes("My failure"))
1652
+ expect(@settings).to receive(:raise).with(/My failure/)
1660
1653
  @settings.use(:whatever)
1661
1654
  end
1662
1655
  end
@@ -1665,10 +1658,10 @@ describe Puppet::Settings do
1665
1658
  before do
1666
1659
  @settings = Puppet::Settings.new
1667
1660
  #these are the magic default values
1668
- @settings.stubs(:value).with(:configprint).returns("")
1669
- @settings.stubs(:value).with(:genconfig).returns(false)
1670
- @settings.stubs(:value).with(:genmanifest).returns(false)
1671
- @settings.stubs(:value).with(:environment).returns(nil)
1661
+ allow(@settings).to receive(:value).with(:configprint).and_return("")
1662
+ allow(@settings).to receive(:value).with(:genconfig).and_return(false)
1663
+ allow(@settings).to receive(:value).with(:genmanifest).and_return(false)
1664
+ allow(@settings).to receive(:value).with(:environment).and_return(nil)
1672
1665
  end
1673
1666
 
1674
1667
  describe "when checking print_config?" do
@@ -1677,17 +1670,17 @@ describe Puppet::Settings do
1677
1670
  end
1678
1671
 
1679
1672
  it "should return true when :configprint has a value" do
1680
- @settings.stubs(:value).with(:configprint).returns("something")
1673
+ allow(@settings).to receive(:value).with(:configprint).and_return("something")
1681
1674
  expect(@settings.print_configs?).to be_truthy
1682
1675
  end
1683
1676
 
1684
1677
  it "should return true when :genconfig has a value" do
1685
- @settings.stubs(:value).with(:genconfig).returns(true)
1678
+ allow(@settings).to receive(:value).with(:genconfig).and_return(true)
1686
1679
  expect(@settings.print_configs?).to be_truthy
1687
1680
  end
1688
1681
 
1689
1682
  it "should return true when :genmanifest has a value" do
1690
- @settings.stubs(:value).with(:genmanifest).returns(true)
1683
+ allow(@settings).to receive(:value).with(:genmanifest).and_return(true)
1691
1684
  expect(@settings.print_configs?).to be_truthy
1692
1685
  end
1693
1686
  end
@@ -1695,87 +1688,87 @@ describe Puppet::Settings do
1695
1688
  describe "when printing configs" do
1696
1689
  describe "when :configprint has a value" do
1697
1690
  it "should call print_config_options" do
1698
- @settings.stubs(:value).with(:configprint).returns("something")
1699
- @settings.expects(:print_config_options)
1691
+ allow(@settings).to receive(:value).with(:configprint).and_return("something")
1692
+ expect(@settings).to receive(:print_config_options)
1700
1693
  @settings.print_configs
1701
1694
  end
1702
1695
 
1703
1696
  it "should get the value of the option using the environment" do
1704
- @settings.stubs(:value).with(:configprint).returns("something")
1705
- @settings.stubs(:include?).with("something").returns(true)
1706
- @settings.expects(:value).with(:environment).returns("env")
1707
- @settings.expects(:value).with("something", "env").returns("foo")
1708
- @settings.stubs(:puts).with("foo")
1697
+ allow(@settings).to receive(:value).with(:configprint).and_return("something")
1698
+ allow(@settings).to receive(:include?).with("something").and_return(true)
1699
+ expect(@settings).to receive(:value).with(:environment).and_return("env")
1700
+ expect(@settings).to receive(:value).with("something", "env").and_return("foo")
1701
+ allow(@settings).to receive(:puts).with("foo")
1709
1702
  @settings.print_configs
1710
1703
  end
1711
1704
 
1712
1705
  it "should print the value of the option" do
1713
- @settings.stubs(:value).with(:configprint).returns("something")
1714
- @settings.stubs(:include?).with("something").returns(true)
1715
- @settings.stubs(:value).with("something", nil).returns("foo")
1716
- @settings.expects(:puts).with("foo")
1706
+ allow(@settings).to receive(:value).with(:configprint).and_return("something")
1707
+ allow(@settings).to receive(:include?).with("something").and_return(true)
1708
+ allow(@settings).to receive(:value).with("something", nil).and_return("foo")
1709
+ expect(@settings).to receive(:puts).with("foo")
1717
1710
  @settings.print_configs
1718
1711
  end
1719
1712
 
1720
1713
  it "should print the value pairs if there are multiple options" do
1721
- @settings.stubs(:value).with(:configprint).returns("bar,baz")
1722
- @settings.stubs(:include?).with("bar").returns(true)
1723
- @settings.stubs(:include?).with("baz").returns(true)
1724
- @settings.stubs(:value).with("bar", nil).returns("foo")
1725
- @settings.stubs(:value).with("baz", nil).returns("fud")
1726
- @settings.expects(:puts).with("bar = foo")
1727
- @settings.expects(:puts).with("baz = fud")
1714
+ allow(@settings).to receive(:value).with(:configprint).and_return("bar,baz")
1715
+ allow(@settings).to receive(:include?).with("bar").and_return(true)
1716
+ allow(@settings).to receive(:include?).with("baz").and_return(true)
1717
+ allow(@settings).to receive(:value).with("bar", nil).and_return("foo")
1718
+ allow(@settings).to receive(:value).with("baz", nil).and_return("fud")
1719
+ expect(@settings).to receive(:puts).with("bar = foo")
1720
+ expect(@settings).to receive(:puts).with("baz = fud")
1728
1721
  @settings.print_configs
1729
1722
  end
1730
1723
 
1731
1724
  it "should return true after printing" do
1732
- @settings.stubs(:value).with(:configprint).returns("something")
1733
- @settings.stubs(:include?).with("something").returns(true)
1734
- @settings.stubs(:value).with("something", nil).returns("foo")
1735
- @settings.stubs(:puts).with("foo")
1725
+ allow(@settings).to receive(:value).with(:configprint).and_return("something")
1726
+ allow(@settings).to receive(:include?).with("something").and_return(true)
1727
+ allow(@settings).to receive(:value).with("something", nil).and_return("foo")
1728
+ allow(@settings).to receive(:puts).with("foo")
1736
1729
  expect(@settings.print_configs).to be_truthy
1737
1730
  end
1738
1731
 
1739
1732
  it "should return false if a config param is not found" do
1740
- @settings.stubs :puts
1741
- @settings.stubs(:value).with(:configprint).returns("something")
1742
- @settings.stubs(:include?).with("something").returns(false)
1733
+ allow(@settings).to receive(:puts)
1734
+ allow(@settings).to receive(:value).with(:configprint).and_return("something")
1735
+ allow(@settings).to receive(:include?).with("something").and_return(false)
1743
1736
  expect(@settings.print_configs).to be_falsey
1744
1737
  end
1745
1738
  end
1746
1739
 
1747
1740
  describe "when genconfig is true" do
1748
1741
  before do
1749
- @settings.stubs :puts
1742
+ allow(@settings).to receive(:puts)
1750
1743
  end
1751
1744
 
1752
1745
  it "should call to_config" do
1753
- @settings.stubs(:value).with(:genconfig).returns(true)
1754
- @settings.expects(:to_config)
1746
+ allow(@settings).to receive(:value).with(:genconfig).and_return(true)
1747
+ expect(@settings).to receive(:to_config)
1755
1748
  @settings.print_configs
1756
1749
  end
1757
1750
 
1758
1751
  it "should return true from print_configs" do
1759
- @settings.stubs(:value).with(:genconfig).returns(true)
1760
- @settings.stubs(:to_config)
1752
+ allow(@settings).to receive(:value).with(:genconfig).and_return(true)
1753
+ allow(@settings).to receive(:to_config)
1761
1754
  expect(@settings.print_configs).to be_truthy
1762
1755
  end
1763
1756
  end
1764
1757
 
1765
1758
  describe "when genmanifest is true" do
1766
1759
  before do
1767
- @settings.stubs :puts
1760
+ allow(@settings).to receive(:puts)
1768
1761
  end
1769
1762
 
1770
1763
  it "should call to_config" do
1771
- @settings.stubs(:value).with(:genmanifest).returns(true)
1772
- @settings.expects(:to_manifest)
1764
+ allow(@settings).to receive(:value).with(:genmanifest).and_return(true)
1765
+ expect(@settings).to receive(:to_manifest)
1773
1766
  @settings.print_configs
1774
1767
  end
1775
1768
 
1776
1769
  it "should return true from print_configs" do
1777
- @settings.stubs(:value).with(:genmanifest).returns(true)
1778
- @settings.stubs(:to_manifest)
1770
+ allow(@settings).to receive(:value).with(:genmanifest).and_return(true)
1771
+ allow(@settings).to receive(:to_manifest)
1779
1772
  expect(@settings.print_configs).to be_truthy
1780
1773
  end
1781
1774
  end
@@ -1790,8 +1783,8 @@ describe Puppet::Settings do
1790
1783
  end
1791
1784
 
1792
1785
  def a_user_type_for(username)
1793
- user = mock 'user'
1794
- Puppet::Type.type(:user).expects(:new).with { |args| args[:name] == username }.returns user
1786
+ user = double('user')
1787
+ expect(Puppet::Type.type(:user)).to receive(:new).with(hash_including(name: username)).and_return(user)
1795
1788
  user
1796
1789
  end
1797
1790
 
@@ -1802,7 +1795,7 @@ describe Puppet::Settings do
1802
1795
  it "should return false if the user provider says the user is missing" do
1803
1796
  settings[:user] = "foo"
1804
1797
 
1805
- a_user_type_for("foo").expects(:exists?).returns false
1798
+ expect(a_user_type_for("foo")).to receive(:exists?).and_return(false)
1806
1799
 
1807
1800
  expect(settings).not_to be_service_user_available
1808
1801
  end
@@ -1810,7 +1803,7 @@ describe Puppet::Settings do
1810
1803
  it "should return true if the user provider says the user is present" do
1811
1804
  settings[:user] = "foo"
1812
1805
 
1813
- a_user_type_for("foo").expects(:exists?).returns true
1806
+ expect(a_user_type_for("foo")).to receive(:exists?).and_return(true)
1814
1807
 
1815
1808
  expect(settings).to be_service_user_available
1816
1809
  end
@@ -1818,7 +1811,7 @@ describe Puppet::Settings do
1818
1811
  it "caches the result of determining if the user is present" do
1819
1812
  settings[:user] = "foo"
1820
1813
 
1821
- a_user_type_for("foo").expects(:exists?).returns true
1814
+ expect(a_user_type_for("foo")).to receive(:exists?).and_return(true)
1822
1815
  expect(settings).to be_service_user_available
1823
1816
 
1824
1817
  expect(settings).to be_service_user_available
@@ -1833,8 +1826,8 @@ describe Puppet::Settings do
1833
1826
  end
1834
1827
 
1835
1828
  def a_group_type_for(groupname)
1836
- group = mock 'group'
1837
- Puppet::Type.type(:group).expects(:new).with { |args| args[:name] == groupname }.returns group
1829
+ group = double('group')
1830
+ expect(Puppet::Type.type(:group)).to receive(:new).with(hash_including(name: groupname)).and_return(group)
1838
1831
  group
1839
1832
  end
1840
1833
 
@@ -1845,7 +1838,7 @@ describe Puppet::Settings do
1845
1838
  it "should return false if the group provider says the group is missing" do
1846
1839
  settings[:group] = "foo"
1847
1840
 
1848
- a_group_type_for("foo").expects(:exists?).returns false
1841
+ expect(a_group_type_for("foo")).to receive(:exists?).and_return(false)
1849
1842
 
1850
1843
  expect(settings).not_to be_service_group_available
1851
1844
  end
@@ -1853,7 +1846,7 @@ describe Puppet::Settings do
1853
1846
  it "should return true if the group provider says the group is present" do
1854
1847
  settings[:group] = "foo"
1855
1848
 
1856
- a_group_type_for("foo").expects(:exists?).returns true
1849
+ expect(a_group_type_for("foo")).to receive(:exists?).and_return(true)
1857
1850
 
1858
1851
  expect(settings).to be_service_group_available
1859
1852
  end
@@ -1861,7 +1854,7 @@ describe Puppet::Settings do
1861
1854
  it "caches the result of determining if the group is present" do
1862
1855
  settings[:group] = "foo"
1863
1856
 
1864
- a_group_type_for("foo").expects(:exists?).returns true
1857
+ expect(a_group_type_for("foo")).to receive(:exists?).and_return(true)
1865
1858
  expect(settings).to be_service_group_available
1866
1859
 
1867
1860
  expect(settings).to be_service_group_available
@@ -1872,14 +1865,14 @@ describe Puppet::Settings do
1872
1865
  let(:settings) { Puppet::Settings.new }
1873
1866
 
1874
1867
  it "should get options from Puppet.settings.optparse_addargs" do
1875
- settings.expects(:optparse_addargs).returns([])
1868
+ expect(settings).to receive(:optparse_addargs).and_return([])
1876
1869
 
1877
1870
  settings.send(:parse_global_options, [])
1878
1871
  end
1879
1872
 
1880
1873
  it "should add options to OptionParser" do
1881
- settings.stubs(:optparse_addargs).returns( [["--option","-o", "Funny Option", :NONE]])
1882
- settings.expects(:handlearg).with("--option", true)
1874
+ allow(settings).to receive(:optparse_addargs).and_return([["--option","-o", "Funny Option", :NONE]])
1875
+ expect(settings).to receive(:handlearg).with("--option", true)
1883
1876
  settings.send(:parse_global_options, ["--option"])
1884
1877
  end
1885
1878
 
@@ -1888,13 +1881,13 @@ describe Puppet::Settings do
1888
1881
  end
1889
1882
 
1890
1883
  it "should not pass an unrecognized option to handleargs" do
1891
- settings.expects(:handlearg).with("--topuppet", "value").never
1884
+ expect(settings).not_to receive(:handlearg).with("--topuppet", "value")
1892
1885
  expect { settings.send(:parse_global_options, ["--topuppet", "value"]) } .to_not raise_error
1893
1886
  end
1894
1887
 
1895
1888
  it "should pass valid puppet settings options to handlearg even if they appear after an unrecognized option" do
1896
- settings.stubs(:optparse_addargs).returns( [["--option","-o", "Funny Option", :NONE]])
1897
- settings.expects(:handlearg).with("--option", true)
1889
+ allow(settings).to receive(:optparse_addargs).and_return([["--option","-o", "Funny Option", :NONE]])
1890
+ expect(settings).to receive(:handlearg).with("--option", true)
1898
1891
  settings.send(:parse_global_options, ["--invalidoption", "--option"])
1899
1892
  end
1900
1893
 
@@ -1908,7 +1901,7 @@ describe Puppet::Settings do
1908
1901
 
1909
1902
  it "should set preferred run mode from --run_mode <foo> string without error" do
1910
1903
  args = ["--run_mode", "master"]
1911
- settings.expects(:handlearg).with("--run_mode", "master").never
1904
+ expect(settings).not_to receive(:handlearg).with("--run_mode", "master")
1912
1905
  expect { settings.send(:parse_global_options, args) } .to_not raise_error
1913
1906
  expect(Puppet.settings.preferred_run_mode).to eq(:master)
1914
1907
  expect(args.empty?).to eq(true)
@@ -1916,8 +1909,8 @@ describe Puppet::Settings do
1916
1909
 
1917
1910
  it "should set preferred run mode from --run_mode=<foo> string without error" do
1918
1911
  args = ["--run_mode=master"]
1919
- settings.expects(:handlearg).with("--run_mode", "master").never
1920
- expect { settings.send(:parse_global_options, args) } .to_not raise_error
1912
+ expect(settings).not_to receive(:handlearg).with("--run_mode", "master")
1913
+ expect { settings.send(:parse_global_options, args) }.to_not raise_error
1921
1914
  expect(Puppet.settings.preferred_run_mode).to eq(:master)
1922
1915
  expect(args.empty?).to eq(true)
1923
1916
  end
@@ -1926,8 +1919,8 @@ describe Puppet::Settings do
1926
1919
  describe "default_certname" do
1927
1920
  describe "using hostname and domain" do
1928
1921
  before :each do
1929
- Puppet::Settings.stubs(:hostname_fact).returns("testhostname")
1930
- Puppet::Settings.stubs(:domain_fact).returns("domain.test.")
1922
+ allow(Puppet::Settings).to receive(:hostname_fact).and_return("testhostname")
1923
+ allow(Puppet::Settings).to receive(:domain_fact).and_return("domain.test.")
1931
1924
  end
1932
1925
 
1933
1926
  it "should use both to generate fqdn" do
@@ -1940,8 +1933,8 @@ describe Puppet::Settings do
1940
1933
 
1941
1934
  describe "using just hostname" do
1942
1935
  before :each do
1943
- Puppet::Settings.stubs(:hostname_fact).returns("testhostname")
1944
- Puppet::Settings.stubs(:domain_fact).returns("")
1936
+ allow(Puppet::Settings).to receive(:hostname_fact).and_return("testhostname")
1937
+ allow(Puppet::Settings).to receive(:domain_fact).and_return("")
1945
1938
  end
1946
1939
 
1947
1940
  it "should use only hostname to generate fqdn" do