puppet 6.0.7-x86-mingw32 → 6.0.8-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 (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
  require 'puppet/file_serving/content'
@@ -25,7 +24,7 @@ describe Puppet::FileServing::Content do
25
24
  it "should not retrieve and store its contents when its attributes are collected" do
26
25
  content = Puppet::FileServing::Content.new(path)
27
26
 
28
- File.expects(:read).with(path).never
27
+ expect(File).not_to receive(:read).with(path)
29
28
  content.collect
30
29
 
31
30
  expect(content.instance_variable_get("@content")).to be_nil
@@ -47,10 +46,10 @@ describe Puppet::FileServing::Content do
47
46
  end
48
47
 
49
48
  it "should create an instance with a fake file name and correct content when converting from binary" do
50
- instance = mock 'instance'
51
- Puppet::FileServing::Content.expects(:new).with("/this/is/a/fake/path").returns instance
49
+ instance = double('instance')
50
+ expect(Puppet::FileServing::Content).to receive(:new).with("/this/is/a/fake/path").and_return(instance)
52
51
 
53
- instance.expects(:content=).with "foo/bar"
52
+ expect(instance).to receive(:content=).with("foo/bar")
54
53
 
55
54
  expect(Puppet::FileServing::Content.from_binary("foo/bar")).to equal(instance)
56
55
  end
@@ -58,7 +57,7 @@ describe Puppet::FileServing::Content do
58
57
  it "should return an opened File when converted to binary" do
59
58
  content = Puppet::FileServing::Content.new(path)
60
59
 
61
- File.expects(:new).with(path, "rb").returns :file
60
+ expect(File).to receive(:new).with(path, "rb").and_return(:file)
62
61
 
63
62
  expect(content.to_binary).to eq(:file)
64
63
  end
@@ -70,7 +69,7 @@ describe Puppet::FileServing::Content, "when returning the contents" do
70
69
 
71
70
  it "should fail if the file is a symlink and links are set to :manage" do
72
71
  content.links = :manage
73
- Puppet::FileSystem.expects(:lstat).with(path).returns stub("stat", :ftype => "symlink")
72
+ expect(Puppet::FileSystem).to receive(:lstat).with(path).and_return(double("stat", :ftype => "symlink"))
74
73
  expect { content.content }.to raise_error(ArgumentError)
75
74
  end
76
75
 
@@ -84,14 +83,14 @@ describe Puppet::FileServing::Content, "when returning the contents" do
84
83
  end
85
84
 
86
85
  it "should return the contents of the path if the file exists" do
87
- Puppet::FileSystem.expects(:stat).with(path).returns(stub('stat', :ftype => 'file'))
88
- Puppet::FileSystem.expects(:binread).with(path).returns(:mycontent)
86
+ expect(Puppet::FileSystem).to receive(:stat).with(path).and_return(double('stat', :ftype => 'file'))
87
+ expect(Puppet::FileSystem).to receive(:binread).with(path).and_return(:mycontent)
89
88
  expect(content.content).to eq(:mycontent)
90
89
  end
91
90
 
92
91
  it "should cache the returned contents" do
93
- Puppet::FileSystem.expects(:stat).with(path).returns(stub('stat', :ftype => 'file'))
94
- Puppet::FileSystem.expects(:binread).with(path).returns(:mycontent)
92
+ expect(Puppet::FileSystem).to receive(:stat).with(path).and_return(double('stat', :ftype => 'file'))
93
+ expect(Puppet::FileSystem).to receive(:binread).with(path).and_return(:mycontent)
95
94
  content.content
96
95
  # The second run would throw a failure if the content weren't being cached.
97
96
  content.content
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/file_serving/fileset'
@@ -18,49 +17,49 @@ describe Puppet::FileServing::Fileset do
18
17
 
19
18
  it "removes a trailing file path separator" do
20
19
  path_with_separator = "#{somefile}#{File::SEPARATOR}"
21
- Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
20
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
22
21
  fileset = Puppet::FileServing::Fileset.new(path_with_separator)
23
22
  expect(fileset.path).to eq(somefile)
24
23
  end
25
24
 
26
25
  it "can be created from the root directory" do
27
26
  path = File.expand_path(File::SEPARATOR)
28
- Puppet::FileSystem.expects(:lstat).with(path).returns stub('stat')
27
+ expect(Puppet::FileSystem).to receive(:lstat).with(path).and_return(double('stat'))
29
28
  fileset = Puppet::FileServing::Fileset.new(path)
30
29
  expect(fileset.path).to eq(path)
31
30
  end
32
31
 
33
32
  it "fails if its path does not exist" do
34
- Puppet::FileSystem.expects(:lstat).with(somefile).raises(Errno::ENOENT)
33
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_raise(Errno::ENOENT)
35
34
  expect { Puppet::FileServing::Fileset.new(somefile) }.to raise_error(ArgumentError, "Fileset paths must exist")
36
35
  end
37
36
 
38
37
  it "accepts a 'recurse' option" do
39
- Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
38
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
40
39
  set = Puppet::FileServing::Fileset.new(somefile, :recurse => true)
41
40
  expect(set.recurse).to be_truthy
42
41
  end
43
42
 
44
43
  it "accepts a 'recurselimit' option" do
45
- Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
44
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
46
45
  set = Puppet::FileServing::Fileset.new(somefile, :recurselimit => 3)
47
46
  expect(set.recurselimit).to eq(3)
48
47
  end
49
48
 
50
49
  it "accepts an 'ignore' option" do
51
- Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
50
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
52
51
  set = Puppet::FileServing::Fileset.new(somefile, :ignore => ".svn")
53
52
  expect(set.ignore).to eq([".svn"])
54
53
  end
55
54
 
56
55
  it "accepts a 'links' option" do
57
- Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
56
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
58
57
  set = Puppet::FileServing::Fileset.new(somefile, :links => :manage)
59
58
  expect(set.links).to eq(:manage)
60
59
  end
61
60
 
62
61
  it "accepts a 'checksum_type' option" do
63
- Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
62
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
64
63
  set = Puppet::FileServing::Fileset.new(somefile, :checksum_type => :test)
65
64
  expect(set.checksum_type).to eq(:test)
66
65
  end
@@ -70,22 +69,22 @@ describe Puppet::FileServing::Fileset do
70
69
  end
71
70
 
72
71
  it "defaults to 'false' for recurse" do
73
- Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
72
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
74
73
  expect(Puppet::FileServing::Fileset.new(somefile).recurse).to eq(false)
75
74
  end
76
75
 
77
76
  it "defaults to :infinite for recurselimit" do
78
- Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
77
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
79
78
  expect(Puppet::FileServing::Fileset.new(somefile).recurselimit).to eq(:infinite)
80
79
  end
81
80
 
82
81
  it "defaults to an empty ignore list" do
83
- Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
82
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
84
83
  expect(Puppet::FileServing::Fileset.new(somefile).ignore).to eq([])
85
84
  end
86
85
 
87
86
  it "defaults to :manage for links" do
88
- Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
87
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
89
88
  expect(Puppet::FileServing::Fileset.new(somefile).links).to eq(:manage)
90
89
  end
91
90
 
@@ -93,7 +92,7 @@ describe Puppet::FileServing::Fileset do
93
92
  let(:values) { { :links => :manage, :ignore => %w{a b}, :recurse => true, :recurselimit => 1234 } }
94
93
 
95
94
  before :each do
96
- Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
95
+ expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
97
96
  end
98
97
 
99
98
  [:recurse, :recurselimit, :ignore, :links].each do |option|
@@ -130,16 +129,16 @@ describe Puppet::FileServing::Fileset do
130
129
  context "when recursing" do
131
130
  before do
132
131
  @path = make_absolute("/my/path")
133
- Puppet::FileSystem.stubs(:lstat).with(@path).returns stub('stat', :directory? => true)
132
+ allow(Puppet::FileSystem).to receive(:lstat).with(@path).and_return(double('stat', :directory? => true))
134
133
 
135
134
  @fileset = Puppet::FileServing::Fileset.new(@path)
136
135
 
137
- @dirstat = stub 'dirstat', :directory? => true
138
- @filestat = stub 'filestat', :directory? => false
136
+ @dirstat = double('dirstat', :directory? => true)
137
+ @filestat = double('filestat', :directory? => false)
139
138
  end
140
139
 
141
140
  def mock_dir_structure(path, stat_method = :lstat)
142
- Puppet::FileSystem.stubs(stat_method).with(path).returns @dirstat
141
+ allow(Puppet::FileSystem).to receive(stat_method).with(path).and_return(@dirstat)
143
142
 
144
143
  # Keep track of the files we're stubbing.
145
144
  @files = %w{.}
@@ -147,53 +146,59 @@ describe Puppet::FileServing::Fileset do
147
146
  top_names = %w{one two .svn CVS}
148
147
  sub_names = %w{file1 file2 .svn CVS 0 false}
149
148
 
150
- Dir.stubs(:entries).with(path, encoding: Encoding::UTF_8).returns(top_names)
149
+ allow(Dir).to receive(:entries).with(path, encoding: Encoding::UTF_8).and_return(top_names)
151
150
  top_names.each do |subdir|
152
151
  @files << subdir # relative path
153
152
  subpath = File.join(path, subdir)
154
- Puppet::FileSystem.stubs(stat_method).with(subpath).returns @dirstat
155
- Dir.stubs(:entries).with(subpath, encoding: Encoding::UTF_8).returns(sub_names)
153
+ allow(Puppet::FileSystem).to receive(stat_method).with(subpath).and_return(@dirstat)
154
+ allow(Dir).to receive(:entries).with(subpath, encoding: Encoding::UTF_8).and_return(sub_names)
156
155
  sub_names.each do |file|
157
156
  @files << File.join(subdir, file) # relative path
158
157
  subfile_path = File.join(subpath, file)
159
- Puppet::FileSystem.stubs(stat_method).with(subfile_path).returns(@filestat)
158
+ allow(Puppet::FileSystem).to receive(stat_method).with(subfile_path).and_return(@filestat)
160
159
  end
161
160
  end
162
161
  end
163
162
 
164
- MockStat = Struct.new(:path, :directory) do
165
- # struct doesn't support thing ending in ?
166
- def directory?
167
- directory
163
+ def setup_mocks_for_dir(mock_dir, base_path)
164
+ path = File.join(base_path, mock_dir.name)
165
+ allow(Puppet::FileSystem).to receive(:lstat).with(path).and_return(MockStat.new(path, true))
166
+ allow(Dir).to receive(:entries).with(path, encoding: Encoding::UTF_8).and_return(['.', '..'] + mock_dir.entries.map(&:name))
167
+ mock_dir.entries.each do |entry|
168
+ setup_mocks_for_entry(entry, path)
168
169
  end
169
170
  end
170
171
 
171
- MockDirectory = Struct.new(:name, :entries) do
172
- def mock(base_path)
173
- extend Mocha::API
174
- path = File.join(base_path, name)
175
- Puppet::FileSystem.stubs(:lstat).with(path).returns MockStat.new(path, true)
176
- Dir.stubs(:entries).with(path, encoding: Encoding::UTF_8).returns(['.', '..'] + entries.map(&:name))
177
- entries.each do |entry|
178
- entry.mock(path)
179
- end
172
+ def setup_mocks_for_file(mock_file, base_path)
173
+ path = File.join(base_path, mock_file.name)
174
+ allow(Puppet::FileSystem).to receive(:lstat).with(path).and_return(MockStat.new(path, false))
175
+ end
176
+
177
+ def setup_mocks_for_entry(entry, base_path)
178
+ case entry
179
+ when MockDirectory
180
+ setup_mocks_for_dir(entry, base_path)
181
+ when MockFile
182
+ setup_mocks_for_file(entry, base_path)
180
183
  end
181
184
  end
182
185
 
183
- MockFile = Struct.new(:name) do
184
- def mock(base_path)
185
- extend Mocha::API
186
- path = File.join(base_path, name)
187
- Puppet::FileSystem.stubs(:lstat).with(path).returns MockStat.new(path, false)
186
+ MockStat = Struct.new(:path, :directory) do
187
+ # struct doesn't support thing ending in ?
188
+ def directory?
189
+ directory
188
190
  end
189
191
  end
190
192
 
193
+ MockDirectory = Struct.new(:name, :entries)
194
+ MockFile = Struct.new(:name)
195
+
191
196
  it "doesn't ignore pending directories when the last entry at the top level is a file" do
192
197
  structure = MockDirectory.new('path',
193
198
  [MockDirectory.new('dir1',
194
199
  [MockDirectory.new('a', [MockFile.new('f')])]),
195
200
  MockFile.new('file')])
196
- structure.mock(make_absolute('/your'))
201
+ setup_mocks_for_dir(structure, make_absolute('/your'))
197
202
  fileset = Puppet::FileServing::Fileset.new(make_absolute('/your/path'))
198
203
  fileset.recurse = true
199
204
  fileset.links = :manage
@@ -276,8 +281,8 @@ describe Puppet::FileServing::Fileset do
276
281
 
277
282
  it "works when paths have regexp significant characters" do
278
283
  @path = make_absolute("/my/path/rV1x2DafFr0R6tGG+1bbk++++TM")
279
- stat = stub('dir_stat', :directory? => true)
280
- Puppet::FileSystem.expects(:lstat).with(@path).returns stub(@path, :stat => stat, :lstat => stat)
284
+ stat = double('dir_stat', :directory? => true)
285
+ expect(Puppet::FileSystem).to receive(:lstat).with(@path).and_return(double(@path, :stat => stat, :lstat => stat))
281
286
  @fileset = Puppet::FileServing::Fileset.new(@path)
282
287
  mock_dir_structure(@path)
283
288
  @fileset.recurse = true
@@ -287,15 +292,15 @@ describe Puppet::FileServing::Fileset do
287
292
 
288
293
  it "manages the links to missing files" do
289
294
  path = make_absolute("/my/path")
290
- stat = stub 'stat', :directory? => true
295
+ stat = double('stat', :directory? => true)
291
296
 
292
- Puppet::FileSystem.expects(:stat).with(path).returns stat
293
- Puppet::FileSystem.expects(:lstat).with(path).returns stat
297
+ expect(Puppet::FileSystem).to receive(:stat).with(path).and_return(stat)
298
+ expect(Puppet::FileSystem).to receive(:lstat).with(path).and_return(stat)
294
299
 
295
300
  link_path = File.join(path, "mylink")
296
- Puppet::FileSystem.expects(:stat).with(link_path).raises(Errno::ENOENT)
301
+ expect(Puppet::FileSystem).to receive(:stat).with(link_path).and_raise(Errno::ENOENT)
297
302
 
298
- Dir.stubs(:entries).with(path, encoding: Encoding::UTF_8).returns(["mylink"])
303
+ allow(Dir).to receive(:entries).with(path, encoding: Encoding::UTF_8).and_return(["mylink"])
299
304
 
300
305
  fileset = Puppet::FileServing::Fileset.new(path)
301
306
 
@@ -308,20 +313,20 @@ describe Puppet::FileServing::Fileset do
308
313
  context "when merging other filesets" do
309
314
  before do
310
315
  @paths = [make_absolute("/first/path"), make_absolute("/second/path"), make_absolute("/third/path")]
311
- Puppet::FileSystem.stubs(:lstat).returns stub('stat', :directory? => false)
316
+ allow(Puppet::FileSystem).to receive(:lstat).and_return(double('stat', :directory? => false))
312
317
 
313
318
  @filesets = @paths.collect do |path|
314
- Puppet::FileSystem.stubs(:lstat).with(path).returns stub('stat', :directory? => true)
319
+ allow(Puppet::FileSystem).to receive(:lstat).with(path).and_return(double('stat', :directory? => true))
315
320
  Puppet::FileServing::Fileset.new(path, :recurse => true)
316
321
  end
317
322
 
318
- Dir.stubs(:entries).returns []
323
+ allow(Dir).to receive(:entries).and_return([])
319
324
  end
320
325
 
321
326
  it "returns a hash of all files in each fileset with the value being the base path" do
322
- Dir.expects(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).returns(%w{one uno})
323
- Dir.expects(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).returns(%w{two dos})
324
- Dir.expects(:entries).with(make_absolute("/third/path"), encoding: Encoding::UTF_8).returns(%w{three tres})
327
+ expect(Dir).to receive(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).and_return(%w{one uno})
328
+ expect(Dir).to receive(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).and_return(%w{two dos})
329
+ expect(Dir).to receive(:entries).with(make_absolute("/third/path"), encoding: Encoding::UTF_8).and_return(%w{three tres})
325
330
 
326
331
  expect(Puppet::FileServing::Fileset.merge(*@filesets)).to eq({
327
332
  "." => make_absolute("/first/path"),
@@ -335,15 +340,15 @@ describe Puppet::FileServing::Fileset do
335
340
  end
336
341
 
337
342
  it "includes the base directory from the first fileset" do
338
- Dir.expects(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).returns(%w{one})
339
- Dir.expects(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).returns(%w{two})
343
+ expect(Dir).to receive(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).and_return(%w{one})
344
+ expect(Dir).to receive(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).and_return(%w{two})
340
345
 
341
346
  expect(Puppet::FileServing::Fileset.merge(*@filesets)["."]).to eq(make_absolute("/first/path"))
342
347
  end
343
348
 
344
349
  it "uses the base path of the first found file when relative file paths conflict" do
345
- Dir.expects(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).returns(%w{one})
346
- Dir.expects(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).returns(%w{one})
350
+ expect(Dir).to receive(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).and_return(%w{one})
351
+ expect(Dir).to receive(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).and_return(%w{one})
347
352
 
348
353
  expect(Puppet::FileServing::Fileset.merge(*@filesets)["one"]).to eq(make_absolute("/first/path"))
349
354
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/file_serving/http_metadata'
4
3
  require 'matchers/json'
@@ -32,8 +31,8 @@ describe Puppet::FileServing::HttpMetadata do
32
31
 
33
32
  context "with no Last-Modified or Content-MD5 header from the server" do
34
33
  before do
35
- http_response.stubs(:[]).with('last-modified').returns nil
36
- http_response.stubs(:[]).with('content-md5').returns nil
34
+ allow(http_response).to receive(:[]).with('last-modified').and_return(nil)
35
+ allow(http_response).to receive(:[]).with('content-md5').and_return(nil)
37
36
  end
38
37
 
39
38
  it "should use :mtime as the checksum type, based on current time" do
@@ -51,13 +50,14 @@ describe Puppet::FileServing::HttpMetadata do
51
50
 
52
51
  context "with a Last-Modified header from the server" do
53
52
  let(:time) { Time.now.utc }
53
+
54
54
  before do
55
- http_response.stubs(:[]).with('content-md5').returns nil
55
+ allow(http_response).to receive(:[]).with('content-md5').and_return(nil)
56
56
  end
57
57
 
58
58
  it "should use :mtime as the checksum type, based on Last-Modified" do
59
59
  # HTTP uses "GMT" not "UTC"
60
- http_response.stubs(:[]).with('last-modified').returns(time.strftime("%a, %d %b %Y %T GMT"))
60
+ allow(http_response).to receive(:[]).with('last-modified').and_return(time.strftime("%a, %d %b %Y %T GMT"))
61
61
  metadata = described_class.new(http_response)
62
62
  metadata.collect
63
63
  expect( metadata.checksum_type ).to eq :mtime
@@ -69,9 +69,10 @@ describe Puppet::FileServing::HttpMetadata do
69
69
  let(:input) { Time.now.to_s }
70
70
  let(:base64) { Digest::MD5.new.base64digest input }
71
71
  let(:hex) { Digest::MD5.new.hexdigest input }
72
+
72
73
  before do
73
- http_response.stubs(:[]).with('last-modified').returns nil
74
- http_response.stubs(:[]).with('content-md5').returns base64
74
+ allow(http_response).to receive(:[]).with('last-modified').and_return(nil)
75
+ allow(http_response).to receive(:[]).with('content-md5').and_return(base64)
75
76
  end
76
77
 
77
78
  it "should use the md5 checksum" do
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/file_serving/metadata'
4
3
  require 'matchers/json'
@@ -184,14 +183,14 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
184
183
 
185
184
  it "should give a mtime checksum when checksum_type is set" do
186
185
  metadata.checksum_type = "mtime"
187
- metadata.expects(:mtime_file).returns(time)
186
+ expect(metadata).to receive(:mtime_file).and_return(time)
188
187
  metadata.collect
189
188
  expect(metadata.checksum).to eq("{mtime}#{time}")
190
189
  end
191
190
 
192
191
  it "should give a ctime checksum when checksum_type is set" do
193
192
  metadata.checksum_type = "ctime"
194
- metadata.expects(:ctime_file).returns(time)
193
+ expect(metadata).to receive(:ctime_file).and_return(time)
195
194
  metadata.collect
196
195
  expect(metadata.checksum).to eq("{ctime}#{time}")
197
196
  end
@@ -218,7 +217,7 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
218
217
  let(:time) { Time.now }
219
218
 
220
219
  before :each do
221
- metadata.expects(:ctime_file).returns(time)
220
+ expect(metadata).to receive(:ctime_file).and_return(time)
222
221
  end
223
222
 
224
223
  it "should only use checksums of type 'ctime' for directories" do
@@ -228,7 +227,7 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
228
227
 
229
228
  it "should only use checksums of type 'ctime' for directories even if checksum_type set" do
230
229
  metadata.checksum_type = "mtime"
231
- metadata.expects(:mtime_file).never
230
+ expect(metadata).not_to receive(:mtime_file)
232
231
  metadata.collect
233
232
  expect(metadata.checksum).to eq("{ctime}#{time}")
234
233
  end
@@ -249,9 +248,9 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
249
248
  path = tmpfile('foo')
250
249
  FileUtils.touch(path)
251
250
 
252
- Puppet::Util::Windows::Security.stubs(:get_owner).with(path).raises(invalid_error)
253
- Puppet::Util::Windows::Security.stubs(:get_group).with(path).raises(invalid_error)
254
- Puppet::Util::Windows::Security.stubs(:get_mode).with(path).raises(invalid_error)
251
+ allow(Puppet::Util::Windows::Security).to receive(:get_owner).with(path).and_raise(invalid_error)
252
+ allow(Puppet::Util::Windows::Security).to receive(:get_group).with(path).and_raise(invalid_error)
253
+ allow(Puppet::Util::Windows::Security).to receive(:get_mode).with(path).and_raise(invalid_error)
255
254
 
256
255
  stat = Puppet::FileSystem.stat(path)
257
256
 
@@ -267,9 +266,9 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
267
266
  path = tmpfile('bar')
268
267
  FileUtils.touch(path)
269
268
 
270
- Puppet::Util::Windows::Security.stubs(:get_owner).with(path, :use).raises(invalid_error)
271
- Puppet::Util::Windows::Security.stubs(:get_group).with(path, :use).raises(invalid_error)
272
- Puppet::Util::Windows::Security.stubs(:get_mode).with(path, :use).raises(invalid_error)
269
+ allow(Puppet::Util::Windows::Security).to receive(:get_owner).with(path, :use).and_raise(invalid_error)
270
+ allow(Puppet::Util::Windows::Security).to receive(:get_group).with(path, :use).and_raise(invalid_error)
271
+ allow(Puppet::Util::Windows::Security).to receive(:get_mode).with(path, :use).and_raise(invalid_error)
273
272
 
274
273
  stat = Puppet::FileSystem.stat(path)
275
274
 
@@ -348,8 +347,8 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
348
347
  let(:group) {20}
349
348
 
350
349
  before :each do
351
- File::Stat.any_instance.stubs(:uid).returns owner
352
- File::Stat.any_instance.stubs(:gid).returns group
350
+ allow_any_instance_of(File::Stat).to receive(:uid).and_return(owner)
351
+ allow_any_instance_of(File::Stat).to receive(:gid).and_return(group)
353
352
  end
354
353
 
355
354
  describe "when collecting attributes when managing files" do
@@ -394,8 +393,8 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
394
393
 
395
394
  before :each do
396
395
  require 'puppet/util/windows/security'
397
- Puppet::Util::Windows::Security.stubs(:get_owner).returns owner
398
- Puppet::Util::Windows::Security.stubs(:get_group).returns group
396
+ allow(Puppet::Util::Windows::Security).to receive(:get_owner).and_return(owner)
397
+ allow(Puppet::Util::Windows::Security).to receive(:get_group).and_return(group)
399
398
  end
400
399
 
401
400
  describe "when collecting attributes when managing files" do
@@ -441,19 +440,19 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
441
440
  end
442
441
 
443
442
  it "should default owner" do
444
- Puppet::Util::Windows::Security.stubs(:get_owner).returns nil
443
+ allow(Puppet::Util::Windows::Security).to receive(:get_owner).and_return(nil)
445
444
 
446
445
  expect(metadata.owner).to eq('S-1-5-32-544')
447
446
  end
448
447
 
449
448
  it "should default group" do
450
- Puppet::Util::Windows::Security.stubs(:get_group).returns nil
449
+ allow(Puppet::Util::Windows::Security).to receive(:get_group).and_return(nil)
451
450
 
452
451
  expect(metadata.group).to eq('S-1-0-0')
453
452
  end
454
453
 
455
454
  it "should default mode" do
456
- Puppet::Util::Windows::Security.stubs(:get_mode).returns nil
455
+ allow(Puppet::Util::Windows::Security).to receive(:get_mode).and_return(nil)
457
456
 
458
457
  expect(metadata.mode).to eq(0644)
459
458
  end
@@ -461,24 +460,23 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
461
460
  describe "when the path raises an Invalid ACL error" do
462
461
  # these simulate the behavior of a symlink file whose target does not support ACLs
463
462
  it "should default owner" do
464
- Puppet::Util::Windows::Security.stubs(:get_owner).raises(invalid_dacl_error)
463
+ allow(Puppet::Util::Windows::Security).to receive(:get_owner).and_raise(invalid_dacl_error)
465
464
 
466
465
  expect(metadata.owner).to eq('S-1-5-32-544')
467
466
  end
468
467
 
469
468
  it "should default group" do
470
- Puppet::Util::Windows::Security.stubs(:get_group).raises(invalid_dacl_error)
469
+ allow(Puppet::Util::Windows::Security).to receive(:get_group).and_raise(invalid_dacl_error)
471
470
 
472
471
  expect(metadata.group).to eq('S-1-0-0')
473
472
  end
474
473
 
475
474
  it "should default mode" do
476
- Puppet::Util::Windows::Security.stubs(:get_mode).raises(invalid_dacl_error)
475
+ allow(Puppet::Util::Windows::Security).to receive(:get_mode).and_raise(invalid_dacl_error)
477
476
 
478
477
  expect(metadata.mode).to eq(0644)
479
478
  end
480
479
  end
481
-
482
480
  end
483
481
 
484
482
  def set_mode(mode, path)
@@ -487,35 +485,35 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
487
485
  end
488
486
  end
489
487
 
490
-
491
488
  describe Puppet::FileServing::Metadata, " when pointing to a link", :if => Puppet.features.manages_symlinks?, :uses_checksums => true do
492
489
  with_digest_algorithms do
493
490
  describe "when links are managed" do
494
491
  before do
495
492
  path = "/base/path/my/file"
496
493
  @file = Puppet::FileServing::Metadata.new(path, :links => :manage)
497
- stat = stub("stat", :uid => 1, :gid => 2, :ftype => "link", :mode => 0755)
498
- Puppet::FileSystem.expects(:lstat).with(path).at_least_once.returns stat
499
- Puppet::FileSystem.expects(:readlink).with(path).at_least_once.returns "/some/other/path"
500
- @file.stubs("#{digest_algorithm}_file".intern).returns(checksum) # Remove these when :managed links are no longer checksumed.
494
+ stat = double("stat", :uid => 1, :gid => 2, :ftype => "link", :mode => 0755)
495
+ expect(Puppet::FileSystem).to receive(:lstat).with(path).and_return(stat)
496
+ expect(Puppet::FileSystem).to receive(:readlink).with(path).and_return("/some/other/path")
497
+ allow(@file).to receive("#{digest_algorithm}_file".intern).and_return(checksum) # Remove these when :managed links are no longer checksumed.
501
498
 
502
499
  if Puppet::Util::Platform.windows?
503
- win_stat = stub('win_stat', :owner => 'snarf', :group => 'thundercats',
500
+ win_stat = double('win_stat', :owner => 'snarf', :group => 'thundercats',
504
501
  :ftype => 'link', :mode => 0755)
505
- Puppet::FileServing::Metadata::WindowsStat.stubs(:new).returns win_stat
502
+ allow(Puppet::FileServing::Metadata::WindowsStat).to receive(:new).and_return(win_stat)
506
503
  end
507
-
508
504
  end
509
505
 
510
506
  it "should store the destination of the link in :destination if links are :manage" do
511
507
  @file.collect
512
508
  expect(@file.destination).to eq("/some/other/path")
513
509
  end
510
+
514
511
  pending "should not collect the checksum if links are :manage" do
515
512
  # We'd like this to be true, but we need to always collect the checksum because in the server/client/server round trip we lose the distintion between manage and follow.
516
513
  @file.collect
517
514
  expect(@file.checksum).to be_nil
518
515
  end
516
+
519
517
  it "should collect the checksum if links are :manage" do # see pending note above
520
518
  @file.collect
521
519
  expect(@file.checksum).to eq("{#{digest_algorithm}}#{checksum}")
@@ -526,22 +524,24 @@ describe Puppet::FileServing::Metadata, " when pointing to a link", :if => Puppe
526
524
  before do
527
525
  path = "/base/path/my/file"
528
526
  @file = Puppet::FileServing::Metadata.new(path, :links => :follow)
529
- stat = stub("stat", :uid => 1, :gid => 2, :ftype => "file", :mode => 0755)
530
- Puppet::FileSystem.expects(:stat).with(path).at_least_once.returns stat
531
- Puppet::FileSystem.expects(:readlink).never
527
+ stat = double("stat", :uid => 1, :gid => 2, :ftype => "file", :mode => 0755)
528
+ expect(Puppet::FileSystem).to receive(:stat).with(path).and_return(stat)
529
+ expect(Puppet::FileSystem).not_to receive(:readlink)
532
530
 
533
531
  if Puppet::Util::Platform.windows?
534
- win_stat = stub('win_stat', :owner => 'snarf', :group => 'thundercats',
532
+ win_stat = double('win_stat', :owner => 'snarf', :group => 'thundercats',
535
533
  :ftype => 'file', :mode => 0755)
536
- Puppet::FileServing::Metadata::WindowsStat.stubs(:new).returns win_stat
534
+ allow(Puppet::FileServing::Metadata::WindowsStat).to receive(:new).and_return(win_stat)
537
535
  end
538
536
 
539
- @file.stubs("#{digest_algorithm}_file".intern).returns(checksum)
537
+ allow(@file).to receive("#{digest_algorithm}_file".intern).and_return(checksum)
540
538
  end
539
+
541
540
  it "should not store the destination of the link in :destination if links are :follow" do
542
541
  @file.collect
543
542
  expect(@file.destination).to be_nil
544
543
  end
544
+
545
545
  it "should collect the checksum if links are :follow" do
546
546
  @file.collect
547
547
  expect(@file.checksum).to eq("{#{digest_algorithm}}#{checksum}")