puppet 6.0.7-universal-darwin → 6.0.8-universal-darwin

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/util/network_device'
@@ -25,11 +24,11 @@ end
25
24
 
26
25
  describe Puppet::Node::Facts::NetworkDevice do
27
26
  before :each do
28
- @remote_device = stub 'remote_device', :facts => {}
29
- Puppet::Util::NetworkDevice.stubs(:current).returns(@remote_device)
27
+ @remote_device = double('remote_device', :facts => {})
28
+ allow(Puppet::Util::NetworkDevice).to receive(:current).and_return(@remote_device)
30
29
  @device = Puppet::Node::Facts::NetworkDevice.new
31
30
  @name = "me"
32
- @request = stub 'request', :key => @name
31
+ @request = double('request', :key => @name)
33
32
  end
34
33
 
35
34
  describe Puppet::Node::Facts::NetworkDevice, " when finding facts" do
@@ -42,23 +41,23 @@ describe Puppet::Node::Facts::NetworkDevice do
42
41
  end
43
42
 
44
43
  it "should return the device facts as the values in the Facts instance" do
45
- @remote_device.expects(:facts).returns("one" => "two")
44
+ expect(@remote_device).to receive(:facts).and_return("one" => "two")
46
45
  facts = @device.find(@request)
47
46
  expect(facts.values["one"]).to eq("two")
48
47
  end
49
48
 
50
49
  it "should add local facts" do
51
50
  facts = Puppet::Node::Facts.new("foo")
52
- Puppet::Node::Facts.expects(:new).returns facts
53
- facts.expects(:add_local_facts)
51
+ expect(Puppet::Node::Facts).to receive(:new).and_return(facts)
52
+ expect(facts).to receive(:add_local_facts)
54
53
 
55
54
  @device.find(@request)
56
55
  end
57
56
 
58
57
  it "should sanitize facts" do
59
58
  facts = Puppet::Node::Facts.new("foo")
60
- Puppet::Node::Facts.expects(:new).returns facts
61
- facts.expects(:sanitize)
59
+ expect(Puppet::Node::Facts).to receive(:new).and_return(facts)
60
+ expect(facts).to receive(:sanitize)
62
61
 
63
62
  @device.find(@request)
64
63
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/facts/rest'
@@ -12,29 +11,29 @@ describe Puppet::Node::Facts::Rest do
12
11
  before(:each) { model.indirection.terminus_class = :rest }
13
12
 
14
13
  def mock_response(code, body, content_type='text/plain', encoding=nil)
15
- obj = stub('http response', :code => code.to_s, :body => body)
16
- obj.stubs(:[]).with('content-type').returns(content_type)
17
- obj.stubs(:[]).with('content-encoding').returns(encoding)
18
- obj.stubs(:[]).with(Puppet::Network::HTTP::HEADER_PUPPET_VERSION).returns(Puppet.version)
14
+ obj = double('http response', :code => code.to_s, :body => body)
15
+ allow(obj).to receive(:[]).with('content-type').and_return(content_type)
16
+ allow(obj).to receive(:[]).with('content-encoding').and_return(encoding)
17
+ allow(obj).to receive(:[]).with(Puppet::Network::HTTP::HEADER_PUPPET_VERSION).and_return(Puppet.version)
19
18
  obj
20
19
  end
21
20
 
22
21
  describe '#save' do
23
22
  subject { model.indirection.terminus(:rest) }
24
23
 
25
- let(:connection) { stub('mock http connection', :verify_callback= => nil) }
24
+ let(:connection) { double('mock http connection', :verify_callback= => nil) }
26
25
  let(:node_name) { 'puppet.node.test' }
27
26
  let(:data) { model.new(node_name, {test_fact: 'test value'}) }
28
27
  let(:request) { Puppet::Indirector::Request.new(:facts, :save, node_name, data) }
29
28
 
30
29
  before :each do
31
- subject.stubs(:network).returns(connection)
30
+ allow(subject).to receive(:network).and_return(connection)
32
31
  end
33
32
 
34
33
  context 'when a 404 response is received' do
35
34
  let(:response) { mock_response(404, '{}', 'test/json') }
36
35
 
37
- before(:each) { connection.expects(:put).returns response }
36
+ before(:each) { expect(connection).to receive(:put).and_return(response) }
38
37
 
39
38
  it 'riases with HTTP 404' do
40
39
  expect{ subject.save(request) }.to raise_error(Net::HTTPError,
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/node'
4
3
  require 'puppet/indirector/memory'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/node/facts'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_bucket_file/file'
@@ -55,7 +54,7 @@ describe Puppet::FileBucketFile::File, :uses_checksums => true do
55
54
  checksum_value = save_bucket_file(first_contents, "/foo/bar")
56
55
 
57
56
  # We expect Puppet to log an error with the path to the file
58
- Puppet.expects(:err).with(regexp_matches(/Unable to verify existing FileBucket backup at '#{Puppet[:bucketdir]}.*#{checksum_value}\/contents'/))
57
+ expect(Puppet).to receive(:err).with(/Unable to verify existing FileBucket backup at '#{Puppet[:bucketdir]}.*#{checksum_value}\/contents'/)
59
58
 
60
59
  # But the exception should not contain it
61
60
  expect do
@@ -80,7 +79,7 @@ describe Puppet::FileBucketFile::File, :uses_checksums => true do
80
79
  end
81
80
 
82
81
  it "issues a warning that the backup will be overwritten" do
83
- Puppet.expects(:warning).with(regexp_matches(/Existing backup does not match its expected sum, #{bucket_file.checksum}/))
82
+ expect(Puppet).to receive(:warning).with(/Existing backup does not match its expected sum, #{bucket_file.checksum}/)
84
83
  Puppet::FileBucket::File.indirection.save(bucket_file)
85
84
  end
86
85
 
@@ -341,7 +340,7 @@ describe Puppet::FileBucketFile::File, :uses_checksums => true do
341
340
  describe "when #{supply_path ? 'supplying' : 'not supplying'} a path" do
342
341
  with_digest_algorithms do
343
342
  before :each do
344
- Puppet.settings.stubs(:use)
343
+ allow(Puppet.settings).to receive(:use)
345
344
  @store = Puppet::FileBucketFile::File.new
346
345
 
347
346
  @bucket_top_dir = tmpdir("bucket")
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_bucket_file/rest'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_bucket_file/selector'
@@ -9,17 +8,17 @@ describe Puppet::FileBucketFile::Selector do
9
8
  %w[head find save search destroy].each do |method|
10
9
  describe "##{method}" do
11
10
  it "should proxy to rest terminus for https requests" do
12
- request = stub 'request', :protocol => 'https'
11
+ request = double('request', :protocol => 'https')
13
12
 
14
- Puppet::FileBucketFile::Rest.any_instance.expects(method).with(request)
13
+ expect_any_instance_of(Puppet::FileBucketFile::Rest).to receive(method).with(request)
15
14
 
16
15
  subject.send(method, request)
17
16
  end
18
17
 
19
18
  it "should proxy to file terminus for other requests" do
20
- request = stub 'request', :protocol => 'file'
19
+ request = double('request', :protocol => 'file')
21
20
 
22
- Puppet::FileBucketFile::File.any_instance.expects(method).with(request)
21
+ expect_any_instance_of(Puppet::FileBucketFile::File).to receive(method).with(request)
23
22
 
24
23
  subject.send(method, request)
25
24
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_content/file_server'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_content/file'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_content/rest'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_content/selector'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_metadata/file_server'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_metadata/file'
@@ -17,17 +16,17 @@ describe Puppet::Indirector::FileMetadata::File do
17
16
  @metadata = Puppet::Indirector::FileMetadata::File.new
18
17
  @path = File.expand_path('/my/local')
19
18
  @uri = Puppet::Util.path_to_uri(@path).to_s
20
- @data = mock 'metadata'
21
- @data.stubs(:collect)
22
- Puppet::FileSystem.expects(:exist?).with(@path).returns true
19
+ @data = double('metadata')
20
+ allow(@data).to receive(:collect)
21
+ expect(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(true)
23
22
 
24
23
  @request = Puppet::Indirector::Request.new(:file_metadata, :find, @uri, nil)
25
24
  end
26
25
 
27
26
  it "should collect its attributes when a file is found" do
28
- @data.expects(:collect)
27
+ expect(@data).to receive(:collect)
29
28
 
30
- Puppet::FileServing::Metadata.expects(:new).returns(@data)
29
+ expect(Puppet::FileServing::Metadata).to receive(:new).and_return(@data)
31
30
  expect(@metadata.find(@request)).to eq(@data)
32
31
  end
33
32
  end
@@ -42,15 +41,15 @@ describe Puppet::Indirector::FileMetadata::File do
42
41
  end
43
42
 
44
43
  it "should collect the attributes of the instances returned" do
45
- Puppet::FileSystem.expects(:exist?).with(@path).returns true
46
- Puppet::FileServing::Fileset.expects(:new).with(@path, @request).returns mock("fileset")
47
- Puppet::FileServing::Fileset.expects(:merge).returns [["one", @path], ["two", @path]]
44
+ expect(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(true)
45
+ expect(Puppet::FileServing::Fileset).to receive(:new).with(@path, @request).and_return(double("fileset"))
46
+ expect(Puppet::FileServing::Fileset).to receive(:merge).and_return([["one", @path], ["two", @path]])
48
47
 
49
- one = mock("one", :collect => nil)
50
- Puppet::FileServing::Metadata.expects(:new).with(@path, {:relative_path => "one"}).returns one
48
+ one = double("one", :collect => nil)
49
+ expect(Puppet::FileServing::Metadata).to receive(:new).with(@path, {:relative_path => "one"}).and_return(one)
51
50
 
52
- two = mock("two", :collect => nil)
53
- Puppet::FileServing::Metadata.expects(:new).with(@path, {:relative_path => "two"}).returns two
51
+ two = double("two", :collect => nil)
52
+ expect(Puppet::FileServing::Metadata).to receive(:new).with(@path, {:relative_path => "two"}).and_return(two)
54
53
 
55
54
  expect(@metadata.search(@request)).to eq([one, two])
56
55
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_metadata'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_metadata/selector'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/indirector/file_server'
@@ -27,7 +26,7 @@ describe Puppet::Indirector::FileServer do
27
26
  let(:indirection) { Puppet::FileTestModel.indirection }
28
27
  let(:model) { Puppet::FileTestModel }
29
28
  let(:uri) { "puppet://host/my/local/file" }
30
- let(:configuration) { mock 'configuration' }
29
+ let(:configuration) { double('configuration') }
31
30
 
32
31
  after(:all) do
33
32
  Puppet::FileTestModel.indirection.delete
@@ -35,158 +34,159 @@ describe Puppet::Indirector::FileServer do
35
34
  end
36
35
 
37
36
  before(:each)do
38
- Puppet::FileServing::Configuration.stubs(:configuration).returns(configuration)
37
+ allow(Puppet::FileServing::Configuration).to receive(:configuration).and_return(configuration)
39
38
  end
40
39
 
41
40
  describe "when finding files" do
42
- let(:mount) { stub('mount', find: nil) }
43
- let(:instance) { stub('instance', :links= => nil, :collect => nil) }
41
+ let(:mount) { double('mount', find: nil) }
42
+ let(:instance) { double('instance', :links= => nil, :collect => nil) }
44
43
 
45
44
  it "should use the configuration to find the mount and relative path" do
46
- configuration.expects(:split_path).with do |args|
47
- args.uri == uri
45
+ expect(configuration).to receive(:split_path) do |args|
46
+ expect(args.uri).to eq(uri)
47
+ nil
48
48
  end
49
49
 
50
50
  indirection.find(uri)
51
51
  end
52
52
 
53
53
  it "should return nil if it cannot find the mount" do
54
- configuration.expects(:split_path).returns(nil, nil)
54
+ expect(configuration).to receive(:split_path).and_return([nil, nil])
55
55
 
56
56
  expect(indirection.find(uri)).to be_nil
57
57
  end
58
58
 
59
59
  it "should use the mount to find the full path" do
60
- configuration.expects(:split_path).returns([mount, "rel/path"])
60
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
61
61
 
62
- mount.expects(:find).with { |key, request| key == "rel/path" }
62
+ expect(mount).to receive(:find).with("rel/path", anything)
63
63
 
64
64
  indirection.find(uri)
65
65
  end
66
66
 
67
67
  it "should pass the request when finding a file" do
68
- configuration.expects(:split_path).returns([mount, "rel/path"])
68
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
69
69
 
70
- mount.expects(:find).with { |_, request| request.uri == uri }
70
+ expect(mount).to receive(:find) { |_, request| expect(request.uri).to eq(uri) }.and_return(nil)
71
71
 
72
72
  indirection.find(uri)
73
73
  end
74
74
 
75
75
  it "should return nil if it cannot find a full path" do
76
- configuration.expects(:split_path).returns([mount, "rel/path"])
76
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
77
77
 
78
- mount.expects(:find).with { |key, request| key == "rel/path" }.returns nil
78
+ expect(mount).to receive(:find).with("rel/path", anything)
79
79
 
80
80
  expect(indirection.find(uri)).to be_nil
81
81
  end
82
82
 
83
83
  it "should create an instance with the found path" do
84
- configuration.expects(:split_path).returns([mount, "rel/path"])
84
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
85
85
 
86
- mount.expects(:find).with { |key, request| key == "rel/path" }.returns "/my/file"
86
+ expect(mount).to receive(:find).with("rel/path", anything).and_return("/my/file")
87
87
 
88
- model.expects(:new).with("/my/file", {:relative_path => nil}).returns instance
88
+ expect(model).to receive(:new).with("/my/file", {:relative_path => nil}).and_return(instance)
89
89
 
90
90
  expect(indirection.find(uri)).to equal(instance)
91
91
  end
92
92
 
93
93
  it "should set 'links' on the instance if it is set in the request options" do
94
- configuration.expects(:split_path).returns([mount, "rel/path"])
94
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
95
95
 
96
- mount.expects(:find).with { |key, request| key == "rel/path" }.returns "/my/file"
96
+ expect(mount).to receive(:find).with("rel/path", anything).and_return("/my/file")
97
97
 
98
- model.expects(:new).with("/my/file", {:relative_path => nil}).returns instance
98
+ expect(model).to receive(:new).with("/my/file", {:relative_path => nil}).and_return(instance)
99
99
 
100
- instance.expects(:links=).with(true)
100
+ expect(instance).to receive(:links=).with(true)
101
101
 
102
102
  expect(indirection.find(uri, links: true)).to equal(instance)
103
103
  end
104
104
 
105
105
  it "should collect the instance" do
106
- configuration.expects(:split_path).returns([mount, "rel/path"])
106
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
107
107
 
108
- mount.expects(:find).with { |key, request| key == "rel/path" }.returns "/my/file"
108
+ expect(mount).to receive(:find).with("rel/path", anything).and_return("/my/file")
109
109
 
110
- model.expects(:new).with("/my/file", {:relative_path => nil}).returns instance
110
+ expect(model).to receive(:new).with("/my/file", {:relative_path => nil}).and_return(instance)
111
111
 
112
- instance.expects(:collect)
112
+ expect(instance).to receive(:collect)
113
113
 
114
114
  expect(indirection.find(uri, links: true)).to equal(instance)
115
115
  end
116
116
  end
117
117
 
118
118
  describe "when searching for instances" do
119
- let(:mount) { stub('mount', find: nil) }
119
+ let(:mount) { double('mount', find: nil) }
120
120
 
121
121
  it "should use the configuration to search the mount and relative path" do
122
- configuration.expects(:split_path).with do |args|
123
- args.uri == uri
124
- end
122
+ expect(configuration).to receive(:split_path) do |args|
123
+ expect(args.uri).to eq(uri)
124
+ end.and_return([nil, nil])
125
125
 
126
126
  indirection.search(uri)
127
127
  end
128
128
 
129
129
  it "should return nil if it cannot search the mount" do
130
- configuration.expects(:split_path).returns(nil, nil)
130
+ expect(configuration).to receive(:split_path).and_return([nil, nil])
131
131
 
132
132
  expect(indirection.search(uri)).to be_nil
133
133
  end
134
134
 
135
135
  it "should use the mount to search for the full paths" do
136
- configuration.expects(:split_path).returns([mount, "rel/path"])
136
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
137
137
 
138
- mount.expects(:search).with { |key, request| key == "rel/path" }
138
+ expect(mount).to receive(:search).with("rel/path", anything)
139
139
 
140
140
  indirection.search(uri)
141
141
  end
142
142
 
143
143
  it "should pass the request" do
144
- configuration.stubs(:split_path).returns([mount, "rel/path"])
144
+ allow(configuration).to receive(:split_path).and_return([mount, "rel/path"])
145
145
 
146
- mount.expects(:search).with { |_, request| request.uri == uri }
146
+ expect(mount).to receive(:search) { |_, request| expect(request.uri).to eq(uri) }.and_return(nil)
147
147
 
148
148
  indirection.search(uri)
149
149
  end
150
150
 
151
151
  it "should return nil if searching does not find any full paths" do
152
- configuration.expects(:split_path).returns([mount, "rel/path"])
152
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
153
153
 
154
- mount.expects(:search).with { |key, request| key == "rel/path" }.returns nil
154
+ expect(mount).to receive(:search).with("rel/path", anything).and_return(nil)
155
155
 
156
156
  expect(indirection.search(uri)).to be_nil
157
157
  end
158
158
 
159
159
  it "should create a fileset with each returned path and merge them" do
160
- configuration.expects(:split_path).returns([mount, "rel/path"])
160
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
161
161
 
162
- mount.expects(:search).with { |key, request| key == "rel/path" }.returns %w{/one /two}
162
+ expect(mount).to receive(:search).with("rel/path", anything).and_return(%w{/one /two})
163
163
 
164
- Puppet::FileSystem.stubs(:exist?).returns true
164
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
165
165
 
166
- one = mock 'fileset_one'
167
- Puppet::FileServing::Fileset.expects(:new).with("/one", anything).returns(one)
168
- two = mock 'fileset_two'
169
- Puppet::FileServing::Fileset.expects(:new).with("/two", anything).returns(two)
166
+ one = double('fileset_one')
167
+ expect(Puppet::FileServing::Fileset).to receive(:new).with("/one", anything).and_return(one)
168
+ two = double('fileset_two')
169
+ expect(Puppet::FileServing::Fileset).to receive(:new).with("/two", anything).and_return(two)
170
170
 
171
- Puppet::FileServing::Fileset.expects(:merge).with(one, two).returns []
171
+ expect(Puppet::FileServing::Fileset).to receive(:merge).with(one, two).and_return([])
172
172
 
173
173
  indirection.search(uri)
174
174
  end
175
175
 
176
176
  it "should create an instance with each path resulting from the merger of the filesets" do
177
- configuration.expects(:split_path).returns([mount, "rel/path"])
177
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
178
178
 
179
- mount.expects(:search).with { |key, request| key == "rel/path" }.returns []
179
+ expect(mount).to receive(:search).with("rel/path", anything).and_return([])
180
180
 
181
- Puppet::FileSystem.stubs(:exist?).returns true
181
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
182
182
 
183
- Puppet::FileServing::Fileset.expects(:merge).returns("one" => "/one", "two" => "/two")
183
+ expect(Puppet::FileServing::Fileset).to receive(:merge).and_return("one" => "/one", "two" => "/two")
184
184
 
185
- one = stub 'one', :collect => nil
186
- model.expects(:new).with("/one", :relative_path => "one").returns one
185
+ one = double('one', :collect => nil)
186
+ expect(model).to receive(:new).with("/one", :relative_path => "one").and_return(one)
187
187
 
188
- two = stub 'two', :collect => nil
189
- model.expects(:new).with("/two", :relative_path => "two").returns two
188
+ two = double('two', :collect => nil)
189
+ expect(model).to receive(:new).with("/two", :relative_path => "two").and_return(two)
190
190
 
191
191
  # order can't be guaranteed
192
192
  result = indirection.search(uri)
@@ -196,67 +196,67 @@ describe Puppet::Indirector::FileServer do
196
196
  end
197
197
 
198
198
  it "should set 'links' on the instances if it is set in the request options" do
199
- configuration.expects(:split_path).returns([mount, "rel/path"])
199
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
200
200
 
201
- mount.expects(:search).with { |key, request| key == "rel/path" }.returns []
201
+ expect(mount).to receive(:search).with("rel/path", anything).and_return([])
202
202
 
203
- Puppet::FileSystem.stubs(:exist?).returns true
203
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
204
204
 
205
- Puppet::FileServing::Fileset.expects(:merge).returns("one" => "/one")
205
+ expect(Puppet::FileServing::Fileset).to receive(:merge).and_return("one" => "/one")
206
206
 
207
- one = stub 'one', :collect => nil
208
- model.expects(:new).with("/one", :relative_path => "one").returns one
209
- one.expects(:links=).with true
207
+ one = double('one', :collect => nil)
208
+ expect(model).to receive(:new).with("/one", :relative_path => "one").and_return(one)
209
+ expect(one).to receive(:links=).with(true)
210
210
 
211
211
  indirection.search(uri, links: true)
212
212
  end
213
213
 
214
214
  it "should set 'checksum_type' on the instances if it is set in the request options" do
215
- configuration.expects(:split_path).returns([mount, "rel/path"])
215
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
216
216
 
217
- mount.expects(:search).with { |key, request| key == "rel/path" }.returns []
217
+ expect(mount).to receive(:search).with("rel/path", anything).and_return([])
218
218
 
219
- Puppet::FileSystem.stubs(:exist?).returns true
219
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
220
220
 
221
- Puppet::FileServing::Fileset.expects(:merge).returns("one" => "/one")
221
+ expect(Puppet::FileServing::Fileset).to receive(:merge).and_return("one" => "/one")
222
222
 
223
- one = stub 'one', :collect => nil
224
- model.expects(:new).with("/one", :relative_path => "one").returns one
223
+ one = double('one', :collect => nil)
224
+ expect(model).to receive(:new).with("/one", :relative_path => "one").and_return(one)
225
225
 
226
- one.expects(:checksum_type=).with :checksum
226
+ expect(one).to receive(:checksum_type=).with(:checksum)
227
227
 
228
228
  indirection.search(uri, checksum_type: :checksum)
229
229
  end
230
230
 
231
231
  it "should collect the instances" do
232
- configuration.expects(:split_path).returns([mount, "rel/path"])
232
+ expect(configuration).to receive(:split_path).and_return([mount, "rel/path"])
233
233
 
234
- mount.expects(:search).with { |key, options| key == "rel/path" }.returns []
234
+ expect(mount).to receive(:search).with("rel/path", anything).and_return([])
235
235
 
236
- Puppet::FileSystem.stubs(:exist?).returns true
236
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
237
237
 
238
- Puppet::FileServing::Fileset.expects(:merge).returns("one" => "/one")
238
+ expect(Puppet::FileServing::Fileset).to receive(:merge).and_return("one" => "/one")
239
239
 
240
- one = mock 'one'
241
- model.expects(:new).with("/one", :relative_path => "one").returns one
242
- one.expects(:collect)
240
+ one = double('one')
241
+ expect(model).to receive(:new).with("/one", :relative_path => "one").and_return(one)
242
+ expect(one).to receive(:collect)
243
243
 
244
244
  indirection.search(uri)
245
245
  end
246
246
  end
247
247
 
248
248
  describe "when checking authorization" do
249
- let(:mount) { stub('mount') }
249
+ let(:mount) { double('mount', :empty? => nil, :globalallow? => nil) }
250
250
  let(:request) { Puppet::Indirector::Request.new(:myind, :mymethod, uri, :environment => "myenv") }
251
251
 
252
252
  before(:each) do
253
253
  request.method = :find
254
254
 
255
- configuration.stubs(:split_path).returns([mount, "rel/path"])
256
- request.stubs(:node).returns("mynode")
257
- request.stubs(:ip).returns("myip")
258
- mount.stubs(:name).returns "myname"
259
- mount.stubs(:allowed?).with("mynode", "myip").returns "something"
255
+ allow(configuration).to receive(:split_path).and_return([mount, "rel/path"])
256
+ allow(request).to receive(:node).and_return("mynode")
257
+ allow(request).to receive(:ip).and_return("myip")
258
+ allow(mount).to receive(:name).and_return("myname")
259
+ allow(mount).to receive(:allowed?).with("mynode", "myip").and_return("something")
260
260
  end
261
261
 
262
262
  it "should return false when destroying" do
@@ -270,32 +270,32 @@ describe Puppet::Indirector::FileServer do
270
270
  end
271
271
 
272
272
  it "should use the configuration to find the mount and relative path" do
273
- configuration.expects(:split_path).with(request)
273
+ expect(configuration).to receive(:split_path).with(request)
274
274
 
275
275
  terminus.authorized?(request)
276
276
  end
277
277
 
278
278
  it "should return false if it cannot find the mount" do
279
- configuration.expects(:split_path).returns(nil, nil)
279
+ expect(configuration).to receive(:split_path).and_return([nil, nil])
280
280
 
281
281
  expect(terminus).not_to be_authorized(request)
282
282
  end
283
283
 
284
284
  it "should return true when no auth directives are defined for the mount point" do
285
- mount.stubs(:empty?).returns true
286
- mount.stubs(:globalallow?).returns nil
285
+ allow(mount).to receive(:empty?).and_return(true)
286
+ allow(mount).to receive(:globalallow?).and_return(nil)
287
287
  expect(terminus).to be_authorized(request)
288
288
  end
289
289
 
290
290
  it "should return true when a global allow directive is defined for the mount point" do
291
- mount.stubs(:empty?).returns false
292
- mount.stubs(:globalallow?).returns true
291
+ allow(mount).to receive(:empty?).and_return(false)
292
+ allow(mount).to receive(:globalallow?).and_return(true)
293
293
  expect(terminus).to be_authorized(request)
294
294
  end
295
295
 
296
296
  it "should return false when a non-global allow directive is defined for the mount point" do
297
- mount.stubs(:empty?).returns false
298
- mount.stubs(:globalallow?).returns false
297
+ allow(mount).to receive(:empty?).and_return(false)
298
+ allow(mount).to receive(:globalallow?).and_return(false)
299
299
  expect(terminus).not_to be_authorized(request)
300
300
  end
301
301
  end