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

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

Potentially problematic release.


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

Files changed (632) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +4 -8
  4. data/lib/puppet/application/device.rb +99 -83
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/configurer.rb +5 -4
  7. data/lib/puppet/defaults.rb +31 -11
  8. data/lib/puppet/indirector/request.rb +26 -15
  9. data/lib/puppet/network/http/connection.rb +15 -7
  10. data/lib/puppet/transaction/event_manager.rb +1 -5
  11. data/lib/puppet/type/file/source.rb +0 -1
  12. data/lib/puppet/util/connection.rb +15 -6
  13. data/lib/puppet/util/http_proxy.rb +3 -2
  14. data/lib/puppet/version.rb +1 -1
  15. data/locales/puppet.pot +99 -40
  16. data/man/man5/puppet.conf.5 +8 -8
  17. data/man/man8/puppet-agent.8 +1 -1
  18. data/man/man8/puppet-apply.8 +1 -1
  19. data/man/man8/puppet-catalog.8 +1 -1
  20. data/man/man8/puppet-config.8 +1 -1
  21. data/man/man8/puppet-describe.8 +1 -1
  22. data/man/man8/puppet-device.8 +1 -1
  23. data/man/man8/puppet-doc.8 +1 -1
  24. data/man/man8/puppet-epp.8 +1 -1
  25. data/man/man8/puppet-facts.8 +1 -1
  26. data/man/man8/puppet-filebucket.8 +1 -1
  27. data/man/man8/puppet-generate.8 +1 -1
  28. data/man/man8/puppet-help.8 +1 -1
  29. data/man/man8/puppet-key.8 +1 -1
  30. data/man/man8/puppet-lookup.8 +1 -1
  31. data/man/man8/puppet-man.8 +1 -1
  32. data/man/man8/puppet-module.8 +1 -1
  33. data/man/man8/puppet-node.8 +1 -1
  34. data/man/man8/puppet-parser.8 +1 -1
  35. data/man/man8/puppet-plugin.8 +1 -1
  36. data/man/man8/puppet-report.8 +1 -1
  37. data/man/man8/puppet-resource.8 +1 -1
  38. data/man/man8/puppet-script.8 +1 -1
  39. data/man/man8/puppet-ssl.8 +1 -1
  40. data/man/man8/puppet-status.8 +1 -1
  41. data/man/man8/puppet.8 +2 -2
  42. data/spec/integration/agent/logging_spec.rb +5 -7
  43. data/spec/integration/application/apply_spec.rb +18 -16
  44. data/spec/integration/application/doc_spec.rb +1 -2
  45. data/spec/integration/application/lookup_spec.rb +5 -5
  46. data/spec/integration/configurer_spec.rb +5 -6
  47. data/spec/integration/defaults_spec.rb +5 -6
  48. data/spec/integration/directory_environments_spec.rb +1 -1
  49. data/spec/integration/faces/config_spec.rb +3 -4
  50. data/spec/integration/faces/documentation_spec.rb +0 -1
  51. data/spec/integration/faces/plugin_spec.rb +1 -1
  52. data/spec/integration/file_bucket/file_spec.rb +2 -4
  53. data/spec/integration/file_serving/content_spec.rb +0 -1
  54. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  55. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  56. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  57. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  58. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  59. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  60. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  61. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  62. data/spec/integration/network/authconfig_spec.rb +23 -24
  63. data/spec/integration/network/formats_spec.rb +0 -1
  64. data/spec/integration/node/environment_spec.rb +0 -1
  65. data/spec/integration/node/facts_spec.rb +9 -10
  66. data/spec/integration/node_spec.rb +6 -7
  67. data/spec/integration/parser/catalog_spec.rb +1 -5
  68. data/spec/integration/parser/collection_spec.rb +1 -2
  69. data/spec/integration/parser/compiler_spec.rb +6 -6
  70. data/spec/integration/parser/scope_spec.rb +1 -1
  71. data/spec/integration/parser/undef_param_spec.rb +1 -1
  72. data/spec/integration/provider/service/init_spec.rb +4 -5
  73. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  74. data/spec/integration/provider/service/windows_spec.rb +1 -2
  75. data/spec/integration/reference/providers_spec.rb +1 -2
  76. data/spec/integration/reports_spec.rb +1 -2
  77. data/spec/integration/resource/catalog_spec.rb +14 -17
  78. data/spec/integration/resource/type_collection_spec.rb +4 -5
  79. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  80. data/spec/integration/ssl/host_spec.rb +1 -2
  81. data/spec/integration/ssl/key_spec.rb +0 -1
  82. data/spec/integration/test/test_helper_spec.rb +0 -1
  83. data/spec/integration/transaction/report_spec.rb +6 -11
  84. data/spec/integration/transaction_spec.rb +18 -19
  85. data/spec/integration/type/exec_spec.rb +0 -1
  86. data/spec/integration/type/file_spec.rb +13 -14
  87. data/spec/integration/type/package_spec.rb +19 -23
  88. data/spec/integration/type/tidy_spec.rb +1 -2
  89. data/spec/integration/type_spec.rb +0 -1
  90. data/spec/integration/util/autoload_spec.rb +1 -2
  91. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  92. data/spec/integration/util/settings_spec.rb +0 -1
  93. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  94. data/spec/integration/util/windows/principal_spec.rb +0 -1
  95. data/spec/integration/util/windows/process_spec.rb +4 -6
  96. data/spec/integration/util/windows/registry_spec.rb +41 -51
  97. data/spec/integration/util/windows/security_spec.rb +2 -4
  98. data/spec/integration/util/windows/user_spec.rb +18 -20
  99. data/spec/integration/util_spec.rb +4 -7
  100. data/spec/lib/puppet_spec/compiler.rb +1 -1
  101. data/spec/lib/puppet_spec/files.rb +0 -1
  102. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  103. data/spec/lib/puppet_spec/scope.rb +1 -2
  104. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  105. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  106. data/spec/shared_behaviours/file_serving.rb +6 -8
  107. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  108. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  109. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  110. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  111. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  112. data/spec/spec_helper.rb +10 -1
  113. data/spec/unit/agent/disabler_spec.rb +4 -5
  114. data/spec/unit/agent/locker_spec.rb +12 -13
  115. data/spec/unit/agent_spec.rb +80 -85
  116. data/spec/unit/application/agent_spec.rb +88 -93
  117. data/spec/unit/application/apply_spec.rb +82 -83
  118. data/spec/unit/application/config_spec.rb +0 -1
  119. data/spec/unit/application/describe_spec.rb +6 -7
  120. data/spec/unit/application/device_spec.rb +395 -419
  121. data/spec/unit/application/doc_spec.rb +44 -46
  122. data/spec/unit/application/face_base_spec.rb +61 -62
  123. data/spec/unit/application/facts_spec.rb +3 -4
  124. data/spec/unit/application/filebucket_spec.rb +66 -74
  125. data/spec/unit/application/indirection_base_spec.rb +8 -6
  126. data/spec/unit/application/lookup_spec.rb +26 -26
  127. data/spec/unit/application/resource_spec.rb +42 -48
  128. data/spec/unit/application/ssl_spec.rb +3 -3
  129. data/spec/unit/application_spec.rb +82 -92
  130. data/spec/unit/capability_spec.rb +6 -6
  131. data/spec/unit/certificate_factory_spec.rb +3 -5
  132. data/spec/unit/configurer/downloader_spec.rb +20 -21
  133. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  134. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  135. data/spec/unit/configurer_spec.rb +189 -192
  136. data/spec/unit/confine/exists_spec.rb +17 -15
  137. data/spec/unit/confine/false_spec.rb +5 -6
  138. data/spec/unit/confine/feature_spec.rb +7 -5
  139. data/spec/unit/confine/true_spec.rb +5 -6
  140. data/spec/unit/confine/variable_spec.rb +14 -15
  141. data/spec/unit/confine_collection_spec.rb +28 -29
  142. data/spec/unit/confine_spec.rb +13 -14
  143. data/spec/unit/confiner_spec.rb +10 -11
  144. data/spec/unit/context/trusted_information_spec.rb +1 -1
  145. data/spec/unit/daemon_spec.rb +35 -36
  146. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  147. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  148. data/spec/unit/datatypes_spec.rb +3 -4
  149. data/spec/unit/defaults_spec.rb +18 -13
  150. data/spec/unit/environments_spec.rb +7 -7
  151. data/spec/unit/etc_spec.rb +30 -32
  152. data/spec/unit/external/pson_spec.rb +0 -1
  153. data/spec/unit/face/catalog_spec.rb +0 -1
  154. data/spec/unit/face/config_spec.rb +31 -35
  155. data/spec/unit/face/epp_face_spec.rb +3 -4
  156. data/spec/unit/face/facts_spec.rb +5 -6
  157. data/spec/unit/face/generate_spec.rb +4 -5
  158. data/spec/unit/face/help_spec.rb +7 -8
  159. data/spec/unit/face/key_spec.rb +0 -1
  160. data/spec/unit/face/man_spec.rb +1 -2
  161. data/spec/unit/face/module/install_spec.rb +3 -5
  162. data/spec/unit/face/module/list_spec.rb +2 -12
  163. data/spec/unit/face/module/search_spec.rb +11 -9
  164. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  165. data/spec/unit/face/node_spec.rb +23 -24
  166. data/spec/unit/face/parser_spec.rb +3 -3
  167. data/spec/unit/face/plugin_spec.rb +36 -9
  168. data/spec/unit/face/status_spec.rb +0 -1
  169. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  170. data/spec/unit/file_bucket/file_spec.rb +0 -2
  171. data/spec/unit/file_serving/base_spec.rb +14 -15
  172. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  173. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  174. data/spec/unit/file_serving/content_spec.rb +10 -11
  175. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  176. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  177. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  178. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  179. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  180. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  181. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  182. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  183. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  184. data/spec/unit/file_serving/mount_spec.rb +0 -1
  185. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  186. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  187. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  188. data/spec/unit/file_system_spec.rb +2 -2
  189. data/spec/unit/forge/errors_spec.rb +1 -1
  190. data/spec/unit/forge/forge_spec.rb +13 -14
  191. data/spec/unit/forge/module_release_spec.rb +18 -18
  192. data/spec/unit/forge/repository_spec.rb +29 -30
  193. data/spec/unit/forge_spec.rb +15 -11
  194. data/spec/unit/functions/binary_file_spec.rb +3 -3
  195. data/spec/unit/functions/contain_spec.rb +0 -2
  196. data/spec/unit/functions/defined_spec.rb +0 -1
  197. data/spec/unit/functions/epp_spec.rb +2 -2
  198. data/spec/unit/functions/find_file_spec.rb +7 -7
  199. data/spec/unit/functions/include_spec.rb +0 -4
  200. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  201. data/spec/unit/functions/lookup_spec.rb +1 -2
  202. data/spec/unit/functions/module_directory_spec.rb +12 -12
  203. data/spec/unit/functions/require_spec.rb +0 -3
  204. data/spec/unit/functions/shared.rb +5 -8
  205. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  206. data/spec/unit/functions4_spec.rb +9 -10
  207. data/spec/unit/gettext/config_spec.rb +4 -4
  208. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  209. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  210. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  211. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  212. data/spec/unit/hiera_puppet_spec.rb +20 -20
  213. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  214. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  215. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  216. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  217. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  218. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  219. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  220. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  221. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  222. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  223. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  224. data/spec/unit/indirector/envelope_spec.rb +1 -2
  225. data/spec/unit/indirector/exec_spec.rb +4 -5
  226. data/spec/unit/indirector/face_spec.rb +9 -9
  227. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  228. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  229. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  230. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  231. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  232. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  233. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  234. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  235. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  236. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  237. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  238. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  239. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  240. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  241. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  242. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  243. data/spec/unit/indirector/file_server_spec.rb +87 -87
  244. data/spec/unit/indirector/indirection_spec.rb +242 -226
  245. data/spec/unit/indirector/json_spec.rb +7 -9
  246. data/spec/unit/indirector/key/file_spec.rb +21 -22
  247. data/spec/unit/indirector/memory_spec.rb +6 -7
  248. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  249. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  250. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  251. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  252. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  253. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  254. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  255. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  256. data/spec/unit/indirector/none_spec.rb +5 -5
  257. data/spec/unit/indirector/plain_spec.rb +7 -8
  258. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  259. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  260. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  261. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  262. data/spec/unit/indirector/request_spec.rb +11 -12
  263. data/spec/unit/indirector/resource/ral_spec.rb +46 -54
  264. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  265. data/spec/unit/indirector/rest_spec.rb +113 -110
  266. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  267. data/spec/unit/indirector/status/local_spec.rb +0 -1
  268. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  269. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  270. data/spec/unit/indirector/terminus_spec.rb +27 -27
  271. data/spec/unit/indirector/yaml_spec.rb +5 -6
  272. data/spec/unit/indirector_spec.rb +1 -2
  273. data/spec/unit/info_service_spec.rb +1 -1
  274. data/spec/unit/interface/action_builder_spec.rb +0 -1
  275. data/spec/unit/interface/action_manager_spec.rb +0 -1
  276. data/spec/unit/interface/action_spec.rb +2 -3
  277. data/spec/unit/interface/documentation_spec.rb +0 -1
  278. data/spec/unit/interface/face_collection_spec.rb +19 -12
  279. data/spec/unit/interface_spec.rb +3 -3
  280. data/spec/unit/man_spec.rb +3 -4
  281. data/spec/unit/module_spec.rb +46 -51
  282. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  283. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  284. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  285. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  286. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  287. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  288. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  289. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  290. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  291. data/spec/unit/module_tool/tar_spec.rb +12 -13
  292. data/spec/unit/module_tool_spec.rb +7 -12
  293. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  294. data/spec/unit/network/authconfig_spec.rb +17 -18
  295. data/spec/unit/network/authorization_spec.rb +4 -5
  296. data/spec/unit/network/authstore_spec.rb +0 -1
  297. data/spec/unit/network/format_handler_spec.rb +0 -1
  298. data/spec/unit/network/format_spec.rb +9 -10
  299. data/spec/unit/network/format_support_spec.rb +28 -29
  300. data/spec/unit/network/formats_spec.rb +4 -5
  301. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  302. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  303. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  304. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  305. data/spec/unit/network/http/api_spec.rb +0 -2
  306. data/spec/unit/network/http/compression_spec.rb +21 -22
  307. data/spec/unit/network/http/connection_spec.rb +41 -36
  308. data/spec/unit/network/http/factory_spec.rb +5 -6
  309. data/spec/unit/network/http/handler_spec.rb +9 -18
  310. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  311. data/spec/unit/network/http/pool_spec.rb +28 -29
  312. data/spec/unit/network/http/request_spec.rb +0 -2
  313. data/spec/unit/network/http/response_spec.rb +11 -13
  314. data/spec/unit/network/http/route_spec.rb +0 -1
  315. data/spec/unit/network/http/session_spec.rb +1 -2
  316. data/spec/unit/network/http/site_spec.rb +0 -1
  317. data/spec/unit/network/http_pool_spec.rb +18 -9
  318. data/spec/unit/network/http_spec.rb +0 -1
  319. data/spec/unit/network/resolver_spec.rb +25 -26
  320. data/spec/unit/network/rights_spec.rb +52 -53
  321. data/spec/unit/node/environment_spec.rb +14 -15
  322. data/spec/unit/node/facts_spec.rb +5 -7
  323. data/spec/unit/node_spec.rb +4 -10
  324. data/spec/unit/other/selinux_spec.rb +0 -1
  325. data/spec/unit/parameter/boolean_spec.rb +1 -2
  326. data/spec/unit/parameter/package_options_spec.rb +1 -2
  327. data/spec/unit/parameter/path_spec.rb +0 -1
  328. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  329. data/spec/unit/parameter/value_spec.rb +0 -1
  330. data/spec/unit/parameter_spec.rb +9 -9
  331. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  332. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  333. data/spec/unit/parser/compiler_spec.rb +84 -96
  334. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  335. data/spec/unit/parser/files_spec.rb +0 -1
  336. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  337. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  338. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  339. data/spec/unit/parser/functions/file_spec.rb +13 -14
  340. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  341. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  342. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  343. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  344. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  345. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  346. data/spec/unit/parser/functions/split_spec.rb +0 -1
  347. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  348. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  349. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  350. data/spec/unit/parser/functions/template_spec.rb +13 -13
  351. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  352. data/spec/unit/parser/functions_spec.rb +6 -7
  353. data/spec/unit/parser/relationship_spec.rb +0 -1
  354. data/spec/unit/parser/resource_spec.rb +42 -42
  355. data/spec/unit/parser/scope_spec.rb +39 -35
  356. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  357. data/spec/unit/parser/type_loader_spec.rb +17 -19
  358. data/spec/unit/pops/adaptable_spec.rb +0 -1
  359. data/spec/unit/pops/benchmark_spec.rb +0 -1
  360. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  361. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  362. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  363. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  364. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  365. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  366. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  367. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  368. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  371. data/spec/unit/pops/factory_spec.rb +3 -4
  372. data/spec/unit/pops/issues_spec.rb +19 -20
  373. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  374. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  375. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  376. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  377. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  378. data/spec/unit/pops/migration_spec.rb +3 -5
  379. data/spec/unit/pops/model/model_spec.rb +0 -1
  380. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  381. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  382. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  383. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  384. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  385. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  386. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  387. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  388. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  389. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  390. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  391. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  392. data/spec/unit/pops/pn_spec.rb +0 -1
  393. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  394. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  395. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  396. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  397. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  398. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  399. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  400. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  401. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  402. data/spec/unit/pops/visitor_spec.rb +0 -1
  403. data/spec/unit/property/boolean_spec.rb +1 -1
  404. data/spec/unit/property/ensure_spec.rb +0 -1
  405. data/spec/unit/property/keyvalue_spec.rb +32 -34
  406. data/spec/unit/property/list_spec.rb +26 -27
  407. data/spec/unit/property/ordered_list_spec.rb +10 -14
  408. data/spec/unit/property_spec.rb +42 -43
  409. data/spec/unit/provider/aix_object_spec.rb +47 -45
  410. data/spec/unit/provider/command_spec.rb +9 -9
  411. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  412. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  413. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  414. data/spec/unit/provider/exec_spec.rb +0 -1
  415. data/spec/unit/provider/file/posix_spec.rb +22 -24
  416. data/spec/unit/provider/file/windows_spec.rb +15 -17
  417. data/spec/unit/provider/group/aix_spec.rb +3 -2
  418. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  419. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  420. data/spec/unit/provider/group/pw_spec.rb +11 -11
  421. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  422. data/spec/unit/provider/ldap_spec.rb +61 -62
  423. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  424. data/spec/unit/provider/nameservice_spec.rb +38 -40
  425. data/spec/unit/provider/package/aix_spec.rb +15 -15
  426. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  427. data/spec/unit/provider/package/apt_spec.rb +44 -27
  428. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  429. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  430. data/spec/unit/provider/package/base_spec.rb +4 -4
  431. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  432. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  433. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  434. data/spec/unit/provider/package/gem_spec.rb +51 -43
  435. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  436. data/spec/unit/provider/package/macports_spec.rb +46 -42
  437. data/spec/unit/provider/package/nim_spec.rb +30 -39
  438. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  439. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  440. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  441. data/spec/unit/provider/package/pip_spec.rb +71 -72
  442. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  443. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  444. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  445. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  446. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  447. data/spec/unit/provider/package/portage_spec.rb +70 -74
  448. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  449. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  450. data/spec/unit/provider/package/sun_spec.rb +16 -18
  451. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  452. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  453. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  454. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  455. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  456. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  457. data/spec/unit/provider/package/windows_spec.rb +36 -32
  458. data/spec/unit/provider/package/yum_spec.rb +7 -7
  459. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  460. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  461. data/spec/unit/provider/service/base_spec.rb +4 -5
  462. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  463. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  464. data/spec/unit/provider/service/debian_spec.rb +38 -38
  465. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  466. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  467. data/spec/unit/provider/service/init_spec.rb +53 -52
  468. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  469. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  470. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  471. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  472. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  473. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  474. data/spec/unit/provider/service/runit_spec.rb +29 -27
  475. data/spec/unit/provider/service/smf_spec.rb +74 -66
  476. data/spec/unit/provider/service/src_spec.rb +46 -47
  477. data/spec/unit/provider/service/systemd_spec.rb +104 -113
  478. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  479. data/spec/unit/provider/service/windows_spec.rb +33 -41
  480. data/spec/unit/provider/user/aix_spec.rb +31 -31
  481. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  482. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  483. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  484. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  485. data/spec/unit/provider/user/pw_spec.rb +37 -35
  486. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  487. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  488. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  489. data/spec/unit/provider_spec.rb +35 -35
  490. data/spec/unit/puppet_pal_2pec.rb +4 -5
  491. data/spec/unit/puppet_pal_spec.rb +0 -1
  492. data/spec/unit/puppet_spec.rb +6 -7
  493. data/spec/unit/relationship_spec.rb +0 -1
  494. data/spec/unit/reports/http_spec.rb +21 -23
  495. data/spec/unit/reports/store_spec.rb +3 -4
  496. data/spec/unit/reports_spec.rb +12 -14
  497. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  498. data/spec/unit/resource/catalog_spec.rb +72 -68
  499. data/spec/unit/resource/status_spec.rb +6 -8
  500. data/spec/unit/resource/type_collection_spec.rb +17 -18
  501. data/spec/unit/resource/type_spec.rb +34 -35
  502. data/spec/unit/resource_spec.rb +36 -32
  503. data/spec/unit/rest/client_spec.rb +58 -27
  504. data/spec/unit/rest/route_spec.rb +5 -5
  505. data/spec/unit/scheduler/job_spec.rb +0 -1
  506. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  507. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  508. data/spec/unit/settings/array_setting_spec.rb +1 -1
  509. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  510. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  511. data/spec/unit/settings/config_file_spec.rb +0 -1
  512. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  513. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  514. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  515. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  516. data/spec/unit/settings/file_setting_spec.rb +44 -46
  517. data/spec/unit/settings/path_setting_spec.rb +1 -2
  518. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  519. data/spec/unit/settings/string_setting_spec.rb +14 -15
  520. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  521. data/spec/unit/settings/value_translator_spec.rb +0 -1
  522. data/spec/unit/settings_spec.rb +228 -235
  523. data/spec/unit/ssl/base_spec.rb +14 -15
  524. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  525. data/spec/unit/ssl/certificate_spec.rb +23 -25
  526. data/spec/unit/ssl/digest_spec.rb +0 -1
  527. data/spec/unit/ssl/host_spec.rb +166 -149
  528. data/spec/unit/ssl/key_spec.rb +30 -31
  529. data/spec/unit/ssl/validator_spec.rb +38 -39
  530. data/spec/unit/task_spec.rb +44 -45
  531. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  532. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  533. data/spec/unit/transaction/event_spec.rb +16 -15
  534. data/spec/unit/transaction/persistence_spec.rb +16 -17
  535. data/spec/unit/transaction/report_spec.rb +11 -12
  536. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  537. data/spec/unit/transaction_spec.rb +100 -101
  538. data/spec/unit/type/component_spec.rb +0 -1
  539. data/spec/unit/type/exec_spec.rb +60 -56
  540. data/spec/unit/type/file/checksum_spec.rb +9 -10
  541. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  542. data/spec/unit/type/file/content_spec.rb +58 -61
  543. data/spec/unit/type/file/ctime_spec.rb +0 -1
  544. data/spec/unit/type/file/ensure_spec.rb +12 -13
  545. data/spec/unit/type/file/group_spec.rb +5 -7
  546. data/spec/unit/type/file/mode_spec.rb +4 -6
  547. data/spec/unit/type/file/mtime_spec.rb +0 -1
  548. data/spec/unit/type/file/owner_spec.rb +6 -8
  549. data/spec/unit/type/file/selinux_spec.rb +17 -19
  550. data/spec/unit/type/file/source_spec.rb +104 -101
  551. data/spec/unit/type/file/type_spec.rb +0 -1
  552. data/spec/unit/type/file_spec.rb +195 -185
  553. data/spec/unit/type/filebucket_spec.rb +4 -5
  554. data/spec/unit/type/group_spec.rb +6 -8
  555. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  556. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  557. data/spec/unit/type/package_spec.rb +56 -57
  558. data/spec/unit/type/resources_spec.rb +72 -74
  559. data/spec/unit/type/schedule_spec.rb +24 -26
  560. data/spec/unit/type/service_spec.rb +48 -48
  561. data/spec/unit/type/stage_spec.rb +0 -1
  562. data/spec/unit/type/tidy_spec.rb +61 -62
  563. data/spec/unit/type/user_spec.rb +24 -25
  564. data/spec/unit/type/whit_spec.rb +0 -1
  565. data/spec/unit/type_spec.rb +55 -54
  566. data/spec/unit/util/at_fork_spec.rb +18 -19
  567. data/spec/unit/util/autoload_spec.rb +55 -56
  568. data/spec/unit/util/backups_spec.rb +34 -35
  569. data/spec/unit/util/character_encoding_spec.rb +5 -5
  570. data/spec/unit/util/checksums_spec.rb +38 -39
  571. data/spec/unit/util/colors_spec.rb +1 -2
  572. data/spec/unit/util/command_line_spec.rb +24 -25
  573. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  574. data/spec/unit/util/diff_spec.rb +7 -8
  575. data/spec/unit/util/errors_spec.rb +0 -1
  576. data/spec/unit/util/execution_spec.rb +185 -161
  577. data/spec/unit/util/execution_stub_spec.rb +0 -1
  578. data/spec/unit/util/feature_spec.rb +21 -14
  579. data/spec/unit/util/filetype_spec.rb +49 -49
  580. data/spec/unit/util/http_proxy_spec.rb +12 -12
  581. data/spec/unit/util/inifile_spec.rb +26 -31
  582. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  583. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  584. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  585. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  586. data/spec/unit/util/lockfile_spec.rb +0 -1
  587. data/spec/unit/util/log/destinations_spec.rb +30 -33
  588. data/spec/unit/util/log_spec.rb +35 -36
  589. data/spec/unit/util/logging_spec.rb +58 -72
  590. data/spec/unit/util/metric_spec.rb +0 -1
  591. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  592. data/spec/unit/util/multi_match_spec.rb +0 -1
  593. data/spec/unit/util/network_device/config_spec.rb +0 -1
  594. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  595. data/spec/unit/util/network_device_spec.rb +7 -9
  596. data/spec/unit/util/package_spec.rb +0 -1
  597. data/spec/unit/util/pidlock_spec.rb +21 -22
  598. data/spec/unit/util/plist_spec.rb +40 -33
  599. data/spec/unit/util/posix_spec.rb +54 -51
  600. data/spec/unit/util/rdoc_spec.rb +9 -10
  601. data/spec/unit/util/reference_spec.rb +0 -1
  602. data/spec/unit/util/resource_template_spec.rb +20 -20
  603. data/spec/unit/util/retry_action_spec.rb +7 -8
  604. data/spec/unit/util/rubygems_spec.rb +7 -8
  605. data/spec/unit/util/run_mode_spec.rb +3 -4
  606. data/spec/unit/util/selinux_spec.rb +79 -72
  607. data/spec/unit/util/splayer_spec.rb +8 -9
  608. data/spec/unit/util/ssl_spec.rb +0 -1
  609. data/spec/unit/util/storage_spec.rb +3 -4
  610. data/spec/unit/util/suidmanager_spec.rb +45 -54
  611. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  612. data/spec/unit/util/tag_set_spec.rb +0 -1
  613. data/spec/unit/util/tagging_spec.rb +0 -1
  614. data/spec/unit/util/terminal_spec.rb +9 -10
  615. data/spec/unit/util/user_attr_spec.rb +1 -2
  616. data/spec/unit/util/warnings_spec.rb +3 -4
  617. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  618. data/spec/unit/util/watcher_spec.rb +51 -21
  619. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  620. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  621. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  622. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  623. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  624. data/spec/unit/util/windows/file_spec.rb +0 -1
  625. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  626. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  627. data/spec/unit/util/windows/service_spec.rb +66 -68
  628. data/spec/unit/util/windows/sid_spec.rb +11 -13
  629. data/spec/unit/util/windows/string_spec.rb +0 -1
  630. data/spec/unit/util_spec.rb +55 -57
  631. data/spec/unit/version_spec.rb +6 -6
  632. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  def safely_load_service_type
@@ -7,7 +6,7 @@ def safely_load_service_type
7
6
  # on jruby. Thus, we stub it out here since we don't care to do any assertions on it.
8
7
  # This is only an issue if you're running these unit tests on a platform where upstart
9
8
  # is a default provider, like Ubuntu trusty.
10
- Puppet::Util::Execution.stubs(:execute)
9
+ allow(Puppet::Util::Execution).to receive(:execute)
11
10
  Puppet::Type.type(:service)
12
11
  end
13
12
  end
@@ -46,8 +45,8 @@ describe test_title, "when validating attribute values" do
46
45
  safely_load_service_type
47
46
 
48
47
  before do
49
- @provider = stub 'provider', :class => Puppet::Type.type(:service).defaultprovider, :clear => nil, :controllable? => false
50
- Puppet::Type.type(:service).defaultprovider.stubs(:new).returns(@provider)
48
+ @provider = double('provider', :class => Puppet::Type.type(:service).defaultprovider, :clear => nil, :controllable? => false)
49
+ allow(Puppet::Type.type(:service).defaultprovider).to receive(:new).and_return(@provider)
51
50
  end
52
51
 
53
52
  it "should support :running as a value to :ensure" do
@@ -70,8 +69,9 @@ describe test_title, "when validating attribute values" do
70
69
 
71
70
  describe "the enable property" do
72
71
  before :each do
73
- @provider.class.stubs(:supports_parameter?).returns true
72
+ allow(@provider.class).to receive(:supports_parameter?).and_return(true)
74
73
  end
74
+
75
75
  it "should support :true as a value" do
76
76
  srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :true)
77
77
  expect(srv.should(:enable)).to eq(:true)
@@ -88,13 +88,13 @@ describe test_title, "when validating attribute values" do
88
88
  end
89
89
 
90
90
  it "should support :manual as a value on Windows" do
91
- Puppet::Util::Platform.stubs(:windows?).returns true
91
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
92
92
  srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :manual)
93
93
  expect(srv.should(:enable)).to eq(:manual)
94
94
  end
95
95
 
96
96
  it "should not support :manual as a value when not on Windows" do
97
- Puppet::Util::Platform.stubs(:windows?).returns false
97
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
98
98
 
99
99
  expect { Puppet::Type.type(:service).new(:name => "yay", :enable => :manual) }.to raise_error(
100
100
  Puppet::Error,
@@ -129,29 +129,29 @@ describe test_title, "when validating attribute values" do
129
129
  end
130
130
 
131
131
  it "should allow setting the :enable parameter if the provider has the :enableable feature" do
132
- Puppet::Type.type(:service).defaultprovider.stubs(:supports_parameter?).returns(true)
133
- Puppet::Type.type(:service).defaultprovider.expects(:supports_parameter?).with(Puppet::Type.type(:service).attrclass(:enable)).returns(true)
132
+ allow(Puppet::Type.type(:service).defaultprovider).to receive(:supports_parameter?).and_return(true)
133
+ expect(Puppet::Type.type(:service).defaultprovider).to receive(:supports_parameter?).with(Puppet::Type.type(:service).attrclass(:enable)).and_return(true)
134
134
  svc = Puppet::Type.type(:service).new(:name => "yay", :enable => true)
135
135
  expect(svc.should(:enable)).to eq(:true)
136
136
  end
137
137
 
138
138
  it "should not allow setting the :enable parameter if the provider is missing the :enableable feature" do
139
- Puppet::Type.type(:service).defaultprovider.stubs(:supports_parameter?).returns(true)
140
- Puppet::Type.type(:service).defaultprovider.expects(:supports_parameter?).with(Puppet::Type.type(:service).attrclass(:enable)).returns(false)
139
+ allow(Puppet::Type.type(:service).defaultprovider).to receive(:supports_parameter?).and_return(true)
140
+ expect(Puppet::Type.type(:service).defaultprovider).to receive(:supports_parameter?).with(Puppet::Type.type(:service).attrclass(:enable)).and_return(false)
141
141
  svc = Puppet::Type.type(:service).new(:name => "yay", :enable => true)
142
142
  expect(svc.should(:enable)).to be_nil
143
143
  end
144
144
 
145
145
  it "should split paths on '#{File::PATH_SEPARATOR}'" do
146
- Puppet::FileSystem.stubs(:exist?).returns(true)
147
- FileTest.stubs(:directory?).returns(true)
146
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
147
+ allow(FileTest).to receive(:directory?).and_return(true)
148
148
  svc = Puppet::Type.type(:service).new(:name => "yay", :path => "/one/two#{File::PATH_SEPARATOR}/three/four")
149
149
  expect(svc[:path]).to eq(%w{/one/two /three/four})
150
150
  end
151
151
 
152
152
  it "should accept arrays of paths joined by '#{File::PATH_SEPARATOR}'" do
153
- Puppet::FileSystem.stubs(:exist?).returns(true)
154
- FileTest.stubs(:directory?).returns(true)
153
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
154
+ allow(FileTest).to receive(:directory?).and_return(true)
155
155
  svc = Puppet::Type.type(:service).new(:name => "yay", :path => ["/one#{File::PATH_SEPARATOR}/two", "/three#{File::PATH_SEPARATOR}/four"])
156
156
  expect(svc[:path]).to eq(%w{/one /two /three /four})
157
157
  end
@@ -161,11 +161,11 @@ describe test_title, "when setting default attribute values" do
161
161
  safely_load_service_type
162
162
 
163
163
  it "should default to the provider's default path if one is available" do
164
- FileTest.stubs(:directory?).returns(true)
165
- Puppet::FileSystem.stubs(:exist?).returns(true)
164
+ allow(FileTest).to receive(:directory?).and_return(true)
165
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
166
166
 
167
- Puppet::Type.type(:service).defaultprovider.stubs(:respond_to?).returns(true)
168
- Puppet::Type.type(:service).defaultprovider.stubs(:defpath).returns("testing")
167
+ allow(Puppet::Type.type(:service).defaultprovider).to receive(:respond_to?).and_return(true)
168
+ allow(Puppet::Type.type(:service).defaultprovider).to receive(:defpath).and_return("testing")
169
169
  svc = Puppet::Type.type(:service).new(:name => "other")
170
170
  expect(svc[:path]).to eq(["testing"])
171
171
  end
@@ -181,8 +181,8 @@ describe test_title, "when setting default attribute values" do
181
181
  end
182
182
 
183
183
  it "should default 'control' to the upcased service name with periods replaced by underscores if the provider supports the 'controllable' feature" do
184
- provider = stub 'provider', :controllable? => true, :class => Puppet::Type.type(:service).defaultprovider, :clear => nil
185
- Puppet::Type.type(:service).defaultprovider.stubs(:new).returns(provider)
184
+ provider = double('provider', :controllable? => true, :class => Puppet::Type.type(:service).defaultprovider, :clear => nil)
185
+ allow(Puppet::Type.type(:service).defaultprovider).to receive(:new).and_return(provider)
186
186
  svc = Puppet::Type.type(:service).new(:name => "nfs.client")
187
187
  expect(svc[:control]).to eq("NFS_CLIENT_START")
188
188
  end
@@ -196,14 +196,14 @@ describe test_title, "when retrieving the host's current state" do
196
196
  end
197
197
 
198
198
  it "should use the provider's status to determine whether the service is running" do
199
- @service.provider.expects(:status).returns(:yepper)
199
+ expect(@service.provider).to receive(:status).and_return(:yepper)
200
200
  @service[:ensure] = :running
201
201
  expect(@service.property(:ensure).retrieve).to eq(:yepper)
202
202
  end
203
203
 
204
204
  it "should ask the provider whether it is enabled" do
205
- @service.provider.class.stubs(:supports_parameter?).returns(true)
206
- @service.provider.expects(:enabled?).returns(:yepper)
205
+ allow(@service.provider.class).to receive(:supports_parameter?).and_return(true)
206
+ expect(@service.provider).to receive(:enabled?).and_return(:yepper)
207
207
  @service[:enable] = true
208
208
  expect(@service.property(:enable).retrieve).to eq(:yepper)
209
209
  end
@@ -218,56 +218,56 @@ describe test_title, "when changing the host" do
218
218
 
219
219
  it "should start the service if it is supposed to be running" do
220
220
  @service[:ensure] = :running
221
- @service.provider.expects(:start)
221
+ expect(@service.provider).to receive(:start)
222
222
  @service.property(:ensure).sync
223
223
  end
224
224
 
225
225
  it "should stop the service if it is supposed to be stopped" do
226
226
  @service[:ensure] = :stopped
227
- @service.provider.expects(:stop)
227
+ expect(@service.provider).to receive(:stop)
228
228
  @service.property(:ensure).sync
229
229
  end
230
230
 
231
231
  it "should enable the service if it is supposed to be enabled" do
232
- @service.provider.class.stubs(:supports_parameter?).returns(true)
232
+ allow(@service.provider.class).to receive(:supports_parameter?).and_return(true)
233
233
  @service[:enable] = true
234
- @service.provider.expects(:enable)
234
+ expect(@service.provider).to receive(:enable)
235
235
  @service.property(:enable).sync
236
236
  end
237
237
 
238
238
  it "should disable the service if it is supposed to be disabled" do
239
- @service.provider.class.stubs(:supports_parameter?).returns(true)
239
+ allow(@service.provider.class).to receive(:supports_parameter?).and_return(true)
240
240
  @service[:enable] = false
241
- @service.provider.expects(:disable)
241
+ expect(@service.provider).to receive(:disable)
242
242
  @service.property(:enable).sync
243
243
  end
244
244
 
245
245
  it "should always consider the enable state of a static service to be in sync" do
246
- @service.provider.class.stubs(:supports_parameter?).returns(true)
247
- @service.provider.expects(:cached_enabled?).returns('static')
246
+ allow(@service.provider.class).to receive(:supports_parameter?).and_return(true)
247
+ expect(@service.provider).to receive(:cached_enabled?).and_return('static')
248
248
  @service[:enable] = false
249
- Puppet.expects(:debug).with("Unable to enable or disable static service yay")
249
+ expect(Puppet).to receive(:debug).with("Unable to enable or disable static service yay")
250
250
  expect(@service.property(:enable).insync?(:true)).to eq(true)
251
251
  end
252
252
 
253
253
  it "should determine insyncness normally when the service is not static" do
254
- @service.provider.class.stubs(:supports_parameter?).returns(true)
255
- @service.provider.expects(:cached_enabled?).returns('true')
254
+ allow(@service.provider.class).to receive(:supports_parameter?).and_return(true)
255
+ expect(@service.provider).to receive(:cached_enabled?).and_return('true')
256
256
  @service[:enable] = true
257
- Puppet.expects(:debug).never
257
+ expect(Puppet).not_to receive(:debug)
258
258
  expect(@service.property(:enable).insync?(:true)).to eq(true)
259
259
  end
260
260
 
261
261
  it "should sync the service's enable state when changing the state of :ensure if :enable is being managed" do
262
- @service.provider.class.stubs(:supports_parameter?).returns(true)
262
+ allow(@service.provider.class).to receive(:supports_parameter?).and_return(true)
263
263
  @service[:enable] = false
264
264
  @service[:ensure] = :stopped
265
265
 
266
- @service.property(:enable).expects(:retrieve).returns("whatever")
267
- @service.property(:enable).expects(:insync?).returns(false)
268
- @service.property(:enable).expects(:sync)
266
+ expect(@service.property(:enable)).to receive(:retrieve).and_return("whatever")
267
+ expect(@service.property(:enable)).to receive(:insync?).and_return(false)
268
+ expect(@service.property(:enable)).to receive(:sync)
269
269
 
270
- @service.provider.stubs(:stop)
270
+ allow(@service.provider).to receive(:stop)
271
271
 
272
272
  @service.property(:ensure).sync
273
273
  end
@@ -282,27 +282,27 @@ describe test_title, "when refreshing the service" do
282
282
 
283
283
  it "should restart the service if it is running" do
284
284
  @service[:ensure] = :running
285
- @service.provider.expects(:status).returns(:running)
286
- @service.provider.expects(:restart)
285
+ expect(@service.provider).to receive(:status).and_return(:running)
286
+ expect(@service.provider).to receive(:restart)
287
287
  @service.refresh
288
288
  end
289
289
 
290
290
  it "should restart the service if it is running, even if it is supposed to stopped" do
291
291
  @service[:ensure] = :stopped
292
- @service.provider.expects(:status).returns(:running)
293
- @service.provider.expects(:restart)
292
+ expect(@service.provider).to receive(:status).and_return(:running)
293
+ expect(@service.provider).to receive(:restart)
294
294
  @service.refresh
295
295
  end
296
296
 
297
297
  it "should not restart the service if it is not running" do
298
298
  @service[:ensure] = :running
299
- @service.provider.expects(:status).returns(:stopped)
299
+ expect(@service.provider).to receive(:status).and_return(:stopped)
300
300
  @service.refresh
301
301
  end
302
302
 
303
303
  it "should add :ensure as a property if it is not being managed" do
304
- @service.provider.expects(:status).returns(:running)
305
- @service.provider.expects(:restart)
304
+ expect(@service.provider).to receive(:status).and_return(:running)
305
+ expect(@service.provider).to receive(:restart)
306
306
  @service.refresh
307
307
  end
308
308
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  describe Puppet::Type.type(:stage) do
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/file_bucket/dipper'
4
3
 
@@ -9,7 +8,7 @@ describe tidy do
9
8
 
10
9
  before do
11
10
  @basepath = make_absolute("/what/ever")
12
- Puppet.settings.stubs(:use)
11
+ allow(Puppet.settings).to receive(:use)
13
12
  end
14
13
 
15
14
  context "when normalizing 'path' on windows", :if => Puppet::Util::Platform.windows? do
@@ -21,8 +20,8 @@ describe tidy do
21
20
 
22
21
  it "should use :lstat when stating a file" do
23
22
  path = '/foo/bar'
24
- stat = mock 'stat'
25
- Puppet::FileSystem.expects(:lstat).with(path).returns stat
23
+ stat = double('stat')
24
+ expect(Puppet::FileSystem).to receive(:lstat).with(path).and_return(stat)
26
25
 
27
26
  resource = tidy.new :path => path, :age => "1d"
28
27
 
@@ -135,32 +134,32 @@ describe tidy do
135
134
  describe "when tidying" do
136
135
  before do
137
136
  @tidy = Puppet::Type.type(:tidy).new :path => @basepath
138
- @stat = stub 'stat', :ftype => "directory"
137
+ @stat = double('stat', :ftype => "directory")
139
138
  lstat_is(@basepath, @stat)
140
139
  end
141
140
 
142
141
  describe "and generating files" do
143
142
  it "should set the backup on the file if backup is set on the tidy instance" do
144
143
  @tidy[:backup] = "whatever"
145
- Puppet::Type.type(:file).expects(:new).with { |args| args[:backup] == "whatever" }
144
+ expect(Puppet::Type.type(:file)).to receive(:new).with(hash_including(backup: "whatever"))
146
145
 
147
146
  @tidy.mkfile(@basepath)
148
147
  end
149
148
 
150
149
  it "should set the file's path to the tidy's path" do
151
- Puppet::Type.type(:file).expects(:new).with { |args| args[:path] == @basepath }
150
+ expect(Puppet::Type.type(:file)).to receive(:new).with(hash_including(path: @basepath))
152
151
 
153
152
  @tidy.mkfile(@basepath)
154
153
  end
155
154
 
156
155
  it "should configure the file for deletion" do
157
- Puppet::Type.type(:file).expects(:new).with { |args| args[:ensure] == :absent }
156
+ expect(Puppet::Type.type(:file)).to receive(:new).with(hash_including(ensure: :absent))
158
157
 
159
158
  @tidy.mkfile(@basepath)
160
159
  end
161
160
 
162
161
  it "should force deletion on the file" do
163
- Puppet::Type.type(:file).expects(:new).with { |args| args[:force] == true }
162
+ expect(Puppet::Type.type(:file)).to receive(:new).with(hash_including(force: true))
164
163
 
165
164
  @tidy.mkfile(@basepath)
166
165
  end
@@ -174,16 +173,16 @@ describe tidy do
174
173
 
175
174
  describe "and recursion is not used" do
176
175
  it "should generate a file resource if the file should be tidied" do
177
- @tidy.expects(:tidy?).with(@basepath).returns true
176
+ expect(@tidy).to receive(:tidy?).with(@basepath).and_return(true)
178
177
  file = Puppet::Type.type(:file).new(:path => @basepath+"/eh")
179
- @tidy.expects(:mkfile).with(@basepath).returns file
178
+ expect(@tidy).to receive(:mkfile).with(@basepath).and_return(file)
180
179
 
181
180
  expect(@tidy.generate).to eq([file])
182
181
  end
183
182
 
184
183
  it "should do nothing if the file should not be tidied" do
185
- @tidy.expects(:tidy?).with(@basepath).returns false
186
- @tidy.expects(:mkfile).never
184
+ expect(@tidy).to receive(:tidy?).with(@basepath).and_return(false)
185
+ expect(@tidy).not_to receive(:mkfile)
187
186
 
188
187
  expect(@tidy.generate).to eq([])
189
188
  end
@@ -192,38 +191,38 @@ describe tidy do
192
191
  describe "and recursion is used" do
193
192
  before do
194
193
  @tidy[:recurse] = true
195
- Puppet::FileServing::Fileset.any_instance.stubs(:stat).returns mock("stat")
194
+ allow_any_instance_of(Puppet::FileServing::Fileset).to receive(:stat).and_return(double("stat"))
196
195
  @fileset = Puppet::FileServing::Fileset.new(@basepath)
197
- Puppet::FileServing::Fileset.stubs(:new).returns @fileset
196
+ allow(Puppet::FileServing::Fileset).to receive(:new).and_return(@fileset)
198
197
  end
199
198
 
200
199
  it "should use a Fileset for infinite recursion" do
201
- Puppet::FileServing::Fileset.expects(:new).with(@basepath, :recurse => true).returns @fileset
202
- @fileset.expects(:files).returns %w{. one two}
203
- @tidy.stubs(:tidy?).returns false
200
+ expect(Puppet::FileServing::Fileset).to receive(:new).with(@basepath, :recurse => true).and_return(@fileset)
201
+ expect(@fileset).to receive(:files).and_return(%w{. one two})
202
+ allow(@tidy).to receive(:tidy?).and_return(false)
204
203
 
205
204
  @tidy.generate
206
205
  end
207
206
 
208
207
  it "should use a Fileset for limited recursion" do
209
208
  @tidy[:recurse] = 42
210
- Puppet::FileServing::Fileset.expects(:new).with(@basepath, :recurse => true, :recurselimit => 42).returns @fileset
211
- @fileset.expects(:files).returns %w{. one two}
212
- @tidy.stubs(:tidy?).returns false
209
+ expect(Puppet::FileServing::Fileset).to receive(:new).with(@basepath, :recurse => true, :recurselimit => 42).and_return(@fileset)
210
+ expect(@fileset).to receive(:files).and_return(%w{. one two})
211
+ allow(@tidy).to receive(:tidy?).and_return(false)
213
212
 
214
213
  @tidy.generate
215
214
  end
216
215
 
217
216
  it "should generate a file resource for every file that should be tidied but not for files that should not be tidied" do
218
- @fileset.expects(:files).returns %w{. one two}
217
+ expect(@fileset).to receive(:files).and_return(%w{. one two})
219
218
 
220
- @tidy.expects(:tidy?).with(@basepath).returns true
221
- @tidy.expects(:tidy?).with(@basepath+"/one").returns true
222
- @tidy.expects(:tidy?).with(@basepath+"/two").returns false
219
+ expect(@tidy).to receive(:tidy?).with(@basepath).and_return(true)
220
+ expect(@tidy).to receive(:tidy?).with(@basepath+"/one").and_return(true)
221
+ expect(@tidy).to receive(:tidy?).with(@basepath+"/two").and_return(false)
223
222
 
224
223
  file = Puppet::Type.type(:file).new(:path => @basepath+"/eh")
225
- @tidy.expects(:mkfile).with(@basepath).returns file
226
- @tidy.expects(:mkfile).with(@basepath+"/one").returns file
224
+ expect(@tidy).to receive(:mkfile).with(@basepath).and_return(file)
225
+ expect(@tidy).to receive(:mkfile).with(@basepath+"/one").and_return(file)
227
226
 
228
227
  @tidy.generate
229
228
  end
@@ -234,7 +233,7 @@ describe tidy do
234
233
  @tidy = Puppet::Type.type(:tidy).new :path => @basepath, :recurse => 1
235
234
  @tidy[:matches] = %w{*foo* *bar*}
236
235
 
237
- @stat = mock 'stat'
236
+ @stat = double('stat')
238
237
 
239
238
  @matcher = @tidy.parameter(:matches)
240
239
  end
@@ -258,7 +257,7 @@ describe tidy do
258
257
  describe "and determining whether a file is too old" do
259
258
  before do
260
259
  @tidy = Puppet::Type.type(:tidy).new :path => @basepath
261
- @stat = stub 'stat'
260
+ @stat = double('stat')
262
261
 
263
262
  @tidy[:age] = "1s"
264
263
  @tidy[:type] = "mtime"
@@ -267,19 +266,19 @@ describe tidy do
267
266
 
268
267
  it "should use the age type specified" do
269
268
  @tidy[:type] = :ctime
270
- @stat.expects(:ctime).returns(Time.now)
269
+ expect(@stat).to receive(:ctime).and_return(Time.now)
271
270
 
272
271
  @ager.tidy?(@basepath, @stat)
273
272
  end
274
273
 
275
274
  it "should return false if the file is more recent than the specified age" do
276
- @stat.expects(:mtime).returns(Time.now)
275
+ expect(@stat).to receive(:mtime).and_return(Time.now)
277
276
 
278
277
  expect(@ager).not_to be_tidy(@basepath, @stat)
279
278
  end
280
279
 
281
280
  it "should return true if the file is older than the specified age" do
282
- @stat.expects(:mtime).returns(Time.now - 10)
281
+ expect(@stat).to receive(:mtime).and_return(Time.now - 10)
283
282
 
284
283
  expect(@ager).to be_tidy(@basepath, @stat)
285
284
  end
@@ -288,26 +287,26 @@ describe tidy do
288
287
  describe "and determining whether a file is too large" do
289
288
  before do
290
289
  @tidy = Puppet::Type.type(:tidy).new :path => @basepath
291
- @stat = stub 'stat', :ftype => "file"
290
+ @stat = double('stat', :ftype => "file")
292
291
 
293
292
  @tidy[:size] = "1kb"
294
293
  @sizer = @tidy.parameter(:size)
295
294
  end
296
295
 
297
296
  it "should return false if the file is smaller than the specified size" do
298
- @stat.expects(:size).returns(4) # smaller than a kilobyte
297
+ expect(@stat).to receive(:size).and_return(4) # smaller than a kilobyte
299
298
 
300
299
  expect(@sizer).not_to be_tidy(@basepath, @stat)
301
300
  end
302
301
 
303
302
  it "should return true if the file is larger than the specified size" do
304
- @stat.expects(:size).returns(1500) # larger than a kilobyte
303
+ expect(@stat).to receive(:size).and_return(1500) # larger than a kilobyte
305
304
 
306
305
  expect(@sizer).to be_tidy(@basepath, @stat)
307
306
  end
308
307
 
309
308
  it "should return true if the file is equal to the specified size" do
310
- @stat.expects(:size).returns(1024)
309
+ expect(@stat).to receive(:size).and_return(1024)
311
310
 
312
311
  expect(@sizer).to be_tidy(@basepath, @stat)
313
312
  end
@@ -318,7 +317,7 @@ describe tidy do
318
317
  @tidy = Puppet::Type.type(:tidy).new :path => @basepath
319
318
  @catalog = Puppet::Resource::Catalog.new
320
319
  @tidy.catalog = @catalog
321
- @stat = stub 'stat', :ftype => "file"
320
+ @stat = double('stat', :ftype => "file")
322
321
  lstat_is(@basepath, @stat)
323
322
  end
324
323
 
@@ -343,7 +342,7 @@ describe tidy do
343
342
  end
344
343
 
345
344
  it "should not be tidied if it is a directory and rmdirs is set to false" do
346
- stat = mock 'stat', :ftype => "directory"
345
+ stat = double('stat', :ftype => "directory")
347
346
  lstat_is(@basepath, stat)
348
347
 
349
348
  expect(@tidy).not_to be_tidy(@basepath)
@@ -354,7 +353,7 @@ describe tidy do
354
353
  @tidy[:matches] = "globs"
355
354
 
356
355
  matches = @tidy.parameter(:matches)
357
- matches.expects(:tidy?).with(@basepath, @stat).returns false
356
+ expect(matches).to receive(:tidy?).with(@basepath, @stat).and_return(false)
358
357
  expect(@tidy).not_to be_tidy(@basepath)
359
358
  end
360
359
 
@@ -362,7 +361,7 @@ describe tidy do
362
361
  @tidy[:age] = "1d"
363
362
 
364
363
  ager = @tidy.parameter(:age)
365
- ager.expects(:tidy?).with(@basepath, @stat).returns false
364
+ expect(ager).to receive(:tidy?).with(@basepath, @stat).and_return(false)
366
365
  expect(@tidy).not_to be_tidy(@basepath)
367
366
  end
368
367
 
@@ -370,7 +369,7 @@ describe tidy do
370
369
  @tidy[:size] = "1b"
371
370
 
372
371
  sizer = @tidy.parameter(:size)
373
- sizer.expects(:tidy?).with(@basepath, @stat).returns false
372
+ expect(sizer).to receive(:tidy?).with(@basepath, @stat).and_return(false)
374
373
  expect(@tidy).not_to be_tidy(@basepath)
375
374
  end
376
375
 
@@ -378,8 +377,8 @@ describe tidy do
378
377
  @tidy[:size] = "1b"
379
378
  @tidy[:age] = "1d"
380
379
 
381
- @tidy.parameter(:size).stubs(:tidy?).returns true
382
- @tidy.parameter(:age).stubs(:tidy?).returns false
380
+ allow(@tidy.parameter(:size)).to receive(:tidy?).and_return(true)
381
+ allow(@tidy.parameter(:age)).to receive(:tidy?).and_return(false)
383
382
  expect(@tidy).to be_tidy(@basepath)
384
383
  end
385
384
 
@@ -387,8 +386,8 @@ describe tidy do
387
386
  @tidy[:size] = "1b"
388
387
  @tidy[:age] = "1d"
389
388
 
390
- @tidy.parameter(:size).stubs(:tidy?).returns false
391
- @tidy.parameter(:age).stubs(:tidy?).returns true
389
+ allow(@tidy.parameter(:size)).to receive(:tidy?).and_return(false)
390
+ allow(@tidy.parameter(:age)).to receive(:tidy?).and_return(true)
392
391
  expect(@tidy).to be_tidy(@basepath)
393
392
  end
394
393
 
@@ -400,10 +399,10 @@ describe tidy do
400
399
  @tidy[:recurse] = true
401
400
  @tidy[:rmdirs] = true
402
401
  fileset = Puppet::FileServing::Fileset.new(@basepath)
403
- Puppet::FileServing::Fileset.expects(:new).returns fileset
404
- fileset.expects(:files).returns %w{. one one/two}
402
+ expect(Puppet::FileServing::Fileset).to receive(:new).and_return(fileset)
403
+ expect(fileset).to receive(:files).and_return(%w{. one one/two})
405
404
 
406
- @tidy.stubs(:tidy?).returns true
405
+ allow(@tidy).to receive(:tidy?).and_return(true)
407
406
 
408
407
  expect(@tidy.generate.collect { |r| r[:path] }).to eq([@basepath+"/one/two", @basepath+"/one", @basepath])
409
408
  end
@@ -412,10 +411,10 @@ describe tidy do
412
411
  it "should configure directories to require their contained files if rmdirs is enabled, so the files will be deleted first" do
413
412
  @tidy[:recurse] = true
414
413
  @tidy[:rmdirs] = true
415
- fileset = mock 'fileset'
416
- Puppet::FileServing::Fileset.expects(:new).with(@basepath, :recurse => true).returns fileset
417
- fileset.expects(:files).returns %w{. one two one/subone two/subtwo one/subone/ssone}
418
- @tidy.stubs(:tidy?).returns true
414
+ fileset = double('fileset')
415
+ expect(Puppet::FileServing::Fileset).to receive(:new).with(@basepath, :recurse => true).and_return(fileset)
416
+ expect(fileset).to receive(:files).and_return(%w{. one two one/subone two/subtwo one/subone/ssone})
417
+ allow(@tidy).to receive(:tidy?).and_return(true)
419
418
 
420
419
  result = @tidy.generate.inject({}) { |hash, res| hash[res[:path]] = res; hash }
421
420
  {
@@ -434,10 +433,10 @@ describe tidy do
434
433
  it "should configure directories to require their contained files in sorted order" do
435
434
  @tidy[:recurse] = true
436
435
  @tidy[:rmdirs] = true
437
- fileset = mock 'fileset'
438
- Puppet::FileServing::Fileset.expects(:new).with(@basepath, :recurse => true).returns fileset
439
- fileset.expects(:files).returns %w{. a a/2 a/1 a/3}
440
- @tidy.stubs(:tidy?).returns true
436
+ fileset = double('fileset')
437
+ expect(Puppet::FileServing::Fileset).to receive(:new).with(@basepath, :recurse => true).and_return(fileset)
438
+ expect(fileset).to receive(:files).and_return(%w{. a a/2 a/1 a/3})
439
+ allow(@tidy).to receive(:tidy?).and_return(true)
441
440
 
442
441
  result = @tidy.generate.inject({}) { |hash, res| hash[res[:path]] = res; hash }
443
442
  expect(result[@basepath + '/a'][:require].collect{|a| a.name[('File//a/' + @basepath).length..-1]}.join()).to eq('321')
@@ -447,10 +446,10 @@ describe tidy do
447
446
  @tidy[:recurse] = true
448
447
  @tidy[:noop] = true
449
448
 
450
- fileset = mock 'fileset'
451
- Puppet::FileServing::Fileset.expects(:new).with(@basepath, :recurse => true).returns fileset
452
- fileset.expects(:files).returns %w{. a a/2 a/1 a/3}
453
- @tidy.stubs(:tidy?).returns true
449
+ fileset = double('fileset')
450
+ expect(Puppet::FileServing::Fileset).to receive(:new).with(@basepath, :recurse => true).and_return(fileset)
451
+ expect(fileset).to receive(:files).and_return(%w{. a a/2 a/1 a/3})
452
+ allow(@tidy).to receive(:tidy?).and_return(true)
454
453
 
455
454
  result = @tidy.generate.inject({}) { |hash, res| hash[res[:path]] = res; hash }
456
455
 
@@ -459,10 +458,10 @@ describe tidy do
459
458
  end
460
459
 
461
460
  def lstat_is(path, stat)
462
- Puppet::FileSystem.stubs(:lstat).with(path).returns(stat)
461
+ allow(Puppet::FileSystem).to receive(:lstat).with(path).and_return(stat)
463
462
  end
464
463
 
465
464
  def lstat_raises(path, error_class)
466
- Puppet::FileSystem.expects(:lstat).with(path).raises Errno::ENOENT
465
+ expect(Puppet::FileSystem).to receive(:lstat).with(path).and_raise(Errno::ENOENT)
467
466
  end
468
467
  end