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

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

Potentially problematic release.


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

Files changed (632) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +4 -8
  4. data/lib/puppet/application/device.rb +99 -83
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/configurer.rb +5 -4
  7. data/lib/puppet/defaults.rb +31 -11
  8. data/lib/puppet/indirector/request.rb +26 -15
  9. data/lib/puppet/network/http/connection.rb +15 -7
  10. data/lib/puppet/transaction/event_manager.rb +1 -5
  11. data/lib/puppet/type/file/source.rb +0 -1
  12. data/lib/puppet/util/connection.rb +15 -6
  13. data/lib/puppet/util/http_proxy.rb +3 -2
  14. data/lib/puppet/version.rb +1 -1
  15. data/locales/puppet.pot +99 -40
  16. data/man/man5/puppet.conf.5 +8 -8
  17. data/man/man8/puppet-agent.8 +1 -1
  18. data/man/man8/puppet-apply.8 +1 -1
  19. data/man/man8/puppet-catalog.8 +1 -1
  20. data/man/man8/puppet-config.8 +1 -1
  21. data/man/man8/puppet-describe.8 +1 -1
  22. data/man/man8/puppet-device.8 +1 -1
  23. data/man/man8/puppet-doc.8 +1 -1
  24. data/man/man8/puppet-epp.8 +1 -1
  25. data/man/man8/puppet-facts.8 +1 -1
  26. data/man/man8/puppet-filebucket.8 +1 -1
  27. data/man/man8/puppet-generate.8 +1 -1
  28. data/man/man8/puppet-help.8 +1 -1
  29. data/man/man8/puppet-key.8 +1 -1
  30. data/man/man8/puppet-lookup.8 +1 -1
  31. data/man/man8/puppet-man.8 +1 -1
  32. data/man/man8/puppet-module.8 +1 -1
  33. data/man/man8/puppet-node.8 +1 -1
  34. data/man/man8/puppet-parser.8 +1 -1
  35. data/man/man8/puppet-plugin.8 +1 -1
  36. data/man/man8/puppet-report.8 +1 -1
  37. data/man/man8/puppet-resource.8 +1 -1
  38. data/man/man8/puppet-script.8 +1 -1
  39. data/man/man8/puppet-ssl.8 +1 -1
  40. data/man/man8/puppet-status.8 +1 -1
  41. data/man/man8/puppet.8 +2 -2
  42. data/spec/integration/agent/logging_spec.rb +5 -7
  43. data/spec/integration/application/apply_spec.rb +18 -16
  44. data/spec/integration/application/doc_spec.rb +1 -2
  45. data/spec/integration/application/lookup_spec.rb +5 -5
  46. data/spec/integration/configurer_spec.rb +5 -6
  47. data/spec/integration/defaults_spec.rb +5 -6
  48. data/spec/integration/directory_environments_spec.rb +1 -1
  49. data/spec/integration/faces/config_spec.rb +3 -4
  50. data/spec/integration/faces/documentation_spec.rb +0 -1
  51. data/spec/integration/faces/plugin_spec.rb +1 -1
  52. data/spec/integration/file_bucket/file_spec.rb +2 -4
  53. data/spec/integration/file_serving/content_spec.rb +0 -1
  54. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  55. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  56. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  57. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  58. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  59. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  60. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  61. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  62. data/spec/integration/network/authconfig_spec.rb +23 -24
  63. data/spec/integration/network/formats_spec.rb +0 -1
  64. data/spec/integration/node/environment_spec.rb +0 -1
  65. data/spec/integration/node/facts_spec.rb +9 -10
  66. data/spec/integration/node_spec.rb +6 -7
  67. data/spec/integration/parser/catalog_spec.rb +1 -5
  68. data/spec/integration/parser/collection_spec.rb +1 -2
  69. data/spec/integration/parser/compiler_spec.rb +6 -6
  70. data/spec/integration/parser/scope_spec.rb +1 -1
  71. data/spec/integration/parser/undef_param_spec.rb +1 -1
  72. data/spec/integration/provider/service/init_spec.rb +4 -5
  73. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  74. data/spec/integration/provider/service/windows_spec.rb +1 -2
  75. data/spec/integration/reference/providers_spec.rb +1 -2
  76. data/spec/integration/reports_spec.rb +1 -2
  77. data/spec/integration/resource/catalog_spec.rb +14 -17
  78. data/spec/integration/resource/type_collection_spec.rb +4 -5
  79. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  80. data/spec/integration/ssl/host_spec.rb +1 -2
  81. data/spec/integration/ssl/key_spec.rb +0 -1
  82. data/spec/integration/test/test_helper_spec.rb +0 -1
  83. data/spec/integration/transaction/report_spec.rb +6 -11
  84. data/spec/integration/transaction_spec.rb +18 -19
  85. data/spec/integration/type/exec_spec.rb +0 -1
  86. data/spec/integration/type/file_spec.rb +13 -14
  87. data/spec/integration/type/package_spec.rb +19 -23
  88. data/spec/integration/type/tidy_spec.rb +1 -2
  89. data/spec/integration/type_spec.rb +0 -1
  90. data/spec/integration/util/autoload_spec.rb +1 -2
  91. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  92. data/spec/integration/util/settings_spec.rb +0 -1
  93. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  94. data/spec/integration/util/windows/principal_spec.rb +0 -1
  95. data/spec/integration/util/windows/process_spec.rb +4 -6
  96. data/spec/integration/util/windows/registry_spec.rb +41 -51
  97. data/spec/integration/util/windows/security_spec.rb +2 -4
  98. data/spec/integration/util/windows/user_spec.rb +18 -20
  99. data/spec/integration/util_spec.rb +4 -7
  100. data/spec/lib/puppet_spec/compiler.rb +1 -1
  101. data/spec/lib/puppet_spec/files.rb +0 -1
  102. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  103. data/spec/lib/puppet_spec/scope.rb +1 -2
  104. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  105. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  106. data/spec/shared_behaviours/file_serving.rb +6 -8
  107. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  108. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  109. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  110. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  111. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  112. data/spec/spec_helper.rb +10 -1
  113. data/spec/unit/agent/disabler_spec.rb +4 -5
  114. data/spec/unit/agent/locker_spec.rb +12 -13
  115. data/spec/unit/agent_spec.rb +80 -85
  116. data/spec/unit/application/agent_spec.rb +88 -93
  117. data/spec/unit/application/apply_spec.rb +82 -83
  118. data/spec/unit/application/config_spec.rb +0 -1
  119. data/spec/unit/application/describe_spec.rb +6 -7
  120. data/spec/unit/application/device_spec.rb +395 -419
  121. data/spec/unit/application/doc_spec.rb +44 -46
  122. data/spec/unit/application/face_base_spec.rb +61 -62
  123. data/spec/unit/application/facts_spec.rb +3 -4
  124. data/spec/unit/application/filebucket_spec.rb +66 -74
  125. data/spec/unit/application/indirection_base_spec.rb +8 -6
  126. data/spec/unit/application/lookup_spec.rb +26 -26
  127. data/spec/unit/application/resource_spec.rb +42 -48
  128. data/spec/unit/application/ssl_spec.rb +3 -3
  129. data/spec/unit/application_spec.rb +82 -92
  130. data/spec/unit/capability_spec.rb +6 -6
  131. data/spec/unit/certificate_factory_spec.rb +3 -5
  132. data/spec/unit/configurer/downloader_spec.rb +20 -21
  133. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  134. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  135. data/spec/unit/configurer_spec.rb +189 -192
  136. data/spec/unit/confine/exists_spec.rb +17 -15
  137. data/spec/unit/confine/false_spec.rb +5 -6
  138. data/spec/unit/confine/feature_spec.rb +7 -5
  139. data/spec/unit/confine/true_spec.rb +5 -6
  140. data/spec/unit/confine/variable_spec.rb +14 -15
  141. data/spec/unit/confine_collection_spec.rb +28 -29
  142. data/spec/unit/confine_spec.rb +13 -14
  143. data/spec/unit/confiner_spec.rb +10 -11
  144. data/spec/unit/context/trusted_information_spec.rb +1 -1
  145. data/spec/unit/daemon_spec.rb +35 -36
  146. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  147. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  148. data/spec/unit/datatypes_spec.rb +3 -4
  149. data/spec/unit/defaults_spec.rb +18 -13
  150. data/spec/unit/environments_spec.rb +7 -7
  151. data/spec/unit/etc_spec.rb +30 -32
  152. data/spec/unit/external/pson_spec.rb +0 -1
  153. data/spec/unit/face/catalog_spec.rb +0 -1
  154. data/spec/unit/face/config_spec.rb +31 -35
  155. data/spec/unit/face/epp_face_spec.rb +3 -4
  156. data/spec/unit/face/facts_spec.rb +5 -6
  157. data/spec/unit/face/generate_spec.rb +4 -5
  158. data/spec/unit/face/help_spec.rb +7 -8
  159. data/spec/unit/face/key_spec.rb +0 -1
  160. data/spec/unit/face/man_spec.rb +1 -2
  161. data/spec/unit/face/module/install_spec.rb +3 -5
  162. data/spec/unit/face/module/list_spec.rb +2 -12
  163. data/spec/unit/face/module/search_spec.rb +11 -9
  164. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  165. data/spec/unit/face/node_spec.rb +23 -24
  166. data/spec/unit/face/parser_spec.rb +3 -3
  167. data/spec/unit/face/plugin_spec.rb +36 -9
  168. data/spec/unit/face/status_spec.rb +0 -1
  169. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  170. data/spec/unit/file_bucket/file_spec.rb +0 -2
  171. data/spec/unit/file_serving/base_spec.rb +14 -15
  172. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  173. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  174. data/spec/unit/file_serving/content_spec.rb +10 -11
  175. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  176. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  177. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  178. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  179. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  180. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  181. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  182. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  183. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  184. data/spec/unit/file_serving/mount_spec.rb +0 -1
  185. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  186. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  187. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  188. data/spec/unit/file_system_spec.rb +2 -2
  189. data/spec/unit/forge/errors_spec.rb +1 -1
  190. data/spec/unit/forge/forge_spec.rb +13 -14
  191. data/spec/unit/forge/module_release_spec.rb +18 -18
  192. data/spec/unit/forge/repository_spec.rb +29 -30
  193. data/spec/unit/forge_spec.rb +15 -11
  194. data/spec/unit/functions/binary_file_spec.rb +3 -3
  195. data/spec/unit/functions/contain_spec.rb +0 -2
  196. data/spec/unit/functions/defined_spec.rb +0 -1
  197. data/spec/unit/functions/epp_spec.rb +2 -2
  198. data/spec/unit/functions/find_file_spec.rb +7 -7
  199. data/spec/unit/functions/include_spec.rb +0 -4
  200. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  201. data/spec/unit/functions/lookup_spec.rb +1 -2
  202. data/spec/unit/functions/module_directory_spec.rb +12 -12
  203. data/spec/unit/functions/require_spec.rb +0 -3
  204. data/spec/unit/functions/shared.rb +5 -8
  205. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  206. data/spec/unit/functions4_spec.rb +9 -10
  207. data/spec/unit/gettext/config_spec.rb +4 -4
  208. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  209. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  210. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  211. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  212. data/spec/unit/hiera_puppet_spec.rb +20 -20
  213. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  214. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  215. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  216. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  217. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  218. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  219. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  220. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  221. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  222. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  223. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  224. data/spec/unit/indirector/envelope_spec.rb +1 -2
  225. data/spec/unit/indirector/exec_spec.rb +4 -5
  226. data/spec/unit/indirector/face_spec.rb +9 -9
  227. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  228. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  229. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  230. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  231. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  232. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  233. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  234. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  235. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  236. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  237. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  238. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  239. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  240. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  241. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  242. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  243. data/spec/unit/indirector/file_server_spec.rb +87 -87
  244. data/spec/unit/indirector/indirection_spec.rb +242 -226
  245. data/spec/unit/indirector/json_spec.rb +7 -9
  246. data/spec/unit/indirector/key/file_spec.rb +21 -22
  247. data/spec/unit/indirector/memory_spec.rb +6 -7
  248. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  249. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  250. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  251. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  252. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  253. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  254. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  255. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  256. data/spec/unit/indirector/none_spec.rb +5 -5
  257. data/spec/unit/indirector/plain_spec.rb +7 -8
  258. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  259. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  260. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  261. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  262. data/spec/unit/indirector/request_spec.rb +11 -12
  263. data/spec/unit/indirector/resource/ral_spec.rb +46 -54
  264. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  265. data/spec/unit/indirector/rest_spec.rb +113 -110
  266. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  267. data/spec/unit/indirector/status/local_spec.rb +0 -1
  268. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  269. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  270. data/spec/unit/indirector/terminus_spec.rb +27 -27
  271. data/spec/unit/indirector/yaml_spec.rb +5 -6
  272. data/spec/unit/indirector_spec.rb +1 -2
  273. data/spec/unit/info_service_spec.rb +1 -1
  274. data/spec/unit/interface/action_builder_spec.rb +0 -1
  275. data/spec/unit/interface/action_manager_spec.rb +0 -1
  276. data/spec/unit/interface/action_spec.rb +2 -3
  277. data/spec/unit/interface/documentation_spec.rb +0 -1
  278. data/spec/unit/interface/face_collection_spec.rb +19 -12
  279. data/spec/unit/interface_spec.rb +3 -3
  280. data/spec/unit/man_spec.rb +3 -4
  281. data/spec/unit/module_spec.rb +46 -51
  282. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  283. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  284. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  285. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  286. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  287. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  288. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  289. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  290. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  291. data/spec/unit/module_tool/tar_spec.rb +12 -13
  292. data/spec/unit/module_tool_spec.rb +7 -12
  293. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  294. data/spec/unit/network/authconfig_spec.rb +17 -18
  295. data/spec/unit/network/authorization_spec.rb +4 -5
  296. data/spec/unit/network/authstore_spec.rb +0 -1
  297. data/spec/unit/network/format_handler_spec.rb +0 -1
  298. data/spec/unit/network/format_spec.rb +9 -10
  299. data/spec/unit/network/format_support_spec.rb +28 -29
  300. data/spec/unit/network/formats_spec.rb +4 -5
  301. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  302. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  303. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  304. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  305. data/spec/unit/network/http/api_spec.rb +0 -2
  306. data/spec/unit/network/http/compression_spec.rb +21 -22
  307. data/spec/unit/network/http/connection_spec.rb +41 -36
  308. data/spec/unit/network/http/factory_spec.rb +5 -6
  309. data/spec/unit/network/http/handler_spec.rb +9 -18
  310. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  311. data/spec/unit/network/http/pool_spec.rb +28 -29
  312. data/spec/unit/network/http/request_spec.rb +0 -2
  313. data/spec/unit/network/http/response_spec.rb +11 -13
  314. data/spec/unit/network/http/route_spec.rb +0 -1
  315. data/spec/unit/network/http/session_spec.rb +1 -2
  316. data/spec/unit/network/http/site_spec.rb +0 -1
  317. data/spec/unit/network/http_pool_spec.rb +18 -9
  318. data/spec/unit/network/http_spec.rb +0 -1
  319. data/spec/unit/network/resolver_spec.rb +25 -26
  320. data/spec/unit/network/rights_spec.rb +52 -53
  321. data/spec/unit/node/environment_spec.rb +14 -15
  322. data/spec/unit/node/facts_spec.rb +5 -7
  323. data/spec/unit/node_spec.rb +4 -10
  324. data/spec/unit/other/selinux_spec.rb +0 -1
  325. data/spec/unit/parameter/boolean_spec.rb +1 -2
  326. data/spec/unit/parameter/package_options_spec.rb +1 -2
  327. data/spec/unit/parameter/path_spec.rb +0 -1
  328. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  329. data/spec/unit/parameter/value_spec.rb +0 -1
  330. data/spec/unit/parameter_spec.rb +9 -9
  331. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  332. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  333. data/spec/unit/parser/compiler_spec.rb +84 -96
  334. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  335. data/spec/unit/parser/files_spec.rb +0 -1
  336. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  337. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  338. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  339. data/spec/unit/parser/functions/file_spec.rb +13 -14
  340. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  341. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  342. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  343. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  344. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  345. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  346. data/spec/unit/parser/functions/split_spec.rb +0 -1
  347. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  348. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  349. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  350. data/spec/unit/parser/functions/template_spec.rb +13 -13
  351. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  352. data/spec/unit/parser/functions_spec.rb +6 -7
  353. data/spec/unit/parser/relationship_spec.rb +0 -1
  354. data/spec/unit/parser/resource_spec.rb +42 -42
  355. data/spec/unit/parser/scope_spec.rb +39 -35
  356. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  357. data/spec/unit/parser/type_loader_spec.rb +17 -19
  358. data/spec/unit/pops/adaptable_spec.rb +0 -1
  359. data/spec/unit/pops/benchmark_spec.rb +0 -1
  360. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  361. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  362. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  363. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  364. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  365. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  366. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  367. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  368. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  371. data/spec/unit/pops/factory_spec.rb +3 -4
  372. data/spec/unit/pops/issues_spec.rb +19 -20
  373. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  374. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  375. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  376. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  377. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  378. data/spec/unit/pops/migration_spec.rb +3 -5
  379. data/spec/unit/pops/model/model_spec.rb +0 -1
  380. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  381. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  382. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  383. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  384. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  385. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  386. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  387. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  388. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  389. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  390. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  391. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  392. data/spec/unit/pops/pn_spec.rb +0 -1
  393. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  394. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  395. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  396. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  397. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  398. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  399. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  400. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  401. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  402. data/spec/unit/pops/visitor_spec.rb +0 -1
  403. data/spec/unit/property/boolean_spec.rb +1 -1
  404. data/spec/unit/property/ensure_spec.rb +0 -1
  405. data/spec/unit/property/keyvalue_spec.rb +32 -34
  406. data/spec/unit/property/list_spec.rb +26 -27
  407. data/spec/unit/property/ordered_list_spec.rb +10 -14
  408. data/spec/unit/property_spec.rb +42 -43
  409. data/spec/unit/provider/aix_object_spec.rb +47 -45
  410. data/spec/unit/provider/command_spec.rb +9 -9
  411. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  412. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  413. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  414. data/spec/unit/provider/exec_spec.rb +0 -1
  415. data/spec/unit/provider/file/posix_spec.rb +22 -24
  416. data/spec/unit/provider/file/windows_spec.rb +15 -17
  417. data/spec/unit/provider/group/aix_spec.rb +3 -2
  418. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  419. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  420. data/spec/unit/provider/group/pw_spec.rb +11 -11
  421. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  422. data/spec/unit/provider/ldap_spec.rb +61 -62
  423. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  424. data/spec/unit/provider/nameservice_spec.rb +38 -40
  425. data/spec/unit/provider/package/aix_spec.rb +15 -15
  426. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  427. data/spec/unit/provider/package/apt_spec.rb +44 -27
  428. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  429. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  430. data/spec/unit/provider/package/base_spec.rb +4 -4
  431. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  432. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  433. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  434. data/spec/unit/provider/package/gem_spec.rb +51 -43
  435. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  436. data/spec/unit/provider/package/macports_spec.rb +46 -42
  437. data/spec/unit/provider/package/nim_spec.rb +30 -39
  438. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  439. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  440. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  441. data/spec/unit/provider/package/pip_spec.rb +71 -72
  442. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  443. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  444. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  445. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  446. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  447. data/spec/unit/provider/package/portage_spec.rb +70 -74
  448. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  449. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  450. data/spec/unit/provider/package/sun_spec.rb +16 -18
  451. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  452. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  453. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  454. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  455. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  456. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  457. data/spec/unit/provider/package/windows_spec.rb +36 -32
  458. data/spec/unit/provider/package/yum_spec.rb +7 -7
  459. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  460. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  461. data/spec/unit/provider/service/base_spec.rb +4 -5
  462. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  463. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  464. data/spec/unit/provider/service/debian_spec.rb +38 -38
  465. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  466. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  467. data/spec/unit/provider/service/init_spec.rb +53 -52
  468. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  469. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  470. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  471. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  472. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  473. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  474. data/spec/unit/provider/service/runit_spec.rb +29 -27
  475. data/spec/unit/provider/service/smf_spec.rb +74 -66
  476. data/spec/unit/provider/service/src_spec.rb +46 -47
  477. data/spec/unit/provider/service/systemd_spec.rb +104 -113
  478. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  479. data/spec/unit/provider/service/windows_spec.rb +33 -41
  480. data/spec/unit/provider/user/aix_spec.rb +31 -31
  481. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  482. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  483. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  484. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  485. data/spec/unit/provider/user/pw_spec.rb +37 -35
  486. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  487. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  488. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  489. data/spec/unit/provider_spec.rb +35 -35
  490. data/spec/unit/puppet_pal_2pec.rb +4 -5
  491. data/spec/unit/puppet_pal_spec.rb +0 -1
  492. data/spec/unit/puppet_spec.rb +6 -7
  493. data/spec/unit/relationship_spec.rb +0 -1
  494. data/spec/unit/reports/http_spec.rb +21 -23
  495. data/spec/unit/reports/store_spec.rb +3 -4
  496. data/spec/unit/reports_spec.rb +12 -14
  497. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  498. data/spec/unit/resource/catalog_spec.rb +72 -68
  499. data/spec/unit/resource/status_spec.rb +6 -8
  500. data/spec/unit/resource/type_collection_spec.rb +17 -18
  501. data/spec/unit/resource/type_spec.rb +34 -35
  502. data/spec/unit/resource_spec.rb +36 -32
  503. data/spec/unit/rest/client_spec.rb +58 -27
  504. data/spec/unit/rest/route_spec.rb +5 -5
  505. data/spec/unit/scheduler/job_spec.rb +0 -1
  506. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  507. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  508. data/spec/unit/settings/array_setting_spec.rb +1 -1
  509. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  510. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  511. data/spec/unit/settings/config_file_spec.rb +0 -1
  512. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  513. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  514. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  515. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  516. data/spec/unit/settings/file_setting_spec.rb +44 -46
  517. data/spec/unit/settings/path_setting_spec.rb +1 -2
  518. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  519. data/spec/unit/settings/string_setting_spec.rb +14 -15
  520. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  521. data/spec/unit/settings/value_translator_spec.rb +0 -1
  522. data/spec/unit/settings_spec.rb +228 -235
  523. data/spec/unit/ssl/base_spec.rb +14 -15
  524. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  525. data/spec/unit/ssl/certificate_spec.rb +23 -25
  526. data/spec/unit/ssl/digest_spec.rb +0 -1
  527. data/spec/unit/ssl/host_spec.rb +166 -149
  528. data/spec/unit/ssl/key_spec.rb +30 -31
  529. data/spec/unit/ssl/validator_spec.rb +38 -39
  530. data/spec/unit/task_spec.rb +44 -45
  531. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  532. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  533. data/spec/unit/transaction/event_spec.rb +16 -15
  534. data/spec/unit/transaction/persistence_spec.rb +16 -17
  535. data/spec/unit/transaction/report_spec.rb +11 -12
  536. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  537. data/spec/unit/transaction_spec.rb +100 -101
  538. data/spec/unit/type/component_spec.rb +0 -1
  539. data/spec/unit/type/exec_spec.rb +60 -56
  540. data/spec/unit/type/file/checksum_spec.rb +9 -10
  541. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  542. data/spec/unit/type/file/content_spec.rb +58 -61
  543. data/spec/unit/type/file/ctime_spec.rb +0 -1
  544. data/spec/unit/type/file/ensure_spec.rb +12 -13
  545. data/spec/unit/type/file/group_spec.rb +5 -7
  546. data/spec/unit/type/file/mode_spec.rb +4 -6
  547. data/spec/unit/type/file/mtime_spec.rb +0 -1
  548. data/spec/unit/type/file/owner_spec.rb +6 -8
  549. data/spec/unit/type/file/selinux_spec.rb +17 -19
  550. data/spec/unit/type/file/source_spec.rb +104 -101
  551. data/spec/unit/type/file/type_spec.rb +0 -1
  552. data/spec/unit/type/file_spec.rb +195 -185
  553. data/spec/unit/type/filebucket_spec.rb +4 -5
  554. data/spec/unit/type/group_spec.rb +6 -8
  555. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  556. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  557. data/spec/unit/type/package_spec.rb +56 -57
  558. data/spec/unit/type/resources_spec.rb +72 -74
  559. data/spec/unit/type/schedule_spec.rb +24 -26
  560. data/spec/unit/type/service_spec.rb +48 -48
  561. data/spec/unit/type/stage_spec.rb +0 -1
  562. data/spec/unit/type/tidy_spec.rb +61 -62
  563. data/spec/unit/type/user_spec.rb +24 -25
  564. data/spec/unit/type/whit_spec.rb +0 -1
  565. data/spec/unit/type_spec.rb +55 -54
  566. data/spec/unit/util/at_fork_spec.rb +18 -19
  567. data/spec/unit/util/autoload_spec.rb +55 -56
  568. data/spec/unit/util/backups_spec.rb +34 -35
  569. data/spec/unit/util/character_encoding_spec.rb +5 -5
  570. data/spec/unit/util/checksums_spec.rb +38 -39
  571. data/spec/unit/util/colors_spec.rb +1 -2
  572. data/spec/unit/util/command_line_spec.rb +24 -25
  573. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  574. data/spec/unit/util/diff_spec.rb +7 -8
  575. data/spec/unit/util/errors_spec.rb +0 -1
  576. data/spec/unit/util/execution_spec.rb +185 -161
  577. data/spec/unit/util/execution_stub_spec.rb +0 -1
  578. data/spec/unit/util/feature_spec.rb +21 -14
  579. data/spec/unit/util/filetype_spec.rb +49 -49
  580. data/spec/unit/util/http_proxy_spec.rb +12 -12
  581. data/spec/unit/util/inifile_spec.rb +26 -31
  582. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  583. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  584. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  585. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  586. data/spec/unit/util/lockfile_spec.rb +0 -1
  587. data/spec/unit/util/log/destinations_spec.rb +30 -33
  588. data/spec/unit/util/log_spec.rb +35 -36
  589. data/spec/unit/util/logging_spec.rb +58 -72
  590. data/spec/unit/util/metric_spec.rb +0 -1
  591. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  592. data/spec/unit/util/multi_match_spec.rb +0 -1
  593. data/spec/unit/util/network_device/config_spec.rb +0 -1
  594. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  595. data/spec/unit/util/network_device_spec.rb +7 -9
  596. data/spec/unit/util/package_spec.rb +0 -1
  597. data/spec/unit/util/pidlock_spec.rb +21 -22
  598. data/spec/unit/util/plist_spec.rb +40 -33
  599. data/spec/unit/util/posix_spec.rb +54 -51
  600. data/spec/unit/util/rdoc_spec.rb +9 -10
  601. data/spec/unit/util/reference_spec.rb +0 -1
  602. data/spec/unit/util/resource_template_spec.rb +20 -20
  603. data/spec/unit/util/retry_action_spec.rb +7 -8
  604. data/spec/unit/util/rubygems_spec.rb +7 -8
  605. data/spec/unit/util/run_mode_spec.rb +3 -4
  606. data/spec/unit/util/selinux_spec.rb +79 -72
  607. data/spec/unit/util/splayer_spec.rb +8 -9
  608. data/spec/unit/util/ssl_spec.rb +0 -1
  609. data/spec/unit/util/storage_spec.rb +3 -4
  610. data/spec/unit/util/suidmanager_spec.rb +45 -54
  611. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  612. data/spec/unit/util/tag_set_spec.rb +0 -1
  613. data/spec/unit/util/tagging_spec.rb +0 -1
  614. data/spec/unit/util/terminal_spec.rb +9 -10
  615. data/spec/unit/util/user_attr_spec.rb +1 -2
  616. data/spec/unit/util/warnings_spec.rb +3 -4
  617. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  618. data/spec/unit/util/watcher_spec.rb +51 -21
  619. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  620. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  621. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  622. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  623. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  624. data/spec/unit/util/windows/file_spec.rb +0 -1
  625. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  626. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  627. data/spec/unit/util/windows/service_spec.rb +66 -68
  628. data/spec/unit/util/windows/sid_spec.rb +11 -13
  629. data/spec/unit/util/windows/string_spec.rb +0 -1
  630. data/spec/unit/util_spec.rb +55 -57
  631. data/spec/unit/version_spec.rb +6 -6
  632. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  # A type and provider that can be purged
@@ -13,15 +12,16 @@ resources = Puppet::Type.type(:resources)
13
12
 
14
13
  # There are still plenty of tests to port over from test/.
15
14
  describe resources do
16
-
17
15
  before :each do
18
16
  described_class.reset_system_users_max_uid!
19
17
  end
20
18
 
21
19
  context "when initializing" do
22
20
  it "should fail if the specified resource type does not exist" do
23
- Puppet::Type.stubs(:type).with { |x| x.to_s.downcase == "resources"}.returns resources
24
- Puppet::Type.expects(:type).with("nosuchtype").returns nil
21
+ allow(Puppet::Type).to receive(:type) do
22
+ expect(x.to_s.downcase).to eq("resources")
23
+ end.and_return(resources)
24
+ expect(Puppet::Type).to receive(:type).with("nosuchtype").and_return(nil)
25
25
  expect { resources.new :name => "nosuchtype" }.to raise_error(Puppet::Error)
26
26
  end
27
27
 
@@ -46,20 +46,20 @@ describe resources do
46
46
  end
47
47
 
48
48
  it "cannot be set to true for a resource type that does not accept ensure" do
49
- instance.resource_type.stubs(:respond_to?).returns true
50
- instance.resource_type.stubs(:validproperty?).returns false
49
+ allow(instance.resource_type).to receive(:respond_to?).and_return(true)
50
+ allow(instance.resource_type).to receive(:validproperty?).and_return(false)
51
51
  expect { instance[:purge] = 'yes' }.to raise_error Puppet::Error
52
52
  end
53
53
 
54
54
  it "cannot be set to true for a resource type that does not have instances" do
55
- instance.resource_type.stubs(:respond_to?).returns false
56
- instance.resource_type.stubs(:validproperty?).returns true
55
+ allow(instance.resource_type).to receive(:respond_to?).and_return(false)
56
+ allow(instance.resource_type).to receive(:validproperty?).and_return(true)
57
57
  expect { instance[:purge] = 'yes' }.to raise_error Puppet::Error
58
58
  end
59
59
 
60
60
  it "can be set to true for a resource type that has instances and can accept ensure" do
61
- instance.resource_type.stubs(:respond_to?).returns true
62
- instance.resource_type.stubs(:validproperty?).returns true
61
+ allow(instance.resource_type).to receive(:respond_to?).and_return(true)
62
+ allow(instance.resource_type).to receive(:validproperty?).and_return(true)
63
63
  expect { instance[:purge] = 'yes' }.to_not raise_error
64
64
  end
65
65
  end
@@ -69,7 +69,7 @@ describe resources do
69
69
  before do
70
70
  @res = Puppet::Type.type(:resources).new :name => :user, :purge => true, :unless_system_user => true
71
71
  @res.catalog = Puppet::Resource::Catalog.new
72
- Puppet::FileSystem.stubs(:exist?).with('/etc/login.defs').returns false
72
+ allow(Puppet::FileSystem).to receive(:exist?).with('/etc/login.defs').and_return(false)
73
73
  end
74
74
 
75
75
  it "should never purge hardcoded system users" do
@@ -81,14 +81,14 @@ describe resources do
81
81
  it "should not purge system users if unless_system_user => true" do
82
82
  user_hash = {:name => 'system_user', :uid => 125, :system => true}
83
83
  user = Puppet::Type.type(:user).new(user_hash)
84
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
84
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
85
85
  expect(@res.user_check(user)).to be_falsey
86
86
  end
87
87
 
88
88
  it "should purge non-system users if unless_system_user => true" do
89
89
  user_hash = {:name => 'system_user', :uid => described_class.system_users_max_uid + 1, :system => true}
90
90
  user = Puppet::Type.type(:user).new(user_hash)
91
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
91
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
92
92
  expect(@res.user_check(user)).to be_truthy
93
93
  end
94
94
 
@@ -97,7 +97,7 @@ describe resources do
97
97
  res.catalog = Puppet::Resource::Catalog.new
98
98
  user_hash = {:name => 'system_user', :uid => 500, :system => true}
99
99
  user = Puppet::Type.type(:user).new(user_hash)
100
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
100
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
101
101
  expect(res.user_check(user)).to be_falsey
102
102
  end
103
103
 
@@ -106,7 +106,7 @@ describe resources do
106
106
  res.catalog = Puppet::Resource::Catalog.new
107
107
  user_hash = {:name => 'Administrator', :uid => 'S-1-5-21-12345-500'}
108
108
  user = Puppet::Type.type(:user).new(user_hash)
109
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
109
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
110
110
  expect(res.user_check(user)).to be_falsey
111
111
  end
112
112
 
@@ -115,7 +115,7 @@ describe resources do
115
115
  res.catalog = Puppet::Resource::Catalog.new
116
116
  user_hash = {:name => 'other', :uid => 'S-1-5-21-12345-1001'}
117
117
  user = Puppet::Type.type(:user).new(user_hash)
118
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
118
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
119
119
  expect(res.user_check(user)).to be_truthy
120
120
  end
121
121
  end
@@ -123,10 +123,10 @@ describe resources do
123
123
  %w(FreeBSD OpenBSD).each do |os|
124
124
  context "on #{os}" do
125
125
  before :each do
126
- Facter.stubs(:value).with(:kernel).returns(os)
127
- Facter.stubs(:value).with(:operatingsystem).returns(os)
128
- Facter.stubs(:value).with(:osfamily).returns(os)
129
- Puppet::FileSystem.stubs(:exist?).with('/etc/login.defs').returns false
126
+ allow(Facter).to receive(:value).with(:kernel).and_return(os)
127
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(os)
128
+ allow(Facter).to receive(:value).with(:osfamily).and_return(os)
129
+ allow(Puppet::FileSystem).to receive(:exist?).with('/etc/login.defs').and_return(false)
130
130
  @res = Puppet::Type.type(:resources).new :name => :user, :purge => true, :unless_system_user => true
131
131
  @res.catalog = Puppet::Resource::Catalog.new
132
132
  end
@@ -134,14 +134,14 @@ describe resources do
134
134
  it "should not purge system users under 1000" do
135
135
  user_hash = {:name => 'system_user', :uid => 999}
136
136
  user = Puppet::Type.type(:user).new(user_hash)
137
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
137
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
138
138
  expect(@res.user_check(user)).to be_falsey
139
139
  end
140
140
 
141
141
  it "should purge users over 999" do
142
142
  user_hash = {:name => 'system_user', :uid => 1000}
143
143
  user = Puppet::Type.type(:user).new(user_hash)
144
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
144
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
145
145
  expect(@res.user_check(user)).to be_truthy
146
146
  end
147
147
  end
@@ -149,8 +149,8 @@ describe resources do
149
149
 
150
150
  context 'with login.defs present' do
151
151
  before :each do
152
- Puppet::FileSystem.expects(:exist?).with('/etc/login.defs').returns true
153
- Puppet::FileSystem.expects(:each_line).with('/etc/login.defs').yields(' UID_MIN 1234 # UID_MIN comment ')
152
+ expect(Puppet::FileSystem).to receive(:exist?).with('/etc/login.defs').and_return(true)
153
+ expect(Puppet::FileSystem).to receive(:each_line).with('/etc/login.defs').and_yield(' UID_MIN 1234 # UID_MIN comment ')
154
154
  @res = Puppet::Type.type(:resources).new :name => :user, :purge => true, :unless_system_user => true
155
155
  @res.catalog = Puppet::Resource::Catalog.new
156
156
  end
@@ -158,14 +158,14 @@ describe resources do
158
158
  it 'should not purge a system user' do
159
159
  user_hash = {:name => 'system_user', :uid => 1233}
160
160
  user = Puppet::Type.type(:user).new(user_hash)
161
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
161
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
162
162
  expect(@res.user_check(user)).to be_falsey
163
163
  end
164
164
 
165
165
  it 'should purge a non-system user' do
166
166
  user_hash = {:name => 'system_user', :uid => 1234}
167
167
  user = Puppet::Type.type(:user).new(user_hash)
168
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
168
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
169
169
  expect(@res.user_check(user)).to be_truthy
170
170
  end
171
171
  end
@@ -180,17 +180,16 @@ describe resources do
180
180
  it "should purge uids that are not in a specified array" do
181
181
  user_hash = {:name => 'special_user', :uid => 25_000}
182
182
  user = Puppet::Type.type(:user).new(user_hash)
183
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
183
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
184
184
  expect(@res.user_check(user)).to be_truthy
185
185
  end
186
186
 
187
187
  it "should not purge uids that are in a specified array" do
188
188
  user_hash = {:name => 'special_user', :uid => 15000}
189
189
  user = Puppet::Type.type(:user).new(user_hash)
190
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
190
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
191
191
  expect(@res.user_check(user)).to be_falsey
192
192
  end
193
-
194
193
  end
195
194
 
196
195
  context "with a single integer uid" do
@@ -202,14 +201,14 @@ describe resources do
202
201
  it "should purge uids that are not specified" do
203
202
  user_hash = {:name => 'special_user', :uid => 25_000}
204
203
  user = Puppet::Type.type(:user).new(user_hash)
205
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
204
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
206
205
  expect(@res.user_check(user)).to be_truthy
207
206
  end
208
207
 
209
208
  it "should not purge uids that are specified" do
210
209
  user_hash = {:name => 'special_user', :uid => 15_000}
211
210
  user = Puppet::Type.type(:user).new(user_hash)
212
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
211
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
213
212
  expect(@res.user_check(user)).to be_falsey
214
213
  end
215
214
  end
@@ -223,14 +222,14 @@ describe resources do
223
222
  it "should purge uids that are not specified" do
224
223
  user_hash = {:name => 'special_user', :uid => 25_000}
225
224
  user = Puppet::Type.type(:user).new(user_hash)
226
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
225
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
227
226
  expect(@res.user_check(user)).to be_truthy
228
227
  end
229
228
 
230
229
  it "should not purge uids that are specified" do
231
230
  user_hash = {:name => 'special_user', :uid => 15_000}
232
231
  user = Puppet::Type.type(:user).new(user_hash)
233
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
232
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
234
233
  expect(@res.user_check(user)).to be_falsey
235
234
  end
236
235
  end
@@ -244,25 +243,24 @@ describe resources do
244
243
  it "should not purge ids in the range" do
245
244
  user_hash = {:name => 'special_user', :uid => 15_000}
246
245
  user = Puppet::Type.type(:user).new(user_hash)
247
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
246
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
248
247
  expect(@res.user_check(user)).to be_falsey
249
248
  end
250
249
 
251
250
  it "should not purge specified ids" do
252
251
  user_hash = {:name => 'special_user', :uid => 16_666}
253
252
  user = Puppet::Type.type(:user).new(user_hash)
254
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
253
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
255
254
  expect(@res.user_check(user)).to be_falsey
256
255
  end
257
256
 
258
257
  it "should purge unspecified ids" do
259
258
  user_hash = {:name => 'special_user', :uid => 17_000}
260
259
  user = Puppet::Type.type(:user).new(user_hash)
261
- user.stubs(:retrieve_resource).returns Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash)
260
+ allow(user).to receive(:retrieve_resource).and_return(Puppet::Resource.new("user", user_hash[:name], :parameters => user_hash))
262
261
  expect(@res.user_check(user)).to be_truthy
263
262
  end
264
263
  end
265
-
266
264
  end
267
265
  end
268
266
 
@@ -272,53 +270,52 @@ describe resources do
272
270
  @catalog = Puppet::Resource::Catalog.new
273
271
  end
274
272
 
275
- context "when dealing with non-purging resources" do
276
- before do
277
- @resources = Puppet::Type.type(:resources).new(:name => 'purgeable_test')
278
- end
273
+ context "when dealing with non-purging resources" do
274
+ before do
275
+ @resources = Puppet::Type.type(:resources).new(:name => 'purgeable_test')
276
+ end
279
277
 
280
- it "should not generate any resource" do
281
- expect(@resources.generate).to be_empty
282
- end
278
+ it "should not generate any resource" do
279
+ expect(@resources.generate).to be_empty
283
280
  end
281
+ end
284
282
 
285
- context "when the catalog contains a purging resource" do
286
- before do
287
- @resources = Puppet::Type.type(:resources).new(:name => 'purgeable_test', :purge => true)
288
- @purgeable_resource = Puppet::Type.type(:purgeable_test).new(:name => 'localhost')
289
- @catalog.add_resource @resources
290
- end
283
+ context "when the catalog contains a purging resource" do
284
+ before do
285
+ @resources = Puppet::Type.type(:resources).new(:name => 'purgeable_test', :purge => true)
286
+ @purgeable_resource = Puppet::Type.type(:purgeable_test).new(:name => 'localhost')
287
+ @catalog.add_resource @resources
288
+ end
291
289
 
292
- it "should not generate a duplicate of that resource" do
293
- Puppet::Type.type(:purgeable_test).stubs(:instances).returns [@purgee]
294
- @catalog.add_resource @purgee
295
- expect(@resources.generate.collect { |r| r.ref }).not_to include(@purgee.ref)
296
- end
290
+ it "should not generate a duplicate of that resource" do
291
+ allow(Puppet::Type.type(:purgeable_test)).to receive(:instances).and_return([@purgee])
292
+ @catalog.add_resource @purgee
293
+ expect(@resources.generate.collect { |r| r.ref }).not_to include(@purgee.ref)
294
+ end
297
295
 
298
- it "should not include the skipped system users" do
299
- res = Puppet::Type.type(:resources).new :name => :user, :purge => true
300
- res.catalog = Puppet::Resource::Catalog.new
296
+ it "should not include the skipped system users" do
297
+ res = Puppet::Type.type(:resources).new :name => :user, :purge => true
298
+ res.catalog = Puppet::Resource::Catalog.new
301
299
 
302
- root = Puppet::Type.type(:user).new(:name => "root")
303
- Puppet::Type.type(:user).expects(:instances).returns [ root ]
300
+ root = Puppet::Type.type(:user).new(:name => "root")
301
+ expect(Puppet::Type.type(:user)).to receive(:instances).and_return([root])
304
302
 
305
- list = res.generate
303
+ list = res.generate
306
304
 
307
- names = list.collect { |r| r[:name] }
308
- expect(names).not_to be_include("root")
309
- end
305
+ names = list.collect { |r| r[:name] }
306
+ expect(names).not_to be_include("root")
307
+ end
310
308
 
311
- context "when generating a purgeable resource" do
312
- it "should be included in the generated resources" do
313
- Puppet::Type.type(:purgeable_test).stubs(:instances).returns [@purgeable_resource]
314
- expect(@resources.generate.collect { |r| r.ref }).to include(@purgeable_resource.ref)
315
- end
309
+ context "when generating a purgeable resource" do
310
+ it "should be included in the generated resources" do
311
+ allow(Puppet::Type.type(:purgeable_test)).to receive(:instances).and_return([@purgeable_resource])
312
+ expect(@resources.generate.collect { |r| r.ref }).to include(@purgeable_resource.ref)
316
313
  end
317
314
 
318
315
  context "when the instance's do not have an ensure property" do
319
316
  it "should not be included in the generated resources" do
320
317
  @no_ensure_resource = Puppet::Type.type(:exec).new(:name => "#{File.expand_path('/usr/bin/env')} echo")
321
- Puppet::Type.type(:purgeable_test).stubs(:instances).returns [@no_ensure_resource]
318
+ allow(Puppet::Type.type(:purgeable_test)).to receive(:instances).and_return([@no_ensure_resource])
322
319
  expect(@resources.generate.collect { |r| r.ref }).not_to include(@no_ensure_resource.ref)
323
320
  end
324
321
  end
@@ -329,10 +326,10 @@ describe resources do
329
326
  # on jruby. Thus, we stub it out here since we don't care to do any assertions on it.
330
327
  # This is only an issue if you're running these unit tests on a platform where upstart
331
328
  # is a default provider, like Ubuntu trusty.
332
- Puppet::Util::Execution.stubs(:execute)
329
+ allow(Puppet::Util::Execution).to receive(:execute)
333
330
 
334
331
  @no_absent_resource = Puppet::Type.type(:service).new(:name => 'foobar')
335
- Puppet::Type.type(:purgeable_test).stubs(:instances).returns [@no_absent_resource]
332
+ allow(Puppet::Type.type(:purgeable_test)).to receive(:instances).and_return([@no_absent_resource])
336
333
  expect(@resources.generate.collect { |r| r.ref }).not_to include(@no_absent_resource.ref)
337
334
  end
338
335
  end
@@ -340,11 +337,12 @@ describe resources do
340
337
  context "when checking the instance fails" do
341
338
  it "should not be included in the generated resources" do
342
339
  @purgeable_resource = Puppet::Type.type(:purgeable_test).new(:name => 'foobar')
343
- Puppet::Type.type(:purgeable_test).stubs(:instances).returns [@purgeable_resource]
344
- @resources.expects(:check).with(@purgeable_resource).returns(false)
340
+ allow(Puppet::Type.type(:purgeable_test)).to receive(:instances).and_return([@purgeable_resource])
341
+ expect(@resources).to receive(:check).with(@purgeable_resource).and_return(false)
345
342
  expect(@resources.generate.collect { |r| r.ref }).not_to include(@purgeable_resource.ref)
346
343
  end
347
344
  end
348
345
  end
346
+ end
349
347
  end
350
348
  end
@@ -1,8 +1,6 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  module ScheduleTesting
5
-
6
4
  def diff(unit, incr, method, count)
7
5
  diff = Time.now.to_i.send(method, incr * count)
8
6
  Time.at(diff)
@@ -19,11 +17,11 @@ module ScheduleTesting
19
17
  def min(method, count)
20
18
  diff(:min, 60, method, count)
21
19
  end
22
-
23
20
  end
24
21
 
25
22
  describe Puppet::Type.type(:schedule) do
26
23
  include ScheduleTesting
24
+
27
25
  before :each do
28
26
  Puppet[:ignoreschedules] = false
29
27
 
@@ -78,7 +76,7 @@ describe Puppet::Type.type(:schedule) do
78
76
 
79
77
  describe Puppet::Type.type(:schedule), "when matching ranges" do
80
78
  before do
81
- Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
79
+ allow(Time).to receive(:now).and_return(Time.local(2011, "may", 23, 11, 0, 0))
82
80
  end
83
81
 
84
82
  it "should match when the start time is before the current time and the end time is after the current time" do
@@ -114,7 +112,7 @@ describe Puppet::Type.type(:schedule) do
114
112
 
115
113
  describe Puppet::Type.type(:schedule), "when matching ranges with abbreviated time specifications" do
116
114
  before do
117
- Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 45, 59))
115
+ allow(Time).to receive(:now).and_return(Time.local(2011, "may", 23, 11, 45, 59))
118
116
  end
119
117
 
120
118
  it "should match when just an hour is specified" do
@@ -135,7 +133,7 @@ describe Puppet::Type.type(:schedule) do
135
133
 
136
134
  describe Puppet::Type.type(:schedule), "when matching ranges with abbreviated time specifications, edge cases part 1" do
137
135
  before do
138
- Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 00, 00))
136
+ allow(Time).to receive(:now).and_return(Time.local(2011, "may", 23, 11, 00, 00))
139
137
  end
140
138
 
141
139
  it "should match when the current time is the start of the range using hours" do
@@ -161,7 +159,7 @@ describe Puppet::Type.type(:schedule) do
161
159
 
162
160
  describe Puppet::Type.type(:schedule), "when matching ranges with abbreviated time specifications, edge cases part 2" do
163
161
  before do
164
- Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 00, 01))
162
+ allow(Time).to receive(:now).and_return(Time.local(2011, "may", 23, 11, 00, 01))
165
163
  end
166
164
 
167
165
  it "should match when the current time is just past the start of the range using hours" do
@@ -187,7 +185,7 @@ describe Puppet::Type.type(:schedule) do
187
185
 
188
186
  describe Puppet::Type.type(:schedule), "when matching ranges with abbreviated time specifications, edge cases part 3" do
189
187
  before do
190
- Time.stubs(:now).returns(Time.local(2011, "may", 23, 10, 59, 59))
188
+ allow(Time).to receive(:now).and_return(Time.local(2011, "may", 23, 10, 59, 59))
191
189
  end
192
190
 
193
191
  it "should not match when the current time is just before the start of the range using hours" do
@@ -217,7 +215,7 @@ describe Puppet::Type.type(:schedule) do
217
215
  # advancing the day properly when we push the ending limit out a day.
218
216
  # For example, adding 1 to 31 would throw an error instead of advancing
219
217
  # the date.
220
- Time.stubs(:now).returns(Time.local(2011, "mar", 31, 22, 30, 0))
218
+ allow(Time).to receive(:now).and_return(Time.local(2011, "mar", 31, 22, 30, 0))
221
219
  end
222
220
 
223
221
  it "should match when the start time is before current time and the end time is the following day" do
@@ -237,7 +235,7 @@ describe Puppet::Type.type(:schedule) do
237
235
  # advancing the day properly when we push the ending limit out a day.
238
236
  # For example, adding 1 to 31 would throw an error instead of advancing
239
237
  # the date.
240
- Time.stubs(:now).returns(Time.local(2011, "mar", 31, 1, 30, 0))
238
+ allow(Time).to receive(:now).and_return(Time.local(2011, "mar", 31, 1, 30, 0))
241
239
  end
242
240
 
243
241
  it "should match when the start time is the day before the current time and the end time is after the current time" do
@@ -261,7 +259,7 @@ describe Puppet::Type.type(:schedule) do
261
259
  @schedule[:period] = :hourly
262
260
  @schedule[:periodmatch] = :distance
263
261
 
264
- Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
262
+ allow(Time).to receive(:now).and_return(Time.local(2011, "may", 23, 11, 0, 0))
265
263
  end
266
264
 
267
265
  it "should match when the previous time was an hour ago" do
@@ -282,7 +280,7 @@ describe Puppet::Type.type(:schedule) do
282
280
  @schedule[:period] = :daily
283
281
  @schedule[:periodmatch] = :distance
284
282
 
285
- Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
283
+ allow(Time).to receive(:now).and_return(Time.local(2011, "may", 23, 11, 0, 0))
286
284
  end
287
285
 
288
286
  it "should match when the previous time was one day ago" do
@@ -303,7 +301,7 @@ describe Puppet::Type.type(:schedule) do
303
301
  @schedule[:period] = :weekly
304
302
  @schedule[:periodmatch] = :distance
305
303
 
306
- Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
304
+ allow(Time).to receive(:now).and_return(Time.local(2011, "may", 23, 11, 0, 0))
307
305
  end
308
306
 
309
307
  it "should match when the previous time was seven days ago" do
@@ -324,7 +322,7 @@ describe Puppet::Type.type(:schedule) do
324
322
  @schedule[:period] = :monthly
325
323
  @schedule[:periodmatch] = :distance
326
324
 
327
- Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
325
+ allow(Time).to receive(:now).and_return(Time.local(2011, "may", 23, 11, 0, 0))
328
326
  end
329
327
 
330
328
  it "should match when the previous time was 32 days ago" do
@@ -350,7 +348,7 @@ describe Puppet::Type.type(:schedule) do
350
348
  current = Time.utc(2008, 1, 1, 0, 0, 0)
351
349
  previous = Time.utc(2007, 12, 31, 23, 59, 0)
352
350
 
353
- Time.stubs(:now).returns(current)
351
+ allow(Time).to receive(:now).and_return(current)
354
352
  expect(@schedule).to be_match(previous)
355
353
  end
356
354
 
@@ -358,7 +356,7 @@ describe Puppet::Type.type(:schedule) do
358
356
  current = Time.utc(2009, 2, 1, 12, 59, 0)
359
357
  previous = Time.utc(2009, 2, 1, 12, 0, 0)
360
358
 
361
- Time.stubs(:now).returns(current)
359
+ allow(Time).to receive(:now).and_return(current)
362
360
  expect(@schedule).to_not be_match(previous)
363
361
  end
364
362
  end
@@ -375,7 +373,7 @@ describe Puppet::Type.type(:schedule) do
375
373
  # Now set the previous time to one minute before that
376
374
  previous = current - 60
377
375
 
378
- Time.stubs(:now).returns(current)
376
+ allow(Time).to receive(:now).and_return(current)
379
377
  expect(@schedule).to be_match(previous)
380
378
  end
381
379
 
@@ -387,7 +385,7 @@ describe Puppet::Type.type(:schedule) do
387
385
  # Set the current time to 23:59
388
386
  now = previous + (23 * 3600) + (59 * 60)
389
387
 
390
- Time.stubs(:now).returns(now)
388
+ allow(Time).to receive(:now).and_return(now)
391
389
  expect(@schedule).to_not be_match(previous)
392
390
  end
393
391
  end
@@ -400,7 +398,7 @@ describe Puppet::Type.type(:schedule) do
400
398
 
401
399
  it "should match if the previous time is prior to the most recent Sunday" do
402
400
  now = Time.utc(2010, "nov", 11, 0, 0, 0) # Thursday
403
- Time.stubs(:now).returns(now)
401
+ allow(Time).to receive(:now).and_return(now)
404
402
  previous = Time.utc(2010, "nov", 6, 23, 59, 59) # Sat
405
403
 
406
404
  expect(@schedule).to be_match(previous)
@@ -408,7 +406,7 @@ describe Puppet::Type.type(:schedule) do
408
406
 
409
407
  it "should not match if the previous time is after the most recent Saturday" do
410
408
  now = Time.utc(2010, "nov", 11, 0, 0, 0) # Thursday
411
- Time.stubs(:now).returns(now)
409
+ allow(Time).to receive(:now).and_return(now)
412
410
  previous = Time.utc(2010, "nov", 7, 0, 0, 0) # Sunday
413
411
 
414
412
  expect(@schedule).to_not be_match(previous)
@@ -423,7 +421,7 @@ describe Puppet::Type.type(:schedule) do
423
421
 
424
422
  it "should match when the previous time is prior to the first day of this month" do
425
423
  now = Time.utc(2010, "nov", 8, 00, 59, 59)
426
- Time.stubs(:now).returns(now)
424
+ allow(Time).to receive(:now).and_return(now)
427
425
  previous = Time.utc(2010, "oct", 31, 23, 59, 59)
428
426
 
429
427
  expect(@schedule).to be_match(previous)
@@ -431,7 +429,7 @@ describe Puppet::Type.type(:schedule) do
431
429
 
432
430
  it "should not match when the previous time is after the last day of last month" do
433
431
  now = Time.utc(2010, "nov", 8, 00, 59, 59)
434
- Time.stubs(:now).returns(now)
432
+ allow(Time).to receive(:now).and_return(now)
435
433
  previous = Time.utc(2010, "nov", 1, 0, 0, 0)
436
434
 
437
435
  expect(@schedule).to_not be_match(previous)
@@ -443,7 +441,7 @@ describe Puppet::Type.type(:schedule) do
443
441
  @schedule[:period] = :daily
444
442
  @schedule[:repeat] = 2
445
443
 
446
- Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
444
+ allow(Time).to receive(:now).and_return(Time.local(2011, "may", 23, 11, 0, 0))
447
445
  end
448
446
 
449
447
  it "should fail if the periodmatch is 'number'" do
@@ -465,7 +463,7 @@ describe Puppet::Type.type(:schedule) do
465
463
  describe Puppet::Type.type(:schedule), "when matching days of the week" do
466
464
  before do
467
465
  # 2011-05-23 is a Monday
468
- Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
466
+ allow(Time).to receive(:now).and_return(Time.local(2011, "may", 23, 11, 0, 0))
469
467
  end
470
468
 
471
469
  it "should raise an error if the weekday is 'Someday'" do
@@ -559,7 +557,7 @@ describe Puppet::Type.type(:schedule) do
559
557
  describe Puppet::Type.type(:schedule), "when matching days of week and ranges spanning days, day 1" do
560
558
  before do
561
559
  # Test with ranges and days-of-week both set. 2011-03-31 was a Thursday.
562
- Time.stubs(:now).returns(Time.local(2011, "mar", 31, 22, 30, 0))
560
+ allow(Time).to receive(:now).and_return(Time.local(2011, "mar", 31, 22, 30, 0))
563
561
  end
564
562
 
565
563
  it "should match when the range and day of week matches" do
@@ -591,7 +589,7 @@ describe Puppet::Type.type(:schedule) do
591
589
  before do
592
590
  # 2011-03-31 was a Thursday. As the end-time of a day spanning match, that means
593
591
  # we need to match on Wednesday.
594
- Time.stubs(:now).returns(Time.local(2011, "mar", 31, 1, 30, 0))
592
+ allow(Time).to receive(:now).and_return(Time.local(2011, "mar", 31, 1, 30, 0))
595
593
  end
596
594
 
597
595
  it "should match when the range matches and the day of week should match" do