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/defaults'
@@ -113,7 +112,7 @@ describe Puppet::Indirector, "when registering an indirection" do
113
112
  end
114
113
 
115
114
  it "should pass any provided options to the indirection during initialization" do
116
- Puppet::Indirector::Indirection.expects(:new).with(@thingie, :first, {:some => :options, :indirected_class => 'Thingie'})
115
+ expect(Puppet::Indirector::Indirection).to receive(:new).with(@thingie, :first, {:some => :options, :indirected_class => 'Thingie'})
117
116
  @indirection = @thingie.indirects :first, :some => :options
118
117
  end
119
118
 
@@ -384,7 +384,7 @@ describe "Puppet::InfoService" do
384
384
  it "avoids parsing file more than once when environments have same feature flag set" do
385
385
  # in this version of puppet, all environments are equal in this respect
386
386
  result = Puppet::Pops::Parser::EvaluatingParser.new.parse_file("#{code_dir}/fum.pp")
387
- Puppet::Pops::Parser::EvaluatingParser.any_instance.expects(:parse_file).with("#{code_dir}/fum.pp").returns(result).once
387
+ expect_any_instance_of(Puppet::Pops::Parser::EvaluatingParser).to receive(:parse_file).with("#{code_dir}/fum.pp").once.and_return(result)
388
388
  files_production = ['fum.pp'].map {|f| File.join(code_dir, f) }
389
389
  files_test = files_production
390
390
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/interface'
4
3
  require 'puppet/network/format_handler'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/interface'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/interface'
4
3
 
@@ -138,7 +137,7 @@ describe Puppet::Interface::Action do
138
137
  end
139
138
 
140
139
  it "should call #validate_and_clean on the action when invoked" do
141
- face.get_action(:bar).expects(:validate_and_clean).with({}).returns({})
140
+ expect(face.get_action(:bar)).to receive(:validate_and_clean).with({}).and_return({})
142
141
  face.bar 1, :two, 'three'
143
142
  end
144
143
  end
@@ -397,7 +396,7 @@ describe Puppet::Interface::Action do
397
396
 
398
397
  it "should not invoke a decorator if the options are empty" do
399
398
  face.option("--foo FOO") { before_action { |_,_,_| report :before_action } }
400
- face.expects(:report).never
399
+ expect(face).not_to receive(:report)
401
400
  face.bar
402
401
  end
403
402
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/interface'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'tmpdir'
@@ -55,13 +54,13 @@ describe Puppet::Interface::FaceCollection do
55
54
  end
56
55
 
57
56
  it "should attempt to load the face if it isn't found" do
58
- subject.expects(:require).once.with('puppet/face/bar')
59
- subject.expects(:require).once.with('puppet/face/0.0.1/bar')
57
+ expect(subject).to receive(:require).once.with('puppet/face/bar')
58
+ expect(subject).to receive(:require).once.with('puppet/face/0.0.1/bar')
60
59
  subject["bar", '0.0.1']
61
60
  end
62
61
 
63
62
  it "should attempt to load the default face for the specified version :current" do
64
- subject.expects(:require).with('puppet/face/fozzie')
63
+ expect(subject).to receive(:require).with('puppet/face/fozzie')
65
64
  subject['fozzie', :current]
66
65
  end
67
66
 
@@ -71,29 +70,37 @@ describe Puppet::Interface::FaceCollection do
71
70
  end
72
71
 
73
72
  it "should attempt to require the face if it is not registered" do
74
- subject.expects(:require).with do |file|
73
+ expect(subject).to receive(:require) do |file|
75
74
  subject.instance_variable_get("@faces")[:bar][SemanticPuppet::Version.parse('0.0.1')] = true
76
- file == 'puppet/face/bar'
75
+ expect(file).to eq('puppet/face/bar')
77
76
  end
77
+
78
78
  expect(subject["bar", '0.0.1']).to be_truthy
79
79
  end
80
80
 
81
81
  it "should return false if the face is not registered" do
82
- subject.stubs(:require).returns(true)
82
+ allow(subject).to receive(:require).and_return(true)
83
83
  expect(subject["bar", '0.0.1']).to be_falsey
84
84
  end
85
85
 
86
86
  it "should return false if the face file itself is missing" do
87
- subject.stubs(:require).
88
- raises(LoadError, 'no such file to load -- puppet/face/bar').then.
89
- raises(LoadError, 'no such file to load -- puppet/face/0.0.1/bar')
87
+ num_calls = 0
88
+ allow(subject).to receive(:require) do
89
+ num_calls += 1
90
+ if num_calls == 1
91
+ raise LoadError.new('no such file to load -- puppet/face/bar')
92
+ else
93
+ raise LoadError.new('no such file to load -- puppet/face/0.0.1/bar')
94
+ end
95
+ end
96
+
90
97
  expect(subject["bar", '0.0.1']).to be_falsey
91
98
  end
92
99
 
93
100
  it "should register the version loaded by `:current` as `:current`" do
94
- subject.expects(:require).with do |file|
101
+ expect(subject).to receive(:require) do |file|
95
102
  subject.instance_variable_get("@faces")[:huzzah]['2.0.1'] = :huzzah_face
96
- file == 'puppet/face/huzzah'
103
+ expect(file).to eq('puppet/face/huzzah')
97
104
  end
98
105
  subject["huzzah", :current]
99
106
  expect(subject.instance_variable_get("@faces")[:huzzah][:current]).to eq(:huzzah_face)
@@ -61,7 +61,7 @@ describe Puppet::Interface do
61
61
  end
62
62
 
63
63
  it "should load actions" do
64
- subject.any_instance.expects(:load_actions)
64
+ expect_any_instance_of(subject).to receive(:load_actions)
65
65
  subject.define(:face_test_load_actions, '0.0.1')
66
66
  end
67
67
 
@@ -121,8 +121,8 @@ describe Puppet::Interface do
121
121
  end
122
122
 
123
123
  it "should try to require faces that are not known" do
124
- subject::FaceCollection.expects(:load_face).with(:foo, :current)
125
- subject::FaceCollection.expects(:load_face).with(:foo, '0.0.1')
124
+ expect(subject::FaceCollection).to receive(:load_face).with(:foo, :current)
125
+ expect(subject::FaceCollection).to receive(:load_face).with(:foo, '0.0.1')
126
126
  expect { subject[:foo, '0.0.1'] }.to raise_error Puppet::Error
127
127
  end
128
128
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/face'
4
3
 
@@ -13,8 +12,8 @@ describe Puppet::Face[:man, :current] do
13
12
  end
14
13
 
15
14
  it "exits with 0 when generating man documentation for each available application" do
16
- Puppet::Util.stubs(:which).with('ronn').returns(nil)
17
- Puppet::Util.stubs(:which).with(pager).returns(pager)
15
+ allow(Puppet::Util).to receive(:which).with('ronn').and_return(nil)
16
+ allow(Puppet::Util).to receive(:which).with(pager).and_return(pager)
18
17
 
19
18
  Puppet::Application.available_application_names.each do |name|
20
19
  next if %w{man face_base indirection_base}.include? name
@@ -23,7 +22,7 @@ describe Puppet::Face[:man, :current] do
23
22
  app = klass.new(Puppet::Util::CommandLine.new('puppet', ['man', name]))
24
23
 
25
24
  expect do
26
- IO.stubs(:popen).with(pager, 'w:UTF-8').yields($stdout)
25
+ allow(IO).to receive(:popen).with(pager, 'w:UTF-8').and_yield($stdout)
27
26
 
28
27
  expect { app.run }.to exit_with(0)
29
28
  end.to_not have_printed(/undefined method `gsub'/)
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet_spec/files'
4
3
  require 'puppet_spec/modules'
@@ -7,7 +6,7 @@ require 'puppet/module_tool/checksums'
7
6
  describe Puppet::Module do
8
7
  include PuppetSpec::Files
9
8
 
10
- let(:env) { mock("environment") }
9
+ let(:env) { double("environment") }
11
10
  let(:path) { "/path" }
12
11
  let(:name) { "mymod" }
13
12
  let(:mod) { Puppet::Module.new(name, path, env) }
@@ -15,12 +14,12 @@ describe Puppet::Module do
15
14
  before do
16
15
  # This is necessary because of the extra checks we have for the deprecated
17
16
  # 'plugins' directory
18
- Puppet::FileSystem.stubs(:exist?).returns false
17
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
19
18
  end
20
19
 
21
20
  it "should have a class method that returns a named module from a given environment" do
22
21
  env = Puppet::Node::Environment.create(:myenv, [])
23
- env.expects(:module).with(name).returns "yep"
22
+ expect(env).to receive(:module).with(name).and_return("yep")
24
23
  Puppet.override(:environments => Puppet::Environments::Static.new(env)) do
25
24
  expect(Puppet::Module.find(name, "myenv")).to eq("yep")
26
25
  end
@@ -28,7 +27,7 @@ describe Puppet::Module do
28
27
 
29
28
  it "should return nil if asked for a named module that doesn't exist" do
30
29
  env = Puppet::Node::Environment.create(:myenv, [])
31
- env.expects(:module).with(name).returns nil
30
+ expect(env).to receive(:module).with(name).and_return(nil)
32
31
  Puppet.override(:environments => Puppet::Environments::Static.new(env)) do
33
32
  expect(Puppet::Module.find(name, "myenv")).to be_nil
34
33
  end
@@ -136,7 +135,7 @@ describe Puppet::Module do
136
135
 
137
136
  describe "when finding unmet dependencies" do
138
137
  before do
139
- Puppet::FileSystem.unstub(:exist?)
138
+ allow(Puppet::FileSystem).to receive(:exist?).and_call_original
140
139
  @modpath = tmpdir('modpath')
141
140
  Puppet.settings[:modulepath] = @modpath
142
141
  end
@@ -163,7 +162,7 @@ describe Puppet::Module do
163
162
  :environment => env
164
163
  )
165
164
 
166
- env.expects(:module_by_forge_name).with('foo/child').returns(child)
165
+ expect(env).to receive(:module_by_forge_name).with('foo/child').and_return(child)
167
166
 
168
167
  expect(parent.unmet_dependencies).to eq([])
169
168
  end
@@ -181,7 +180,7 @@ describe Puppet::Module do
181
180
  :environment => env
182
181
  )
183
182
 
184
- env.expects(:module_by_forge_name).with('baz/foobar').returns(nil)
183
+ expect(env).to receive(:module_by_forge_name).with('baz/foobar').and_return(nil)
185
184
 
186
185
  expect(mod.unmet_dependencies).to eq([{
187
186
  :reason => :missing,
@@ -205,7 +204,7 @@ describe Puppet::Module do
205
204
  :environment => env
206
205
  )
207
206
 
208
- env.expects(:module_by_forge_name).with('baz/foobar=bar').returns(nil)
207
+ expect(env).to receive(:module_by_forge_name).with('baz/foobar=bar').and_return(nil)
209
208
 
210
209
  expect(mod.unmet_dependencies).to eq([{
211
210
  :reason => :missing,
@@ -222,7 +221,7 @@ describe Puppet::Module do
222
221
  ['test_gte_req', 'test_specific_req', 'foobar'].each do |mod_name|
223
222
  mod_dir = "#{@modpath}/#{mod_name}"
224
223
  metadata_file = "#{mod_dir}/metadata.json"
225
- Puppet::FileSystem.stubs(:exist?).with(metadata_file).returns true
224
+ allow(Puppet::FileSystem).to receive(:exist?).with(metadata_file).and_return(true)
226
225
  end
227
226
  mod = PuppetSpec::Modules.create(
228
227
  'test_gte_req',
@@ -488,33 +487,34 @@ describe Puppet::Module do
488
487
  else
489
488
  dirname = filetype.to_s
490
489
  end
490
+
491
491
  it "should be able to return individual #{filetype}" do
492
492
  module_file = File.join(path, dirname, "my/file")
493
- Puppet::FileSystem.expects(:exist?).with(module_file).returns true
493
+ expect(Puppet::FileSystem).to receive(:exist?).with(module_file).and_return(true)
494
494
  expect(mod.send(filetype.to_s.sub(/s$/, ''), "my/file")).to eq(module_file)
495
495
  end
496
496
 
497
497
  it "should consider #{filetype} to be present if their base directory exists" do
498
498
  module_file = File.join(path, dirname)
499
- Puppet::FileSystem.expects(:exist?).with(module_file).returns true
499
+ expect(Puppet::FileSystem).to receive(:exist?).with(module_file).and_return(true)
500
500
  expect(mod.send(filetype.to_s + "?")).to be_truthy
501
501
  end
502
502
 
503
503
  it "should consider #{filetype} to be absent if their base directory does not exist" do
504
504
  module_file = File.join(path, dirname)
505
- Puppet::FileSystem.expects(:exist?).with(module_file).returns false
505
+ expect(Puppet::FileSystem).to receive(:exist?).with(module_file).and_return(false)
506
506
  expect(mod.send(filetype.to_s + "?")).to be_falsey
507
507
  end
508
508
 
509
509
  it "should return nil if asked to return individual #{filetype} that don't exist" do
510
510
  module_file = File.join(path, dirname, "my/file")
511
- Puppet::FileSystem.expects(:exist?).with(module_file).returns false
511
+ expect(Puppet::FileSystem).to receive(:exist?).with(module_file).and_return(false)
512
512
  expect(mod.send(filetype.to_s.sub(/s$/, ''), "my/file")).to be_nil
513
513
  end
514
514
 
515
515
  it "should return the base directory if asked for a nil path" do
516
516
  base = File.join(path, dirname)
517
- Puppet::FileSystem.expects(:exist?).with(base).returns true
517
+ expect(Puppet::FileSystem).to receive(:exist?).with(base).and_return(true)
518
518
  expect(mod.send(filetype.to_s.sub(/s$/, ''), nil)).to eq(base)
519
519
  end
520
520
  end
@@ -529,7 +529,7 @@ describe Puppet::Module do
529
529
 
530
530
  describe "when finding tasks" do
531
531
  before do
532
- Puppet::FileSystem.unstub(:exist?)
532
+ allow(Puppet::FileSystem).to receive(:exist?).and_call_original
533
533
  @modpath = tmpdir('modpath')
534
534
  Puppet.settings[:modulepath] = @modpath
535
535
  end
@@ -570,29 +570,24 @@ describe Puppet::Module do
570
570
  end
571
571
 
572
572
  describe "does the task finding" do
573
- before :each do
574
- Puppet::FileSystem.unstub(:exist?)
575
- Puppet::Module::Task.unstub(:tasks_in_module)
576
- end
577
-
578
573
  let(:mod_name) { 'tasks_test_lazy' }
579
574
  let(:mod_tasks_dir) { File.join(@modpath, mod_name, 'tasks') }
580
575
 
581
576
  it "after the module is initialized" do
582
- Puppet::FileSystem.expects(:exist?).with(mod_tasks_dir).never
583
- Puppet::Module::Task.expects(:tasks_in_module).never
577
+ expect(Puppet::FileSystem).not_to receive(:exist?).with(mod_tasks_dir)
578
+ expect(Puppet::Module::Task).not_to receive(:tasks_in_module)
584
579
  Puppet::Module.new(mod_name, @modpath, env)
585
580
  end
586
581
 
587
582
  it "when the tasks method is called" do
588
- Puppet::Module::Task.expects(:tasks_in_module)
583
+ expect(Puppet::Module::Task).to receive(:tasks_in_module)
589
584
  mod = PuppetSpec::Modules.create(mod_name, @modpath, {:environment => env,
590
585
  :tasks => [['itascanstaccatotask']]})
591
586
  mod.tasks
592
587
  end
593
588
 
594
589
  it "only once for the lifetime of the module object" do
595
- Dir.expects(:glob).with("#{mod_tasks_dir}/*").once.returns ['allalaskataskattacktactics']
590
+ expect(Dir).to receive(:glob).with("#{mod_tasks_dir}/*").once.and_return(['allalaskataskattacktactics'])
596
591
  mod = PuppetSpec::Modules.create(mod_name, @modpath, {:environment => env,
597
592
  :tasks => []})
598
593
  mod.tasks
@@ -604,46 +599,46 @@ end
604
599
 
605
600
  describe Puppet::Module, "when finding matching manifests" do
606
601
  before do
607
- @mod = Puppet::Module.new("mymod", "/a", mock("environment"))
602
+ @mod = Puppet::Module.new("mymod", "/a", double("environment"))
608
603
  @pq_glob_with_extension = "yay/*.xx"
609
604
  @fq_glob_with_extension = "/a/manifests/#{@pq_glob_with_extension}"
610
605
  end
611
606
 
612
607
  it "should return all manifests matching the glob pattern" do
613
- Dir.expects(:glob).with(@fq_glob_with_extension).returns(%w{foo bar})
614
- FileTest.stubs(:directory?).returns false
608
+ expect(Dir).to receive(:glob).with(@fq_glob_with_extension).and_return(%w{foo bar})
609
+ allow(FileTest).to receive(:directory?).and_return(false)
615
610
 
616
611
  expect(@mod.match_manifests(@pq_glob_with_extension)).to eq(%w{foo bar})
617
612
  end
618
613
 
619
614
  it "should not return directories" do
620
- Dir.expects(:glob).with(@fq_glob_with_extension).returns(%w{foo bar})
615
+ expect(Dir).to receive(:glob).with(@fq_glob_with_extension).and_return(%w{foo bar})
621
616
 
622
- FileTest.expects(:directory?).with("foo").returns false
623
- FileTest.expects(:directory?).with("bar").returns true
617
+ expect(FileTest).to receive(:directory?).with("foo").and_return(false)
618
+ expect(FileTest).to receive(:directory?).with("bar").and_return(true)
624
619
  expect(@mod.match_manifests(@pq_glob_with_extension)).to eq(%w{foo})
625
620
  end
626
621
 
627
622
  it "should default to the 'init' file if no glob pattern is specified" do
628
- Puppet::FileSystem.expects(:exist?).with("/a/manifests/init.pp").returns(true)
623
+ expect(Puppet::FileSystem).to receive(:exist?).with("/a/manifests/init.pp").and_return(true)
629
624
 
630
625
  expect(@mod.match_manifests(nil)).to eq(%w{/a/manifests/init.pp})
631
626
  end
632
627
 
633
628
  it "should return all manifests matching the glob pattern in all existing paths" do
634
- Dir.expects(:glob).with(@fq_glob_with_extension).returns(%w{a b})
629
+ expect(Dir).to receive(:glob).with(@fq_glob_with_extension).and_return(%w{a b})
635
630
 
636
631
  expect(@mod.match_manifests(@pq_glob_with_extension)).to eq(%w{a b})
637
632
  end
638
633
 
639
634
  it "should match the glob pattern plus '.pp' if no extension is specified" do
640
- Dir.expects(:glob).with("/a/manifests/yay/foo.pp").returns(%w{yay})
635
+ expect(Dir).to receive(:glob).with("/a/manifests/yay/foo.pp").and_return(%w{yay})
641
636
 
642
637
  expect(@mod.match_manifests("yay/foo")).to eq(%w{yay})
643
638
  end
644
639
 
645
640
  it "should return an empty array if no manifests matched" do
646
- Dir.expects(:glob).with(@fq_glob_with_extension).returns([])
641
+ expect(Dir).to receive(:glob).with(@fq_glob_with_extension).and_return([])
647
642
 
648
643
  expect(@mod.match_manifests(@pq_glob_with_extension)).to eq([])
649
644
  end
@@ -675,7 +670,7 @@ describe Puppet::Module do
675
670
  end
676
671
 
677
672
  it "should cache the license file" do
678
- mymod.expects(:path).once.returns nil
673
+ expect(mymod).to receive(:path).once.and_return(nil)
679
674
  mymod.license_file
680
675
  mymod.license_file
681
676
  end
@@ -685,24 +680,24 @@ describe Puppet::Module do
685
680
  end
686
681
 
687
682
  it "should not have metadata if it has a metadata file and its data is valid but empty json hash" do
688
- File.stubs(:read).with(mymod_metadata, {:encoding => 'utf-8'}).returns "{}"
683
+ allow(File).to receive(:read).with(mymod_metadata, {:encoding => 'utf-8'}).and_return("{}")
689
684
 
690
685
  expect(mymod).not_to be_has_metadata
691
686
  end
692
687
 
693
688
  it "should not have metadata if it has a metadata file and its data is empty" do
694
- File.stubs(:read).with(mymod_metadata, {:encoding => 'utf-8'}).returns ""
689
+ allow(File).to receive(:read).with(mymod_metadata, {:encoding => 'utf-8'}).and_return("")
695
690
 
696
691
  expect(mymod).not_to be_has_metadata
697
692
  end
698
693
 
699
694
  it "should not have metadata if has a metadata file and its data is invalid" do
700
- File.stubs(:read).with(mymod_metadata, {:encoding => 'utf-8'}).returns "This is some invalid json.\n"
695
+ allow(File).to receive(:read).with(mymod_metadata, {:encoding => 'utf-8'}).and_return("This is some invalid json.\n")
701
696
  expect(mymod).not_to be_has_metadata
702
697
  end
703
698
 
704
699
  it "should know if it is missing a metadata file" do
705
- File.stubs(:read).with(mymod_metadata, {:encoding => 'utf-8'}).raises(Errno::ENOENT)
700
+ allow(File).to receive(:read).with(mymod_metadata, {:encoding => 'utf-8'}).and_raise(Errno::ENOENT)
706
701
 
707
702
  expect(mymod).not_to be_has_metadata
708
703
  end
@@ -712,13 +707,13 @@ describe Puppet::Module do
712
707
  end
713
708
 
714
709
  it "should parse its metadata file on initialization if it is present" do
715
- Puppet::Module.any_instance.expects(:load_metadata)
710
+ expect_any_instance_of(Puppet::Module).to receive(:load_metadata)
716
711
 
717
- Puppet::Module.new("yay", "/path", mock("env"))
712
+ Puppet::Module.new("yay", "/path", double("env"))
718
713
  end
719
714
 
720
715
  it "should tolerate failure to parse" do
721
- File.stubs(:read).with(mymod_metadata, {:encoding => 'utf-8'}).returns(my_fixture('trailing-comma.json'))
716
+ allow(File).to receive(:read).with(mymod_metadata, {:encoding => 'utf-8'}).and_return(my_fixture('trailing-comma.json'))
722
717
 
723
718
  expect(mymod.has_metadata?).to be_falsey
724
719
  end
@@ -729,7 +724,7 @@ describe Puppet::Module do
729
724
  end
730
725
 
731
726
  it "should warn about a failure to parse" do
732
- File.stubs(:read).with(mymod_metadata, {:encoding => 'utf-8'}).returns(my_fixture('trailing-comma.json'))
727
+ allow(File).to receive(:read).with(mymod_metadata, {:encoding => 'utf-8'}).and_return(my_fixture('trailing-comma.json'))
733
728
 
734
729
  expect(mymod.has_metadata?).to be_falsey
735
730
  expect(@logs).to have_matching_log(/mymod has an invalid and unparsable metadata\.json file/)
@@ -742,7 +737,7 @@ describe Puppet::Module do
742
737
  end
743
738
 
744
739
  it "should not warn about a failure to parse" do
745
- File.stubs(:read).with(mymod_metadata, {:encoding => 'utf-8'}).returns(my_fixture('trailing-comma.json'))
740
+ allow(File).to receive(:read).with(mymod_metadata, {:encoding => 'utf-8'}).and_return(my_fixture('trailing-comma.json'))
746
741
 
747
742
  expect(mymod.has_metadata?).to be_falsey
748
743
  expect(@logs).to_not have_matching_log(/mymod has an invalid and unparsable metadata\.json file.*/)
@@ -750,7 +745,7 @@ describe Puppet::Module do
750
745
 
751
746
  it "should log debug output about a failure to parse when --debug is on" do
752
747
  Puppet[:log_level] = :debug
753
- File.stubs(:read).with(mymod_metadata, {:encoding => 'utf-8'}).returns(my_fixture('trailing-comma.json'))
748
+ allow(File).to receive(:read).with(mymod_metadata, {:encoding => 'utf-8'}).and_return(my_fixture('trailing-comma.json'))
754
749
 
755
750
  expect(mymod.has_metadata?).to be_falsey
756
751
  expect(@logs).to have_matching_log(/mymod has an invalid and unparsable metadata\.json file.*/)
@@ -763,7 +758,7 @@ describe Puppet::Module do
763
758
  end
764
759
 
765
760
  it "should fail on a failure to parse" do
766
- File.stubs(:read).with(mymod_metadata, {:encoding => 'utf-8'}).returns(my_fixture('trailing-comma.json'))
761
+ allow(File).to receive(:read).with(mymod_metadata, {:encoding => 'utf-8'}).and_return(my_fixture('trailing-comma.json'))
767
762
 
768
763
  expect do
769
764
  expect(mymod.has_metadata?).to be_falsey
@@ -772,8 +767,8 @@ describe Puppet::Module do
772
767
  end
773
768
 
774
769
  def a_module_with_metadata(data)
775
- File.stubs(:read).with("/path/metadata.json", {:encoding => 'utf-8'}).returns data.to_json
776
- Puppet::Module.new("foo", "/path", mock("env"))
770
+ allow(File).to receive(:read).with("/path/metadata.json", {:encoding => 'utf-8'}).and_return(data.to_json)
771
+ Puppet::Module.new("foo", "/path", double("env"))
777
772
  end
778
773
 
779
774
  describe "when loading the metadata file" do
@@ -819,8 +814,8 @@ describe Puppet::Module do
819
814
  EOF
820
815
  end
821
816
 
822
- Puppet::Module.any_instance.stubs(:metadata_file).returns metadata_json
823
- mod = Puppet::Module.new('foo', '/path', mock('env'))
817
+ allow_any_instance_of(Puppet::Module).to receive(:metadata_file).and_return(metadata_json)
818
+ mod = Puppet::Module.new('foo', '/path', double('env'))
824
819
 
825
820
  mod.load_metadata
826
821
  expect(mod.author).to eq(rune_utf8)