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