puppet 6.4.0-x64-mingw32 → 6.4.1-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 (646) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +7 -11
  4. data/lib/puppet/application/device.rb +97 -82
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/application/ssl.rb +2 -2
  7. data/lib/puppet/configurer.rb +5 -4
  8. data/lib/puppet/defaults.rb +33 -11
  9. data/lib/puppet/indirector/request.rb +28 -15
  10. data/lib/puppet/ssl.rb +1 -1
  11. data/lib/puppet/ssl/certificate.rb +1 -1
  12. data/lib/puppet/ssl/error.rb +1 -1
  13. data/lib/puppet/ssl/host.rb +0 -47
  14. data/lib/puppet/ssl/ssl_provider.rb +2 -2
  15. data/lib/puppet/ssl/state_machine.rb +16 -17
  16. data/lib/puppet/ssl/validator/default_validator.rb +4 -4
  17. data/lib/puppet/ssl/verifier.rb +1 -1
  18. data/lib/puppet/transaction/event_manager.rb +1 -5
  19. data/lib/puppet/util/connection.rb +15 -8
  20. data/lib/puppet/util/monkey_patches.rb +20 -1
  21. data/lib/puppet/version.rb +1 -1
  22. data/locales/puppet.pot +135 -68
  23. data/man/man5/puppet.conf.5 +9 -9
  24. data/man/man8/puppet-agent.8 +1 -1
  25. data/man/man8/puppet-apply.8 +1 -1
  26. data/man/man8/puppet-catalog.8 +1 -1
  27. data/man/man8/puppet-config.8 +1 -1
  28. data/man/man8/puppet-describe.8 +1 -1
  29. data/man/man8/puppet-device.8 +1 -1
  30. data/man/man8/puppet-doc.8 +1 -1
  31. data/man/man8/puppet-epp.8 +1 -1
  32. data/man/man8/puppet-facts.8 +1 -1
  33. data/man/man8/puppet-filebucket.8 +1 -1
  34. data/man/man8/puppet-generate.8 +1 -1
  35. data/man/man8/puppet-help.8 +1 -1
  36. data/man/man8/puppet-key.8 +1 -1
  37. data/man/man8/puppet-lookup.8 +1 -1
  38. data/man/man8/puppet-man.8 +1 -1
  39. data/man/man8/puppet-module.8 +1 -1
  40. data/man/man8/puppet-node.8 +1 -1
  41. data/man/man8/puppet-parser.8 +1 -1
  42. data/man/man8/puppet-plugin.8 +1 -1
  43. data/man/man8/puppet-report.8 +1 -1
  44. data/man/man8/puppet-resource.8 +1 -1
  45. data/man/man8/puppet-script.8 +1 -1
  46. data/man/man8/puppet-ssl.8 +1 -1
  47. data/man/man8/puppet-status.8 +1 -1
  48. data/man/man8/puppet.8 +2 -2
  49. data/spec/integration/agent/logging_spec.rb +5 -7
  50. data/spec/integration/application/apply_spec.rb +18 -16
  51. data/spec/integration/application/doc_spec.rb +1 -2
  52. data/spec/integration/application/lookup_spec.rb +5 -5
  53. data/spec/integration/configurer_spec.rb +5 -6
  54. data/spec/integration/defaults_spec.rb +5 -6
  55. data/spec/integration/directory_environments_spec.rb +1 -1
  56. data/spec/integration/faces/config_spec.rb +3 -4
  57. data/spec/integration/faces/documentation_spec.rb +0 -1
  58. data/spec/integration/faces/plugin_spec.rb +1 -1
  59. data/spec/integration/file_bucket/file_spec.rb +2 -4
  60. data/spec/integration/file_serving/content_spec.rb +0 -1
  61. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  62. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  63. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  64. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  65. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  66. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  67. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  68. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  69. data/spec/integration/network/authconfig_spec.rb +23 -24
  70. data/spec/integration/network/formats_spec.rb +0 -1
  71. data/spec/integration/network/http_pool_spec.rb +3 -3
  72. data/spec/integration/node/environment_spec.rb +0 -1
  73. data/spec/integration/node/facts_spec.rb +9 -10
  74. data/spec/integration/node_spec.rb +6 -7
  75. data/spec/integration/parser/catalog_spec.rb +1 -5
  76. data/spec/integration/parser/collection_spec.rb +1 -2
  77. data/spec/integration/parser/compiler_spec.rb +6 -6
  78. data/spec/integration/parser/scope_spec.rb +1 -1
  79. data/spec/integration/parser/undef_param_spec.rb +1 -1
  80. data/spec/integration/provider/service/init_spec.rb +4 -5
  81. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  82. data/spec/integration/provider/service/windows_spec.rb +1 -2
  83. data/spec/integration/reference/providers_spec.rb +1 -2
  84. data/spec/integration/reports_spec.rb +1 -2
  85. data/spec/integration/resource/catalog_spec.rb +14 -17
  86. data/spec/integration/resource/type_collection_spec.rb +4 -5
  87. data/spec/integration/rest/client_spec.rb +1 -1
  88. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  89. data/spec/integration/ssl/host_spec.rb +1 -2
  90. data/spec/integration/ssl/key_spec.rb +0 -1
  91. data/spec/integration/test/test_helper_spec.rb +0 -1
  92. data/spec/integration/transaction/report_spec.rb +6 -11
  93. data/spec/integration/transaction_spec.rb +18 -19
  94. data/spec/integration/type/exec_spec.rb +0 -1
  95. data/spec/integration/type/file_spec.rb +13 -14
  96. data/spec/integration/type/package_spec.rb +19 -23
  97. data/spec/integration/type/tidy_spec.rb +1 -2
  98. data/spec/integration/type_spec.rb +0 -1
  99. data/spec/integration/util/autoload_spec.rb +1 -2
  100. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  101. data/spec/integration/util/settings_spec.rb +0 -1
  102. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  103. data/spec/integration/util/windows/principal_spec.rb +0 -1
  104. data/spec/integration/util/windows/process_spec.rb +4 -6
  105. data/spec/integration/util/windows/registry_spec.rb +41 -51
  106. data/spec/integration/util/windows/security_spec.rb +2 -4
  107. data/spec/integration/util/windows/user_spec.rb +18 -20
  108. data/spec/integration/util_spec.rb +4 -7
  109. data/spec/lib/puppet_spec/compiler.rb +1 -1
  110. data/spec/lib/puppet_spec/files.rb +0 -1
  111. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  112. data/spec/lib/puppet_spec/scope.rb +1 -2
  113. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  114. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  115. data/spec/shared_behaviours/file_serving.rb +6 -8
  116. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  117. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  118. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  119. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  120. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  121. data/spec/spec_helper.rb +10 -1
  122. data/spec/unit/agent/disabler_spec.rb +4 -5
  123. data/spec/unit/agent/locker_spec.rb +12 -13
  124. data/spec/unit/agent_spec.rb +80 -85
  125. data/spec/unit/application/agent_spec.rb +88 -94
  126. data/spec/unit/application/apply_spec.rb +82 -83
  127. data/spec/unit/application/config_spec.rb +0 -1
  128. data/spec/unit/application/describe_spec.rb +6 -7
  129. data/spec/unit/application/device_spec.rb +379 -384
  130. data/spec/unit/application/doc_spec.rb +44 -46
  131. data/spec/unit/application/face_base_spec.rb +61 -62
  132. data/spec/unit/application/facts_spec.rb +3 -4
  133. data/spec/unit/application/filebucket_spec.rb +66 -74
  134. data/spec/unit/application/indirection_base_spec.rb +8 -6
  135. data/spec/unit/application/lookup_spec.rb +26 -26
  136. data/spec/unit/application/resource_spec.rb +42 -48
  137. data/spec/unit/application/ssl_spec.rb +9 -9
  138. data/spec/unit/application_spec.rb +82 -92
  139. data/spec/unit/capability_spec.rb +6 -6
  140. data/spec/unit/certificate_factory_spec.rb +3 -5
  141. data/spec/unit/configurer/downloader_spec.rb +20 -21
  142. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  143. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  144. data/spec/unit/configurer_spec.rb +189 -192
  145. data/spec/unit/confine/exists_spec.rb +17 -15
  146. data/spec/unit/confine/false_spec.rb +5 -6
  147. data/spec/unit/confine/feature_spec.rb +7 -5
  148. data/spec/unit/confine/true_spec.rb +5 -6
  149. data/spec/unit/confine/variable_spec.rb +14 -15
  150. data/spec/unit/confine_collection_spec.rb +28 -29
  151. data/spec/unit/confine_spec.rb +13 -14
  152. data/spec/unit/confiner_spec.rb +10 -11
  153. data/spec/unit/context/trusted_information_spec.rb +1 -1
  154. data/spec/unit/daemon_spec.rb +35 -36
  155. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  156. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  157. data/spec/unit/datatypes_spec.rb +3 -4
  158. data/spec/unit/defaults_spec.rb +18 -13
  159. data/spec/unit/environments_spec.rb +7 -7
  160. data/spec/unit/etc_spec.rb +30 -32
  161. data/spec/unit/external/pson_spec.rb +0 -1
  162. data/spec/unit/face/catalog_spec.rb +0 -1
  163. data/spec/unit/face/config_spec.rb +31 -35
  164. data/spec/unit/face/epp_face_spec.rb +3 -4
  165. data/spec/unit/face/facts_spec.rb +5 -6
  166. data/spec/unit/face/generate_spec.rb +4 -5
  167. data/spec/unit/face/help_spec.rb +7 -8
  168. data/spec/unit/face/key_spec.rb +0 -1
  169. data/spec/unit/face/man_spec.rb +1 -2
  170. data/spec/unit/face/module/install_spec.rb +3 -5
  171. data/spec/unit/face/module/list_spec.rb +2 -12
  172. data/spec/unit/face/module/search_spec.rb +11 -9
  173. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  174. data/spec/unit/face/node_spec.rb +23 -24
  175. data/spec/unit/face/parser_spec.rb +3 -3
  176. data/spec/unit/face/plugin_spec.rb +36 -9
  177. data/spec/unit/face/status_spec.rb +0 -1
  178. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  179. data/spec/unit/file_bucket/file_spec.rb +0 -2
  180. data/spec/unit/file_serving/base_spec.rb +14 -15
  181. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  182. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  183. data/spec/unit/file_serving/content_spec.rb +10 -11
  184. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  185. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  186. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  187. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  188. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  189. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  190. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  191. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  192. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  193. data/spec/unit/file_serving/mount_spec.rb +0 -1
  194. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  195. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  196. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  197. data/spec/unit/file_system_spec.rb +4 -4
  198. data/spec/unit/forge/errors_spec.rb +1 -1
  199. data/spec/unit/forge/forge_spec.rb +13 -14
  200. data/spec/unit/forge/module_release_spec.rb +18 -18
  201. data/spec/unit/forge/repository_spec.rb +29 -30
  202. data/spec/unit/forge_spec.rb +15 -11
  203. data/spec/unit/functions/binary_file_spec.rb +3 -3
  204. data/spec/unit/functions/contain_spec.rb +0 -2
  205. data/spec/unit/functions/defined_spec.rb +0 -1
  206. data/spec/unit/functions/epp_spec.rb +2 -2
  207. data/spec/unit/functions/find_file_spec.rb +7 -7
  208. data/spec/unit/functions/include_spec.rb +0 -4
  209. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  210. data/spec/unit/functions/lookup_spec.rb +1 -2
  211. data/spec/unit/functions/module_directory_spec.rb +12 -12
  212. data/spec/unit/functions/require_spec.rb +0 -3
  213. data/spec/unit/functions/shared.rb +5 -8
  214. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  215. data/spec/unit/functions4_spec.rb +9 -10
  216. data/spec/unit/gettext/config_spec.rb +4 -4
  217. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  218. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  219. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  220. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  221. data/spec/unit/hiera_puppet_spec.rb +20 -20
  222. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  223. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  224. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  225. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  226. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  227. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  228. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  229. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  230. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  231. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  232. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  233. data/spec/unit/indirector/envelope_spec.rb +1 -2
  234. data/spec/unit/indirector/exec_spec.rb +4 -5
  235. data/spec/unit/indirector/face_spec.rb +9 -9
  236. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  237. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  238. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  239. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  240. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  241. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  242. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  243. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  244. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  245. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  246. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  247. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  248. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  249. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  250. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  251. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  252. data/spec/unit/indirector/file_server_spec.rb +87 -87
  253. data/spec/unit/indirector/indirection_spec.rb +242 -226
  254. data/spec/unit/indirector/json_spec.rb +7 -9
  255. data/spec/unit/indirector/key/file_spec.rb +21 -22
  256. data/spec/unit/indirector/memory_spec.rb +6 -7
  257. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  258. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  259. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  260. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  261. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  262. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  263. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  264. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  265. data/spec/unit/indirector/none_spec.rb +5 -5
  266. data/spec/unit/indirector/plain_spec.rb +7 -8
  267. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  268. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  269. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  270. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  271. data/spec/unit/indirector/request_spec.rb +11 -12
  272. data/spec/unit/indirector/resource/ral_spec.rb +47 -54
  273. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  274. data/spec/unit/indirector/rest_spec.rb +113 -110
  275. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  276. data/spec/unit/indirector/status/local_spec.rb +0 -1
  277. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  278. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  279. data/spec/unit/indirector/terminus_spec.rb +27 -27
  280. data/spec/unit/indirector/yaml_spec.rb +5 -6
  281. data/spec/unit/indirector_spec.rb +1 -2
  282. data/spec/unit/info_service_spec.rb +1 -1
  283. data/spec/unit/interface/action_builder_spec.rb +0 -1
  284. data/spec/unit/interface/action_manager_spec.rb +0 -1
  285. data/spec/unit/interface/action_spec.rb +2 -3
  286. data/spec/unit/interface/documentation_spec.rb +0 -1
  287. data/spec/unit/interface/face_collection_spec.rb +19 -12
  288. data/spec/unit/interface_spec.rb +3 -3
  289. data/spec/unit/man_spec.rb +3 -4
  290. data/spec/unit/module_spec.rb +46 -51
  291. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  292. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  293. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  294. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  295. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  296. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  297. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  298. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  299. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  300. data/spec/unit/module_tool/tar_spec.rb +12 -13
  301. data/spec/unit/module_tool_spec.rb +7 -12
  302. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  303. data/spec/unit/network/authconfig_spec.rb +17 -18
  304. data/spec/unit/network/authorization_spec.rb +4 -5
  305. data/spec/unit/network/authstore_spec.rb +0 -1
  306. data/spec/unit/network/format_handler_spec.rb +0 -1
  307. data/spec/unit/network/format_spec.rb +9 -10
  308. data/spec/unit/network/format_support_spec.rb +28 -29
  309. data/spec/unit/network/formats_spec.rb +4 -5
  310. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  311. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  312. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  313. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  314. data/spec/unit/network/http/api_spec.rb +0 -2
  315. data/spec/unit/network/http/compression_spec.rb +21 -22
  316. data/spec/unit/network/http/connection_spec.rb +35 -35
  317. data/spec/unit/network/http/factory_spec.rb +5 -6
  318. data/spec/unit/network/http/handler_spec.rb +9 -18
  319. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  320. data/spec/unit/network/http/pool_spec.rb +33 -34
  321. data/spec/unit/network/http/request_spec.rb +0 -2
  322. data/spec/unit/network/http/response_spec.rb +11 -13
  323. data/spec/unit/network/http/route_spec.rb +0 -1
  324. data/spec/unit/network/http/session_spec.rb +2 -3
  325. data/spec/unit/network/http/site_spec.rb +0 -1
  326. data/spec/unit/network/http_pool_spec.rb +19 -10
  327. data/spec/unit/network/http_spec.rb +0 -1
  328. data/spec/unit/network/resolver_spec.rb +25 -26
  329. data/spec/unit/network/rights_spec.rb +52 -53
  330. data/spec/unit/node/environment_spec.rb +14 -15
  331. data/spec/unit/node/facts_spec.rb +5 -7
  332. data/spec/unit/node_spec.rb +4 -10
  333. data/spec/unit/other/selinux_spec.rb +0 -1
  334. data/spec/unit/parameter/boolean_spec.rb +1 -2
  335. data/spec/unit/parameter/package_options_spec.rb +1 -2
  336. data/spec/unit/parameter/path_spec.rb +0 -1
  337. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  338. data/spec/unit/parameter/value_spec.rb +0 -1
  339. data/spec/unit/parameter_spec.rb +9 -9
  340. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  341. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  342. data/spec/unit/parser/compiler_spec.rb +84 -96
  343. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  344. data/spec/unit/parser/files_spec.rb +0 -1
  345. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  346. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  347. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  348. data/spec/unit/parser/functions/file_spec.rb +13 -14
  349. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  350. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  351. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  352. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  353. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  354. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  355. data/spec/unit/parser/functions/split_spec.rb +0 -1
  356. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  357. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  358. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  359. data/spec/unit/parser/functions/template_spec.rb +13 -13
  360. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  361. data/spec/unit/parser/functions_spec.rb +6 -7
  362. data/spec/unit/parser/relationship_spec.rb +0 -1
  363. data/spec/unit/parser/resource_spec.rb +42 -42
  364. data/spec/unit/parser/scope_spec.rb +39 -35
  365. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  366. data/spec/unit/parser/type_loader_spec.rb +17 -19
  367. data/spec/unit/pops/adaptable_spec.rb +0 -1
  368. data/spec/unit/pops/benchmark_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  371. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  372. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  373. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  374. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  375. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  376. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  377. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  378. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  379. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  380. data/spec/unit/pops/factory_spec.rb +3 -4
  381. data/spec/unit/pops/issues_spec.rb +19 -20
  382. data/spec/unit/pops/loaders/loader_spec.rb +9 -5
  383. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  384. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  385. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  386. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  387. data/spec/unit/pops/migration_spec.rb +3 -5
  388. data/spec/unit/pops/model/model_spec.rb +0 -1
  389. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  390. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  391. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  392. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  393. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  394. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  395. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  396. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  397. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  398. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  399. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  400. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  401. data/spec/unit/pops/pn_spec.rb +0 -1
  402. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  403. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  404. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  405. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  406. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  407. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  408. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  409. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  410. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  411. data/spec/unit/pops/visitor_spec.rb +0 -1
  412. data/spec/unit/property/boolean_spec.rb +1 -1
  413. data/spec/unit/property/ensure_spec.rb +0 -1
  414. data/spec/unit/property/keyvalue_spec.rb +32 -34
  415. data/spec/unit/property/list_spec.rb +26 -27
  416. data/spec/unit/property/ordered_list_spec.rb +10 -14
  417. data/spec/unit/property_spec.rb +42 -43
  418. data/spec/unit/provider/aix_object_spec.rb +47 -45
  419. data/spec/unit/provider/command_spec.rb +9 -9
  420. data/spec/unit/provider/exec/posix_spec.rb +8 -9
  421. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  422. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  423. data/spec/unit/provider/exec_spec.rb +0 -1
  424. data/spec/unit/provider/file/posix_spec.rb +22 -24
  425. data/spec/unit/provider/file/windows_spec.rb +15 -17
  426. data/spec/unit/provider/group/aix_spec.rb +3 -2
  427. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  428. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  429. data/spec/unit/provider/group/pw_spec.rb +11 -11
  430. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  431. data/spec/unit/provider/ldap_spec.rb +61 -62
  432. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  433. data/spec/unit/provider/nameservice_spec.rb +38 -40
  434. data/spec/unit/provider/package/aix_spec.rb +15 -15
  435. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  436. data/spec/unit/provider/package/apt_spec.rb +44 -27
  437. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  438. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  439. data/spec/unit/provider/package/base_spec.rb +4 -4
  440. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  441. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  442. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  443. data/spec/unit/provider/package/gem_spec.rb +51 -43
  444. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  445. data/spec/unit/provider/package/macports_spec.rb +46 -42
  446. data/spec/unit/provider/package/nim_spec.rb +30 -39
  447. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  448. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  449. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  450. data/spec/unit/provider/package/pip_spec.rb +71 -72
  451. data/spec/unit/provider/package/pkg_spec.rb +113 -114
  452. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  453. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  454. data/spec/unit/provider/package/pkgng_spec.rb +21 -22
  455. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  456. data/spec/unit/provider/package/portage_spec.rb +71 -75
  457. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  458. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  459. data/spec/unit/provider/package/sun_spec.rb +16 -18
  460. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  461. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  462. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  463. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  464. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  465. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  466. data/spec/unit/provider/package/windows_spec.rb +36 -32
  467. data/spec/unit/provider/package/yum_spec.rb +7 -7
  468. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  469. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  470. data/spec/unit/provider/service/base_spec.rb +4 -5
  471. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  472. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  473. data/spec/unit/provider/service/debian_spec.rb +38 -38
  474. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  475. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  476. data/spec/unit/provider/service/init_spec.rb +53 -52
  477. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  478. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  479. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  480. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  481. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  482. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  483. data/spec/unit/provider/service/runit_spec.rb +29 -27
  484. data/spec/unit/provider/service/smf_spec.rb +74 -66
  485. data/spec/unit/provider/service/src_spec.rb +46 -47
  486. data/spec/unit/provider/service/systemd_spec.rb +113 -122
  487. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  488. data/spec/unit/provider/service/windows_spec.rb +33 -41
  489. data/spec/unit/provider/user/aix_spec.rb +31 -31
  490. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  491. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  492. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  493. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  494. data/spec/unit/provider/user/pw_spec.rb +37 -35
  495. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  496. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  497. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  498. data/spec/unit/provider_spec.rb +35 -35
  499. data/spec/unit/puppet_pal_2pec.rb +4 -5
  500. data/spec/unit/puppet_pal_spec.rb +0 -1
  501. data/spec/unit/puppet_spec.rb +6 -7
  502. data/spec/unit/relationship_spec.rb +0 -1
  503. data/spec/unit/reports/http_spec.rb +22 -24
  504. data/spec/unit/reports/store_spec.rb +3 -4
  505. data/spec/unit/reports_spec.rb +12 -14
  506. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  507. data/spec/unit/resource/catalog_spec.rb +72 -68
  508. data/spec/unit/resource/status_spec.rb +6 -8
  509. data/spec/unit/resource/type_collection_spec.rb +17 -18
  510. data/spec/unit/resource/type_spec.rb +34 -35
  511. data/spec/unit/resource_spec.rb +36 -32
  512. data/spec/unit/rest/client_spec.rb +56 -25
  513. data/spec/unit/rest/route_spec.rb +5 -5
  514. data/spec/unit/scheduler/job_spec.rb +0 -1
  515. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  516. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  517. data/spec/unit/settings/array_setting_spec.rb +1 -1
  518. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  519. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  520. data/spec/unit/settings/config_file_spec.rb +0 -1
  521. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  522. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  523. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  524. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  525. data/spec/unit/settings/file_setting_spec.rb +44 -46
  526. data/spec/unit/settings/path_setting_spec.rb +1 -2
  527. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  528. data/spec/unit/settings/string_setting_spec.rb +14 -15
  529. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  530. data/spec/unit/settings/value_translator_spec.rb +0 -1
  531. data/spec/unit/settings_spec.rb +228 -235
  532. data/spec/unit/ssl/base_spec.rb +14 -15
  533. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  534. data/spec/unit/ssl/certificate_spec.rb +23 -25
  535. data/spec/unit/ssl/digest_spec.rb +0 -1
  536. data/spec/unit/ssl/host_spec.rb +147 -130
  537. data/spec/unit/ssl/key_spec.rb +30 -31
  538. data/spec/unit/ssl/ssl_provider_spec.rb +24 -24
  539. data/spec/unit/ssl/state_machine_spec.rb +50 -58
  540. data/spec/unit/ssl/validator_spec.rb +43 -54
  541. data/spec/unit/ssl/verifier_spec.rb +10 -10
  542. data/spec/unit/task_spec.rb +44 -45
  543. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  544. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  545. data/spec/unit/transaction/event_spec.rb +16 -15
  546. data/spec/unit/transaction/persistence_spec.rb +16 -17
  547. data/spec/unit/transaction/report_spec.rb +11 -12
  548. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  549. data/spec/unit/transaction_spec.rb +100 -101
  550. data/spec/unit/type/component_spec.rb +0 -1
  551. data/spec/unit/type/exec_spec.rb +60 -56
  552. data/spec/unit/type/file/checksum_spec.rb +9 -10
  553. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  554. data/spec/unit/type/file/content_spec.rb +58 -61
  555. data/spec/unit/type/file/ctime_spec.rb +0 -1
  556. data/spec/unit/type/file/ensure_spec.rb +12 -13
  557. data/spec/unit/type/file/group_spec.rb +5 -7
  558. data/spec/unit/type/file/mode_spec.rb +4 -6
  559. data/spec/unit/type/file/mtime_spec.rb +0 -1
  560. data/spec/unit/type/file/owner_spec.rb +6 -8
  561. data/spec/unit/type/file/selinux_spec.rb +17 -19
  562. data/spec/unit/type/file/source_spec.rb +104 -101
  563. data/spec/unit/type/file/type_spec.rb +0 -1
  564. data/spec/unit/type/file_spec.rb +195 -185
  565. data/spec/unit/type/filebucket_spec.rb +4 -5
  566. data/spec/unit/type/group_spec.rb +6 -8
  567. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  568. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  569. data/spec/unit/type/package_spec.rb +56 -57
  570. data/spec/unit/type/resources_spec.rb +72 -74
  571. data/spec/unit/type/schedule_spec.rb +24 -26
  572. data/spec/unit/type/service_spec.rb +49 -49
  573. data/spec/unit/type/stage_spec.rb +0 -1
  574. data/spec/unit/type/tidy_spec.rb +61 -62
  575. data/spec/unit/type/user_spec.rb +24 -25
  576. data/spec/unit/type/whit_spec.rb +0 -1
  577. data/spec/unit/type_spec.rb +55 -54
  578. data/spec/unit/util/at_fork_spec.rb +18 -19
  579. data/spec/unit/util/autoload_spec.rb +55 -56
  580. data/spec/unit/util/backups_spec.rb +34 -35
  581. data/spec/unit/util/character_encoding_spec.rb +5 -5
  582. data/spec/unit/util/checksums_spec.rb +38 -39
  583. data/spec/unit/util/colors_spec.rb +1 -2
  584. data/spec/unit/util/command_line_spec.rb +24 -25
  585. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  586. data/spec/unit/util/diff_spec.rb +7 -8
  587. data/spec/unit/util/errors_spec.rb +0 -1
  588. data/spec/unit/util/execution_spec.rb +185 -161
  589. data/spec/unit/util/execution_stub_spec.rb +0 -1
  590. data/spec/unit/util/feature_spec.rb +23 -14
  591. data/spec/unit/util/filetype_spec.rb +49 -49
  592. data/spec/unit/util/http_proxy_spec.rb +12 -12
  593. data/spec/unit/util/inifile_spec.rb +26 -31
  594. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  595. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  596. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  597. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  598. data/spec/unit/util/lockfile_spec.rb +0 -1
  599. data/spec/unit/util/log/destinations_spec.rb +30 -33
  600. data/spec/unit/util/log_spec.rb +35 -36
  601. data/spec/unit/util/logging_spec.rb +58 -72
  602. data/spec/unit/util/metric_spec.rb +0 -1
  603. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  604. data/spec/unit/util/multi_match_spec.rb +0 -1
  605. data/spec/unit/util/network_device/config_spec.rb +0 -1
  606. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  607. data/spec/unit/util/network_device_spec.rb +7 -9
  608. data/spec/unit/util/package_spec.rb +0 -1
  609. data/spec/unit/util/pidlock_spec.rb +21 -22
  610. data/spec/unit/util/plist_spec.rb +40 -33
  611. data/spec/unit/util/posix_spec.rb +54 -51
  612. data/spec/unit/util/rdoc_spec.rb +9 -10
  613. data/spec/unit/util/reference_spec.rb +0 -1
  614. data/spec/unit/util/resource_template_spec.rb +20 -20
  615. data/spec/unit/util/retry_action_spec.rb +7 -8
  616. data/spec/unit/util/rubygems_spec.rb +7 -8
  617. data/spec/unit/util/run_mode_spec.rb +3 -4
  618. data/spec/unit/util/selinux_spec.rb +79 -72
  619. data/spec/unit/util/splayer_spec.rb +8 -9
  620. data/spec/unit/util/ssl_spec.rb +0 -1
  621. data/spec/unit/util/storage_spec.rb +3 -4
  622. data/spec/unit/util/suidmanager_spec.rb +45 -54
  623. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  624. data/spec/unit/util/tag_set_spec.rb +0 -1
  625. data/spec/unit/util/tagging_spec.rb +0 -1
  626. data/spec/unit/util/terminal_spec.rb +9 -10
  627. data/spec/unit/util/user_attr_spec.rb +1 -2
  628. data/spec/unit/util/warnings_spec.rb +3 -4
  629. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  630. data/spec/unit/util/watcher_spec.rb +51 -21
  631. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  632. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  633. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  634. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  635. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  636. data/spec/unit/util/windows/file_spec.rb +0 -1
  637. data/spec/unit/util/windows/root_certs_spec.rb +1 -2
  638. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  639. data/spec/unit/util/windows/service_spec.rb +66 -68
  640. data/spec/unit/util/windows/sid_spec.rb +11 -13
  641. data/spec/unit/util/windows/string_spec.rb +0 -1
  642. data/spec/unit/util_spec.rb +55 -57
  643. data/spec/unit/version_spec.rb +6 -6
  644. data/spec/unit/x509/cert_provider_spec.rb +14 -14
  645. data/spec/unit/x509/pem_store_spec.rb +5 -5
  646. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/rdoc'
@@ -7,48 +6,48 @@ require 'rdoc/rdoc'
7
6
  describe Puppet::Util::RDoc do
8
7
  describe "when generating RDoc HTML documentation" do
9
8
  before :each do
10
- @rdoc = stub_everything 'rdoc'
11
- RDoc::RDoc.stubs(:new).returns(@rdoc)
9
+ @rdoc = double('rdoc')
10
+ allow(RDoc::RDoc).to receive(:new).and_return(@rdoc)
12
11
  end
13
12
 
14
13
  it "should tell RDoc to generate documentation using the Puppet generator" do
15
- @rdoc.expects(:document).with { |args| args.include?("--fmt") and args.include?("puppet") }
14
+ expect(@rdoc).to receive(:document).with(include("--fmt").and(include("puppet")))
16
15
 
17
16
  Puppet::Util::RDoc.rdoc("output", [])
18
17
  end
19
18
 
20
19
  it "should tell RDoc to be quiet" do
21
- @rdoc.expects(:document).with { |args| args.include?("--quiet") }
20
+ expect(@rdoc).to receive(:document).with(include("--quiet"))
22
21
 
23
22
  Puppet::Util::RDoc.rdoc("output", [])
24
23
  end
25
24
 
26
25
  it "should pass charset to RDoc" do
27
- @rdoc.expects(:document).with { |args| args.include?("--charset") and args.include?("utf-8") }
26
+ expect(@rdoc).to receive(:document).with(include("--charset").and(include("utf-8")))
28
27
 
29
28
  Puppet::Util::RDoc.rdoc("output", [], "utf-8")
30
29
  end
31
30
 
32
31
  it "should tell RDoc to use the given outputdir" do
33
- @rdoc.expects(:document).with { |args| args.include?("--op") and args.include?("myoutputdir") }
32
+ expect(@rdoc).to receive(:document).with(include("--op").and(include("myoutputdir")))
34
33
 
35
34
  Puppet::Util::RDoc.rdoc("myoutputdir", [])
36
35
  end
37
36
 
38
37
  it "should tell RDoc to exclude all files under any modules/<mod>/files section" do
39
- @rdoc.expects(:document).with { |args| args.include?("--exclude") and args.include?("/modules/[^/]*/files/.*$") }
38
+ expect(@rdoc).to receive(:document).with(include("--exclude").and(include("/modules/[^/]*/files/.*$")))
40
39
 
41
40
  Puppet::Util::RDoc.rdoc("myoutputdir", [])
42
41
  end
43
42
 
44
43
  it "should tell RDoc to exclude all files under any modules/<mod>/templates section" do
45
- @rdoc.expects(:document).with { |args| args.include?("--exclude") and args.include?("/modules/[^/]*/templates/.*$") }
44
+ expect(@rdoc).to receive(:document).with(include("--exclude").and(include("/modules/[^/]*/templates/.*$")))
46
45
 
47
46
  Puppet::Util::RDoc.rdoc("myoutputdir", [])
48
47
  end
49
48
 
50
49
  it "should give all the source directories to RDoc" do
51
- @rdoc.expects(:document).with { |args| args.include?("sourcedir") }
50
+ expect(@rdoc).to receive(:document).with(include("sourcedir"))
52
51
 
53
52
  Puppet::Util::RDoc.rdoc("output", ["sourcedir"])
54
53
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/util/reference'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/resource_template'
@@ -6,51 +5,52 @@ require 'puppet/util/resource_template'
6
5
  describe Puppet::Util::ResourceTemplate do
7
6
  describe "when initializing" do
8
7
  it "should fail if the template does not exist" do
9
- Puppet::FileSystem.expects(:exist?).with("/my/template").returns false
10
- expect { Puppet::Util::ResourceTemplate.new("/my/template", mock('resource')) }.to raise_error(ArgumentError)
8
+ expect(Puppet::FileSystem).to receive(:exist?).with("/my/template").and_return(false)
9
+ expect { Puppet::Util::ResourceTemplate.new("/my/template", double('resource')) }.to raise_error(ArgumentError)
11
10
  end
12
11
 
13
12
  it "should not create the ERB template" do
14
- ERB.expects(:new).never
15
- Puppet::FileSystem.expects(:exist?).with("/my/template").returns true
16
- Puppet::Util::ResourceTemplate.new("/my/template", mock('resource'))
13
+ expect(ERB).not_to receive(:new)
14
+ expect(Puppet::FileSystem).to receive(:exist?).with("/my/template").and_return(true)
15
+ Puppet::Util::ResourceTemplate.new("/my/template", double('resource'))
17
16
  end
18
17
  end
19
18
 
20
19
  describe "when evaluating" do
21
20
  before do
22
- Puppet::FileSystem.stubs(:exist?).returns true
23
- Puppet::FileSystem.stubs(:read).returns "eh"
21
+ allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
22
+ allow(Puppet::FileSystem).to receive(:read).and_return("eh")
24
23
 
25
- @template = stub 'template', :result => nil
26
- ERB.stubs(:new).returns @template
24
+ @template = double('template', :result => nil)
25
+ allow(ERB).to receive(:new).and_return(@template)
27
26
 
28
- @resource = mock 'resource'
27
+ @resource = double('resource')
29
28
  @wrapper = Puppet::Util::ResourceTemplate.new("/my/template", @resource)
30
29
  end
31
30
 
32
31
  it "should set all of the resource's parameters as instance variables" do
33
- @resource.expects(:to_hash).returns(:one => "uno", :two => "dos")
34
- @template.expects(:result).with do |bind|
35
- eval("@one", bind) == "uno" and eval("@two", bind) == "dos"
32
+ expect(@resource).to receive(:to_hash).and_return(:one => "uno", :two => "dos")
33
+ expect(@template).to receive(:result) do |bind|
34
+ expect(eval("@one", bind)).to eq("uno")
35
+ expect(eval("@two", bind)).to eq("dos")
36
36
  end
37
37
  @wrapper.evaluate
38
38
  end
39
39
 
40
40
  it "should create a template instance with the contents of the file" do
41
- Puppet::FileSystem.expects(:read).with("/my/template", :encoding => 'utf-8').returns "yay"
42
- ERB.expects(:new).with("yay", 0, "-").returns(@template)
41
+ expect(Puppet::FileSystem).to receive(:read).with("/my/template", :encoding => 'utf-8').and_return("yay")
42
+ expect(ERB).to receive(:new).with("yay", 0, "-").and_return(@template)
43
43
 
44
- @wrapper.stubs :set_resource_variables
44
+ allow(@wrapper).to receive(:set_resource_variables)
45
45
 
46
46
  @wrapper.evaluate
47
47
  end
48
48
 
49
49
  it "should return the result of the template" do
50
- @wrapper.stubs :set_resource_variables
50
+ allow(@wrapper).to receive(:set_resource_variables)
51
51
 
52
- @wrapper.expects(:binding).returns "mybinding"
53
- @template.expects(:result).with("mybinding").returns "myresult"
52
+ expect(@wrapper).to receive(:binding).and_return("mybinding")
53
+ expect(@template).to receive(:result).with("mybinding").and_return("myresult")
54
54
  expect(@wrapper.evaluate).to eq("myresult")
55
55
  end
56
56
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/retry_action'
@@ -23,8 +22,8 @@ describe Puppet::Util::RetryAction do
23
22
  end
24
23
 
25
24
  it 'should retry on any exception if no acceptable exceptions given' do
26
- Puppet::Util::RetryAction.expects(:sleep).with( (((2 ** 1) -1) * 0.1) )
27
- Puppet::Util::RetryAction.expects(:sleep).with( (((2 ** 2) -1) * 0.1) )
25
+ expect(Puppet::Util::RetryAction).to receive(:sleep).with( (((2 ** 1) -1) * 0.1) )
26
+ expect(Puppet::Util::RetryAction).to receive(:sleep).with( (((2 ** 2) -1) * 0.1) )
28
27
 
29
28
  expect do
30
29
  Puppet::Util::RetryAction.retry_action( :retries => 2 ) do
@@ -34,8 +33,8 @@ describe Puppet::Util::RetryAction do
34
33
  end
35
34
 
36
35
  it 'should retry on acceptable exceptions' do
37
- Puppet::Util::RetryAction.expects(:sleep).with( (((2 ** 1) -1) * 0.1) )
38
- Puppet::Util::RetryAction.expects(:sleep).with( (((2 ** 2) -1) * 0.1) )
36
+ expect(Puppet::Util::RetryAction).to receive(:sleep).with( (((2 ** 1) -1) * 0.1) )
37
+ expect(Puppet::Util::RetryAction).to receive(:sleep).with( (((2 ** 2) -1) * 0.1) )
39
38
 
40
39
  expect do
41
40
  Puppet::Util::RetryAction.retry_action( :retries => 2, :retry_exceptions => exceptions) do
@@ -45,7 +44,7 @@ describe Puppet::Util::RetryAction do
45
44
  end
46
45
 
47
46
  it 'should not retry on unacceptable exceptions' do
48
- Puppet::Util::RetryAction.expects(:sleep).never
47
+ expect(Puppet::Util::RetryAction).not_to receive(:sleep)
49
48
 
50
49
  expect do
51
50
  Puppet::Util::RetryAction.retry_action( :retries => 2, :retry_exceptions => exceptions) do
@@ -55,7 +54,7 @@ describe Puppet::Util::RetryAction do
55
54
  end
56
55
 
57
56
  it 'should succeed if nothing is raised' do
58
- Puppet::Util::RetryAction.expects(:sleep).never
57
+ expect(Puppet::Util::RetryAction).not_to receive(:sleep)
59
58
 
60
59
  Puppet::Util::RetryAction.retry_action( :retries => 2) do
61
60
  true
@@ -64,7 +63,7 @@ describe Puppet::Util::RetryAction do
64
63
 
65
64
  it 'should succeed if an expected exception is raised retried and succeeds' do
66
65
  should_retry = nil
67
- Puppet::Util::RetryAction.expects(:sleep).once
66
+ expect(Puppet::Util::RetryAction).to receive(:sleep).once
68
67
 
69
68
  Puppet::Util::RetryAction.retry_action( :retries => 2, :retry_exceptions => exceptions) do
70
69
  if should_retry
@@ -4,22 +4,22 @@ require 'puppet/util/rubygems'
4
4
  describe Puppet::Util::RubyGems::Source do
5
5
  let(:gem_path) { File.expand_path('/foo/gems') }
6
6
  let(:gem_lib) { File.join(gem_path, 'lib') }
7
- let(:fake_gem) { stub(:full_gem_path => gem_path) }
7
+ let(:fake_gem) { double(:full_gem_path => gem_path) }
8
8
 
9
9
  describe "::new" do
10
10
  it "returns NoGemsSource if rubygems is not present" do
11
- described_class.expects(:has_rubygems?).returns(false)
11
+ expect(described_class).to receive(:has_rubygems?).and_return(false)
12
12
  expect(described_class.new).to be_kind_of(Puppet::Util::RubyGems::NoGemsSource)
13
13
  end
14
14
 
15
15
  it "returns Gems18Source if Gem::Specification responds to latest_specs" do
16
- described_class.expects(:has_rubygems?).returns(true)
16
+ expect(described_class).to receive(:has_rubygems?).and_return(true)
17
17
  expect(described_class.new).to be_kind_of(Puppet::Util::RubyGems::Gems18Source)
18
18
  end
19
19
  end
20
20
 
21
21
  describe '::NoGemsSource' do
22
- before(:each) { described_class.stubs(:source).returns(Puppet::Util::RubyGems::NoGemsSource) }
22
+ before(:each) { allow(described_class).to receive(:source).and_return(Puppet::Util::RubyGems::NoGemsSource) }
23
23
 
24
24
  it "#directories returns an empty list" do
25
25
  expect(described_class.new.directories).to eq([])
@@ -31,18 +31,17 @@ describe Puppet::Util::RubyGems::Source do
31
31
  end
32
32
 
33
33
  describe '::Gems18Source' do
34
- before(:each) { described_class.stubs(:source).returns(Puppet::Util::RubyGems::Gems18Source) }
34
+ before(:each) { allow(described_class).to receive(:source).and_return(Puppet::Util::RubyGems::Gems18Source) }
35
35
 
36
36
  it "#directories returns the lib subdirs of Gem::Specification.latest_specs" do
37
- Gem::Specification.expects(:latest_specs).with(true).returns([fake_gem])
37
+ expect(Gem::Specification).to receive(:latest_specs).with(true).and_return([fake_gem])
38
38
 
39
39
  expect(described_class.new.directories).to eq([gem_lib])
40
40
  end
41
41
 
42
42
  it "#clear_paths calls Gem.clear_paths" do
43
- Gem.expects(:clear_paths)
43
+ expect(Gem).to receive(:clear_paths)
44
44
  described_class.new.clear_paths
45
45
  end
46
46
  end
47
47
  end
48
-
@@ -1,8 +1,6 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  describe Puppet::Util::RunMode do
5
-
6
4
  # Discriminator for tests that attempts to unset HOME since that, for reasons currently unknown,
7
5
  # doesn't work in Ruby >= 2.4.0
8
6
  def self.gte_ruby_2_4
@@ -31,6 +29,7 @@ describe Puppet::Util::RunMode do
31
29
  before do
32
30
  @run_mode = Puppet::Util::UnixRunMode.new('master')
33
31
  end
32
+
34
33
  it "has confdir ~/.puppetlabs/etc/puppet when run as non-root and master run mode" do
35
34
  as_non_root { expect(@run_mode.conf_dir).to eq(File.expand_path('~/.puppetlabs/etc/puppet')) }
36
35
  end
@@ -295,12 +294,12 @@ describe Puppet::Util::RunMode do
295
294
  end
296
295
 
297
296
  def as_root
298
- Puppet.features.stubs(:root?).returns(true)
297
+ allow(Puppet.features).to receive(:root?).and_return(true)
299
298
  yield
300
299
  end
301
300
 
302
301
  def as_non_root
303
- Puppet.features.stubs(:root?).returns(false)
302
+ allow(Puppet.features).to receive(:root?).and_return(false)
304
303
  yield
305
304
  end
306
305
 
@@ -1,9 +1,7 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'pathname'
5
4
  require 'puppet/util/selinux'
6
- include Puppet::Util::SELinux
7
5
 
8
6
  unless defined?(Selinux)
9
7
  module Selinux
@@ -14,35 +12,42 @@ unless defined?(Selinux)
14
12
  end
15
13
 
16
14
  describe Puppet::Util::SELinux do
15
+ include Puppet::Util::SELinux
17
16
 
18
17
  describe "selinux_support?" do
19
- before do
20
- end
21
18
  it "should return :true if this system has SELinux enabled" do
22
- Selinux.expects(:is_selinux_enabled).returns 1
19
+ expect(Selinux).to receive(:is_selinux_enabled).and_return(1)
23
20
  expect(selinux_support?).to be_truthy
24
21
  end
25
22
 
26
23
  it "should return :false if this system lacks SELinux" do
27
- Selinux.expects(:is_selinux_enabled).returns 0
24
+ expect(Selinux).to receive(:is_selinux_enabled).and_return(0)
28
25
  expect(selinux_support?).to be_falsey
29
26
  end
30
27
 
31
28
  it "should return nil if /proc/mounts does not exist" do
32
- File.stubs(:open).with("/proc/mounts").raises("No such file or directory - /proc/mounts")
29
+ allow(File).to receive(:open).with("/proc/mounts").and_raise("No such file or directory - /proc/mounts")
33
30
  expect(read_mounts).to eq(nil)
34
31
  end
35
32
  end
36
33
 
37
34
  describe "read_mounts" do
38
35
  before :each do
39
- fh = stub 'fh', :close => nil
40
- File.stubs(:open).with("/proc/mounts").returns fh
41
- fh.expects(:read_nonblock).times(2).returns("rootfs / rootfs rw 0 0\n/dev/root / ext3 rw,relatime,errors=continue,user_xattr,acl,data=ordered 0 0\n/dev /dev tmpfs rw,relatime,mode=755 0 0\n/proc /proc proc rw,relatime 0 0\n/sys /sys sysfs rw,relatime 0 0\n192.168.1.1:/var/export /mnt/nfs nfs rw,relatime,vers=3,rsize=32768,wsize=32768,namlen=255,hard,nointr,proto=tcp,timeo=600,retrans=2,sec=sys,mountaddr=192.168.1.1,mountvers=3,mountproto=udp,addr=192.168.1.1 0 0\n").then.raises EOFError
36
+ fh = double('fh', :close => nil)
37
+ allow(File).to receive(:open).and_call_original()
38
+ allow(File).to receive(:open).with("/proc/mounts").and_return(fh)
39
+ times_fh_called = 0
40
+ expect(fh).to receive(:read_nonblock) do
41
+ times_fh_called += 1
42
+ raise EOFError if times_fh_called > 1
43
+
44
+ "rootfs / rootfs rw 0 0\n/dev/root / ext3 rw,relatime,errors=continue,user_xattr,acl,data=ordered 0 0\n/dev /dev tmpfs rw,relatime,mode=755 0 0\n/proc /proc proc rw,relatime 0 0\n/sys /sys sysfs rw,relatime 0 0\n192.168.1.1:/var/export /mnt/nfs nfs rw,relatime,vers=3,rsize=32768,wsize=32768,namlen=255,hard,nointr,proto=tcp,timeo=600,retrans=2,sec=sys,mountaddr=192.168.1.1,mountvers=3,mountproto=udp,addr=192.168.1.1 0 0\n"
45
+ end.twice()
42
46
  end
43
47
 
44
48
  it "should parse the contents of /proc/mounts" do
45
- expect(read_mounts).to eq({
49
+ result = read_mounts
50
+ expect(result).to eq({
46
51
  '/' => 'ext3',
47
52
  '/sys' => 'sysfs',
48
53
  '/mnt/nfs' => 'nfs',
@@ -53,7 +58,7 @@ describe Puppet::Util::SELinux do
53
58
 
54
59
  describe "filesystem detection" do
55
60
  before :each do
56
- self.stubs(:read_mounts).returns({
61
+ allow(self).to receive(:read_mounts).and_return({
57
62
  '/' => 'ext3',
58
63
  '/sys' => 'sysfs',
59
64
  '/mnt/nfs' => 'nfs',
@@ -84,10 +89,10 @@ describe Puppet::Util::SELinux do
84
89
  it "(#8714) don't follow symlinks when determining file systems", :unless => Puppet::Util::Platform.windows? do
85
90
  scratch = Pathname(PuppetSpec::Files.tmpdir('selinux'))
86
91
 
87
- self.stubs(:read_mounts).returns({
88
- '/' => 'ext3',
89
- scratch + 'nfs' => 'nfs',
90
- })
92
+ allow(self).to receive(:read_mounts).and_return({
93
+ '/' => 'ext3',
94
+ scratch + 'nfs' => 'nfs',
95
+ })
91
96
 
92
97
  (scratch + 'foo').make_symlink('nfs/bar')
93
98
  expect(selinux_label_support?(scratch + 'foo')).to be_truthy
@@ -101,73 +106,72 @@ describe Puppet::Util::SELinux do
101
106
 
102
107
  describe "get_selinux_current_context" do
103
108
  it "should return nil if no SELinux support" do
104
- self.expects(:selinux_support?).returns false
109
+ expect(self).to receive(:selinux_support?).and_return(false)
105
110
  expect(get_selinux_current_context("/foo")).to be_nil
106
111
  end
107
112
 
108
113
  it "should return a context" do
109
- self.expects(:selinux_support?).returns true
110
- Selinux.expects(:lgetfilecon).with("/foo").returns [0, "user_u:role_r:type_t:s0"]
114
+ expect(self).to receive(:selinux_support?).and_return(true)
115
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:role_r:type_t:s0"])
111
116
  expect(get_selinux_current_context("/foo")).to eq("user_u:role_r:type_t:s0")
112
117
  end
113
118
 
114
119
  it "should return nil if lgetfilecon fails" do
115
- self.expects(:selinux_support?).returns true
116
- Selinux.expects(:lgetfilecon).with("/foo").returns(-1)
120
+ expect(self).to receive(:selinux_support?).and_return(true)
121
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return(-1)
117
122
  expect(get_selinux_current_context("/foo")).to be_nil
118
123
  end
119
124
  end
120
125
 
121
126
  describe "get_selinux_default_context" do
122
127
  it "should return nil if no SELinux support" do
123
- self.expects(:selinux_support?).returns false
128
+ expect(self).to receive(:selinux_support?).and_return(false)
124
129
  expect(get_selinux_default_context("/foo")).to be_nil
125
130
  end
126
131
 
127
132
  it "should return a context if a default context exists" do
128
- self.expects(:selinux_support?).returns true
129
- fstat = stub 'File::Stat', :mode => 0
130
- Puppet::FileSystem.expects(:lstat).with('/foo').returns(fstat)
131
- self.expects(:find_fs).with("/foo").returns "ext3"
132
- Selinux.expects(:matchpathcon).with("/foo", 0).returns [0, "user_u:role_r:type_t:s0"]
133
+ expect(self).to receive(:selinux_support?).and_return(true)
134
+ fstat = double('File::Stat', :mode => 0)
135
+ expect(Puppet::FileSystem).to receive(:lstat).with('/foo').and_return(fstat)
136
+ expect(self).to receive(:find_fs).with("/foo").and_return("ext3")
137
+ expect(Selinux).to receive(:matchpathcon).with("/foo", 0).and_return([0, "user_u:role_r:type_t:s0"])
133
138
 
134
139
  expect(get_selinux_default_context("/foo")).to eq("user_u:role_r:type_t:s0")
135
140
  end
136
141
 
137
142
  it "handles permission denied errors by issuing a warning" do
138
- self.stubs(:selinux_support?).returns true
139
- self.stubs(:selinux_label_support?).returns true
140
- Selinux.stubs(:matchpathcon).with("/root/chuj", 0).returns(-1)
141
- self.stubs(:file_lstat).with("/root/chuj").raises(Errno::EACCES, "/root/chuj")
143
+ allow(self).to receive(:selinux_support?).and_return(true)
144
+ allow(self).to receive(:selinux_label_support?).and_return(true)
145
+ allow(Selinux).to receive(:matchpathcon).with("/root/chuj", 0).and_return(-1)
146
+ allow(self).to receive(:file_lstat).with("/root/chuj").and_raise(Errno::EACCES, "/root/chuj")
142
147
 
143
148
  expect(get_selinux_default_context("/root/chuj")).to be_nil
144
149
  end
145
150
 
146
151
  it "handles no such file or directory errors by issuing a warning" do
147
- self.stubs(:selinux_support?).returns true
148
- self.stubs(:selinux_label_support?).returns true
149
- Selinux.stubs(:matchpathcon).with("/root/chuj", 0).returns(-1)
150
- self.stubs(:file_lstat).with("/root/chuj").raises(Errno::ENOENT, "/root/chuj")
152
+ allow(self).to receive(:selinux_support?).and_return(true)
153
+ allow(self).to receive(:selinux_label_support?).and_return(true)
154
+ allow(Selinux).to receive(:matchpathcon).with("/root/chuj", 0).and_return(-1)
155
+ allow(self).to receive(:file_lstat).with("/root/chuj").and_raise(Errno::ENOENT, "/root/chuj")
151
156
 
152
157
  expect(get_selinux_default_context("/root/chuj")).to be_nil
153
158
  end
154
159
 
155
160
  it "should return nil if matchpathcon returns failure" do
156
- self.expects(:selinux_support?).returns true
157
- fstat = stub 'File::Stat', :mode => 0
158
- Puppet::FileSystem.expects(:lstat).with('/foo').returns(fstat)
159
- self.expects(:find_fs).with("/foo").returns "ext3"
160
- Selinux.expects(:matchpathcon).with("/foo", 0).returns(-1)
161
+ expect(self).to receive(:selinux_support?).and_return(true)
162
+ fstat = double('File::Stat', :mode => 0)
163
+ expect(Puppet::FileSystem).to receive(:lstat).with('/foo').and_return(fstat)
164
+ expect(self).to receive(:find_fs).with("/foo").and_return("ext3")
165
+ expect(Selinux).to receive(:matchpathcon).with("/foo", 0).and_return(-1)
161
166
 
162
167
  expect(get_selinux_default_context("/foo")).to be_nil
163
168
  end
164
169
 
165
170
  it "should return nil if selinux_label_support returns false" do
166
- self.expects(:selinux_support?).returns true
167
- self.expects(:find_fs).with("/foo").returns "nfs"
171
+ expect(self).to receive(:selinux_support?).and_return(true)
172
+ expect(self).to receive(:find_fs).with("/foo").and_return("nfs")
168
173
  expect(get_selinux_default_context("/foo")).to be_nil
169
174
  end
170
-
171
175
  end
172
176
 
173
177
  describe "parse_selinux_context" do
@@ -232,84 +236,87 @@ describe Puppet::Util::SELinux do
232
236
 
233
237
  describe "set_selinux_context" do
234
238
  before :each do
235
- fh = stub 'fh', :close => nil
236
- File.stubs(:open).with("/proc/mounts").returns fh
237
- fh.stubs(:read_nonblock).returns(
239
+ fh = double('fh', :close => nil)
240
+ allow(File).to receive(:open).with("/proc/mounts").and_return(fh)
241
+ times_fh_called = 0
242
+ allow(fh).to receive(:read_nonblock) do
243
+ times_fh_called += 1
244
+ raise EOFError if times_fh_called > 1
245
+
238
246
  "rootfs / rootfs rw 0 0\n/dev/root / ext3 rw,relatime,errors=continue,user_xattr,acl,data=ordered 0 0\n"+
239
247
  "/dev /dev tmpfs rw,relatime,mode=755 0 0\n/proc /proc proc rw,relatime 0 0\n"+
240
248
  "/sys /sys sysfs rw,relatime 0 0\n"
241
- ).then.raises EOFError
249
+ end
242
250
  end
243
251
 
244
252
  it "should return nil if there is no SELinux support" do
245
- self.expects(:selinux_support?).returns false
253
+ expect(self).to receive(:selinux_support?).and_return(false)
246
254
  expect(set_selinux_context("/foo", "user_u:role_r:type_t:s0")).to be_nil
247
255
  end
248
256
 
249
257
  it "should return nil if selinux_label_support returns false" do
250
- self.expects(:selinux_support?).returns true
251
- self.expects(:selinux_label_support?).with("/foo").returns false
258
+ expect(self).to receive(:selinux_support?).and_return(true)
259
+ expect(self).to receive(:selinux_label_support?).with("/foo").and_return(false)
252
260
  expect(set_selinux_context("/foo", "user_u:role_r:type_t:s0")).to be_nil
253
261
  end
254
262
 
255
263
  it "should use lsetfilecon to set a context" do
256
- self.expects(:selinux_support?).returns true
257
- Selinux.expects(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").returns 0
264
+ expect(self).to receive(:selinux_support?).and_return(true)
265
+ expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
258
266
  expect(set_selinux_context("/foo", "user_u:role_r:type_t:s0")).to be_truthy
259
267
  end
260
268
 
261
269
  it "should use lsetfilecon to set user_u user context" do
262
- self.expects(:selinux_support?).returns true
263
- Selinux.expects(:lgetfilecon).with("/foo").returns [0, "foo:role_r:type_t:s0"]
264
- Selinux.expects(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").returns 0
270
+ expect(self).to receive(:selinux_support?).and_return(true)
271
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "foo:role_r:type_t:s0"])
272
+ expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
265
273
  expect(set_selinux_context("/foo", "user_u", :seluser)).to be_truthy
266
274
  end
267
275
 
268
276
  it "should use lsetfilecon to set role_r role context" do
269
- self.expects(:selinux_support?).returns true
270
- Selinux.expects(:lgetfilecon).with("/foo").returns [0, "user_u:foo:type_t:s0"]
271
- Selinux.expects(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").returns 0
277
+ expect(self).to receive(:selinux_support?).and_return(true)
278
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:foo:type_t:s0"])
279
+ expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
272
280
  expect(set_selinux_context("/foo", "role_r", :selrole)).to be_truthy
273
281
  end
274
282
 
275
283
  it "should use lsetfilecon to set type_t type context" do
276
- self.expects(:selinux_support?).returns true
277
- Selinux.expects(:lgetfilecon).with("/foo").returns [0, "user_u:role_r:foo:s0"]
278
- Selinux.expects(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").returns 0
284
+ expect(self).to receive(:selinux_support?).and_return(true)
285
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:role_r:foo:s0"])
286
+ expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
279
287
  expect(set_selinux_context("/foo", "type_t", :seltype)).to be_truthy
280
288
  end
281
289
 
282
290
  it "should use lsetfilecon to set s0:c3,c5 range context" do
283
- self.expects(:selinux_support?).returns true
284
- Selinux.expects(:lgetfilecon).with("/foo").returns [0, "user_u:role_r:type_t:s0"]
285
- Selinux.expects(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0:c3,c5").returns 0
291
+ expect(self).to receive(:selinux_support?).and_return(true)
292
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:role_r:type_t:s0"])
293
+ expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0:c3,c5").and_return(0)
286
294
  expect(set_selinux_context("/foo", "s0:c3,c5", :selrange)).to be_truthy
287
295
  end
288
296
  end
289
297
 
290
298
  describe "set_selinux_default_context" do
291
299
  it "should return nil if there is no SELinux support" do
292
- self.expects(:selinux_support?).returns false
300
+ expect(self).to receive(:selinux_support?).and_return(false)
293
301
  expect(set_selinux_default_context("/foo")).to be_nil
294
302
  end
295
303
 
296
304
  it "should return nil if no default context exists" do
297
- self.expects(:get_selinux_default_context).with("/foo").returns nil
305
+ expect(self).to receive(:get_selinux_default_context).with("/foo").and_return(nil)
298
306
  expect(set_selinux_default_context("/foo")).to be_nil
299
307
  end
300
308
 
301
309
  it "should do nothing and return nil if the current context matches the default context" do
302
- self.expects(:get_selinux_default_context).with("/foo").returns "user_u:role_r:type_t"
303
- self.expects(:get_selinux_current_context).with("/foo").returns "user_u:role_r:type_t"
310
+ expect(self).to receive(:get_selinux_default_context).with("/foo").and_return("user_u:role_r:type_t")
311
+ expect(self).to receive(:get_selinux_current_context).with("/foo").and_return("user_u:role_r:type_t")
304
312
  expect(set_selinux_default_context("/foo")).to be_nil
305
313
  end
306
314
 
307
315
  it "should set and return the default context if current and default do not match" do
308
- self.expects(:get_selinux_default_context).with("/foo").returns "user_u:role_r:type_t"
309
- self.expects(:get_selinux_current_context).with("/foo").returns "olduser_u:role_r:type_t"
310
- self.expects(:set_selinux_context).with("/foo", "user_u:role_r:type_t").returns true
316
+ expect(self).to receive(:get_selinux_default_context).with("/foo").and_return("user_u:role_r:type_t")
317
+ expect(self).to receive(:get_selinux_current_context).with("/foo").and_return("olduser_u:role_r:type_t")
318
+ expect(self).to receive(:set_selinux_context).with("/foo", "user_u:role_r:type_t").and_return(true)
311
319
  expect(set_selinux_default_context("/foo")).to eq("user_u:role_r:type_t")
312
320
  end
313
321
  end
314
-
315
322
  end