puppet 5.5.12-x86-mingw32 → 5.5.13-x86-mingw32

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

Potentially problematic release.


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

Files changed (733) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -5
  3. data/Gemfile.lock +11 -11
  4. data/lib/puppet/application/filebucket.rb +4 -0
  5. data/lib/puppet/configurer.rb +9 -3
  6. data/lib/puppet/indirector/request.rb +26 -15
  7. data/lib/puppet/indirector/rest.rb +16 -7
  8. data/lib/puppet/network/http/connection.rb +15 -7
  9. data/lib/puppet/transaction/event_manager.rb +1 -5
  10. data/lib/puppet/type/file/source.rb +0 -1
  11. data/lib/puppet/util/http_proxy.rb +3 -2
  12. data/lib/puppet/version.rb +1 -1
  13. data/locales/puppet.pot +108 -36
  14. data/man/man5/puppet.conf.5 +2 -2
  15. data/man/man8/puppet-agent.8 +1 -1
  16. data/man/man8/puppet-apply.8 +1 -1
  17. data/man/man8/puppet-ca.8 +1 -1
  18. data/man/man8/puppet-catalog.8 +1 -1
  19. data/man/man8/puppet-cert.8 +1 -1
  20. data/man/man8/puppet-certificate.8 +1 -1
  21. data/man/man8/puppet-certificate_request.8 +1 -1
  22. data/man/man8/puppet-certificate_revocation_list.8 +1 -1
  23. data/man/man8/puppet-config.8 +1 -1
  24. data/man/man8/puppet-describe.8 +1 -1
  25. data/man/man8/puppet-device.8 +1 -1
  26. data/man/man8/puppet-doc.8 +1 -1
  27. data/man/man8/puppet-epp.8 +1 -1
  28. data/man/man8/puppet-facts.8 +1 -1
  29. data/man/man8/puppet-filebucket.8 +1 -1
  30. data/man/man8/puppet-generate.8 +1 -1
  31. data/man/man8/puppet-help.8 +1 -1
  32. data/man/man8/puppet-key.8 +1 -1
  33. data/man/man8/puppet-lookup.8 +1 -1
  34. data/man/man8/puppet-man.8 +1 -1
  35. data/man/man8/puppet-master.8 +1 -1
  36. data/man/man8/puppet-module.8 +1 -1
  37. data/man/man8/puppet-node.8 +1 -1
  38. data/man/man8/puppet-parser.8 +1 -1
  39. data/man/man8/puppet-plugin.8 +1 -1
  40. data/man/man8/puppet-report.8 +1 -1
  41. data/man/man8/puppet-resource.8 +1 -1
  42. data/man/man8/puppet-script.8 +1 -1
  43. data/man/man8/puppet-status.8 +1 -1
  44. data/man/man8/puppet.8 +2 -2
  45. data/spec/integration/agent/logging_spec.rb +5 -7
  46. data/spec/integration/application/apply_spec.rb +28 -26
  47. data/spec/integration/application/doc_spec.rb +1 -2
  48. data/spec/integration/application/lookup_spec.rb +5 -5
  49. data/spec/integration/configurer_spec.rb +5 -6
  50. data/spec/integration/defaults_spec.rb +5 -6
  51. data/spec/integration/directory_environments_spec.rb +1 -1
  52. data/spec/integration/faces/ca_spec.rb +2 -3
  53. data/spec/integration/faces/config_spec.rb +3 -4
  54. data/spec/integration/faces/documentation_spec.rb +0 -1
  55. data/spec/integration/faces/plugin_spec.rb +1 -1
  56. data/spec/integration/file_bucket/file_spec.rb +3 -5
  57. data/spec/integration/file_serving/content_spec.rb +0 -1
  58. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  59. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  60. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  61. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  62. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  63. data/spec/integration/indirector/facts/facter_spec.rb +5 -5
  64. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  65. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  66. data/spec/integration/indirector/node/ldap_spec.rb +2 -3
  67. data/spec/integration/network/authconfig_spec.rb +23 -24
  68. data/spec/integration/network/formats_spec.rb +0 -1
  69. data/spec/integration/network/http/api/indirected_routes_spec.rb +0 -1
  70. data/spec/integration/node/environment_spec.rb +0 -1
  71. data/spec/integration/node/facts_spec.rb +9 -10
  72. data/spec/integration/node_spec.rb +6 -7
  73. data/spec/integration/parser/catalog_spec.rb +4 -2
  74. data/spec/integration/parser/collection_spec.rb +1 -2
  75. data/spec/integration/parser/compiler_spec.rb +6 -6
  76. data/spec/integration/parser/scope_spec.rb +1 -1
  77. data/spec/integration/parser/undef_param_spec.rb +1 -1
  78. data/spec/integration/provider/cron/crontab_spec.rb +8 -10
  79. data/spec/integration/provider/mailalias/aliases_spec.rb +0 -1
  80. data/spec/integration/provider/mount_spec.rb +9 -9
  81. data/spec/integration/provider/service/init_spec.rb +4 -5
  82. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  83. data/spec/integration/provider/service/windows_spec.rb +1 -2
  84. data/spec/integration/provider/ssh_authorized_key_spec.rb +6 -8
  85. data/spec/integration/provider/sshkey_spec.rb +6 -12
  86. data/spec/integration/provider/yumrepo_spec.rb +8 -12
  87. data/spec/integration/reference/providers_spec.rb +0 -1
  88. data/spec/integration/reports_spec.rb +1 -2
  89. data/spec/integration/resource/catalog_spec.rb +14 -17
  90. data/spec/integration/resource/type_collection_spec.rb +4 -5
  91. data/spec/integration/ssl/certificate_authority_spec.rb +0 -1
  92. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  93. data/spec/integration/ssl/certificate_revocation_list_spec.rb +0 -1
  94. data/spec/integration/ssl/host_spec.rb +0 -1
  95. data/spec/integration/ssl/key_spec.rb +0 -1
  96. data/spec/integration/test/test_helper_spec.rb +1 -2
  97. data/spec/integration/transaction/report_spec.rb +6 -11
  98. data/spec/integration/transaction_spec.rb +18 -19
  99. data/spec/integration/type/exec_spec.rb +0 -1
  100. data/spec/integration/type/file_spec.rb +13 -14
  101. data/spec/integration/type/nagios_spec.rb +3 -5
  102. data/spec/integration/type/package_spec.rb +19 -23
  103. data/spec/integration/type/tidy_spec.rb +1 -2
  104. data/spec/integration/type/user_spec.rb +0 -1
  105. data/spec/integration/type_spec.rb +0 -1
  106. data/spec/integration/util/autoload_spec.rb +1 -2
  107. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  108. data/spec/integration/util/settings_spec.rb +0 -1
  109. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  110. data/spec/integration/util/windows/principal_spec.rb +0 -1
  111. data/spec/integration/util/windows/process_spec.rb +4 -6
  112. data/spec/integration/util/windows/registry_spec.rb +41 -51
  113. data/spec/integration/util/windows/security_spec.rb +2 -4
  114. data/spec/integration/util/windows/user_spec.rb +18 -20
  115. data/spec/integration/util_spec.rb +4 -7
  116. data/spec/lib/puppet_spec/compiler.rb +1 -1
  117. data/spec/lib/puppet_spec/files.rb +0 -1
  118. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  119. data/spec/lib/puppet_spec/scope.rb +1 -2
  120. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  121. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  122. data/spec/shared_behaviours/file_serving.rb +6 -8
  123. data/spec/shared_behaviours/file_serving_model.rb +4 -6
  124. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  125. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  126. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  127. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  128. data/spec/spec_helper.rb +11 -2
  129. data/spec/unit/agent/disabler_spec.rb +4 -5
  130. data/spec/unit/agent/locker_spec.rb +12 -13
  131. data/spec/unit/agent_spec.rb +80 -85
  132. data/spec/unit/application/agent_spec.rb +88 -93
  133. data/spec/unit/application/apply_spec.rb +78 -79
  134. data/spec/unit/application/cert_spec.rb +42 -49
  135. data/spec/unit/application/certificate_spec.rb +2 -3
  136. data/spec/unit/application/config_spec.rb +0 -1
  137. data/spec/unit/application/describe_spec.rb +6 -7
  138. data/spec/unit/application/device_spec.rb +175 -184
  139. data/spec/unit/application/doc_spec.rb +44 -46
  140. data/spec/unit/application/face_base_spec.rb +61 -62
  141. data/spec/unit/application/facts_spec.rb +3 -4
  142. data/spec/unit/application/filebucket_spec.rb +66 -74
  143. data/spec/unit/application/indirection_base_spec.rb +8 -6
  144. data/spec/unit/application/lookup_spec.rb +26 -26
  145. data/spec/unit/application/master_spec.rb +95 -95
  146. data/spec/unit/application/resource_spec.rb +42 -48
  147. data/spec/unit/application_spec.rb +74 -84
  148. data/spec/unit/capability_spec.rb +9 -6
  149. data/spec/unit/configurer/downloader_spec.rb +20 -21
  150. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  151. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  152. data/spec/unit/configurer_spec.rb +190 -193
  153. data/spec/unit/confine/exists_spec.rb +17 -15
  154. data/spec/unit/confine/false_spec.rb +5 -6
  155. data/spec/unit/confine/feature_spec.rb +7 -5
  156. data/spec/unit/confine/true_spec.rb +5 -6
  157. data/spec/unit/confine/variable_spec.rb +14 -15
  158. data/spec/unit/confine_collection_spec.rb +28 -29
  159. data/spec/unit/confine_spec.rb +13 -14
  160. data/spec/unit/confiner_spec.rb +10 -11
  161. data/spec/unit/context/trusted_information_spec.rb +1 -1
  162. data/spec/unit/daemon_spec.rb +34 -35
  163. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  164. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  165. data/spec/unit/datatypes_spec.rb +3 -4
  166. data/spec/unit/defaults_spec.rb +17 -12
  167. data/spec/unit/environments_spec.rb +7 -7
  168. data/spec/unit/etc_spec.rb +30 -32
  169. data/spec/unit/external/pson_spec.rb +0 -1
  170. data/spec/unit/face/ca_spec.rb +0 -1
  171. data/spec/unit/face/catalog_spec.rb +0 -1
  172. data/spec/unit/face/certificate_request_spec.rb +0 -1
  173. data/spec/unit/face/certificate_revocation_list_spec.rb +0 -1
  174. data/spec/unit/face/certificate_spec.rb +7 -10
  175. data/spec/unit/face/config_spec.rb +31 -35
  176. data/spec/unit/face/epp_face_spec.rb +3 -4
  177. data/spec/unit/face/facts_spec.rb +5 -6
  178. data/spec/unit/face/generate_spec.rb +4 -5
  179. data/spec/unit/face/help_spec.rb +7 -8
  180. data/spec/unit/face/key_spec.rb +0 -1
  181. data/spec/unit/face/man_spec.rb +1 -2
  182. data/spec/unit/face/module/build_spec.rb +17 -17
  183. data/spec/unit/face/module/install_spec.rb +3 -5
  184. data/spec/unit/face/module/list_spec.rb +2 -12
  185. data/spec/unit/face/module/search_spec.rb +11 -9
  186. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  187. data/spec/unit/face/node_spec.rb +33 -34
  188. data/spec/unit/face/parser_spec.rb +3 -3
  189. data/spec/unit/face/plugin_spec.rb +36 -9
  190. data/spec/unit/face/status_spec.rb +0 -1
  191. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  192. data/spec/unit/file_bucket/file_spec.rb +0 -2
  193. data/spec/unit/file_serving/base_spec.rb +16 -17
  194. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  195. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  196. data/spec/unit/file_serving/content_spec.rb +10 -11
  197. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  198. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  199. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  200. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  201. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  202. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  203. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  204. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  205. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  206. data/spec/unit/file_serving/mount_spec.rb +0 -1
  207. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  208. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  209. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  210. data/spec/unit/file_system_spec.rb +2 -2
  211. data/spec/unit/forge/errors_spec.rb +1 -1
  212. data/spec/unit/forge/forge_spec.rb +13 -14
  213. data/spec/unit/forge/module_release_spec.rb +18 -18
  214. data/spec/unit/forge/repository_spec.rb +29 -30
  215. data/spec/unit/forge_spec.rb +15 -11
  216. data/spec/unit/functions/binary_file_spec.rb +3 -3
  217. data/spec/unit/functions/contain_spec.rb +0 -2
  218. data/spec/unit/functions/defined_spec.rb +0 -1
  219. data/spec/unit/functions/epp_spec.rb +2 -2
  220. data/spec/unit/functions/find_file_spec.rb +7 -7
  221. data/spec/unit/functions/include_spec.rb +0 -4
  222. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  223. data/spec/unit/functions/lookup_spec.rb +1 -2
  224. data/spec/unit/functions/module_directory_spec.rb +12 -12
  225. data/spec/unit/functions/require_spec.rb +0 -3
  226. data/spec/unit/functions/shared.rb +5 -8
  227. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  228. data/spec/unit/functions4_spec.rb +7 -8
  229. data/spec/unit/gettext/config_spec.rb +4 -4
  230. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  231. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  232. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  233. data/spec/unit/graph/simple_graph_spec.rb +8 -9
  234. data/spec/unit/hiera_puppet_spec.rb +20 -20
  235. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  236. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  237. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  238. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  239. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  240. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  241. data/spec/unit/indirector/certificate/ca_spec.rb +2 -4
  242. data/spec/unit/indirector/certificate/disabled_ca_spec.rb +1 -2
  243. data/spec/unit/indirector/certificate/file_spec.rb +2 -3
  244. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  245. data/spec/unit/indirector/certificate_request/ca_spec.rb +0 -1
  246. data/spec/unit/indirector/certificate_request/disabled_ca_spec.rb +1 -2
  247. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  248. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  249. data/spec/unit/indirector/certificate_revocation_list/ca_spec.rb +1 -2
  250. data/spec/unit/indirector/certificate_revocation_list/disabled_ca_spec.rb +1 -2
  251. data/spec/unit/indirector/certificate_revocation_list/file_spec.rb +1 -2
  252. data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +2 -3
  253. data/spec/unit/indirector/certificate_status/file_spec.rb +2 -3
  254. data/spec/unit/indirector/certificate_status/rest_spec.rb +0 -1
  255. data/spec/unit/indirector/code_spec.rb +5 -6
  256. data/spec/unit/indirector/direct_file_server_spec.rb +33 -27
  257. data/spec/unit/indirector/envelope_spec.rb +1 -2
  258. data/spec/unit/indirector/exec_spec.rb +15 -14
  259. data/spec/unit/indirector/face_spec.rb +9 -9
  260. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  261. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  262. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  263. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  264. data/spec/unit/indirector/facts/yaml_spec.rb +2 -4
  265. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  266. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  267. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  268. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  269. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  270. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  271. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  272. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  273. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  274. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  275. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  276. data/spec/unit/indirector/file_server_spec.rb +99 -93
  277. data/spec/unit/indirector/indirection_spec.rb +242 -226
  278. data/spec/unit/indirector/json_spec.rb +7 -9
  279. data/spec/unit/indirector/key/ca_spec.rb +2 -3
  280. data/spec/unit/indirector/key/disabled_ca_spec.rb +1 -2
  281. data/spec/unit/indirector/key/file_spec.rb +25 -26
  282. data/spec/unit/indirector/ldap_spec.rb +34 -41
  283. data/spec/unit/indirector/memory_spec.rb +6 -7
  284. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  285. data/spec/unit/indirector/node/exec_spec.rb +6 -6
  286. data/spec/unit/indirector/node/ldap_spec.rb +74 -76
  287. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  288. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  289. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  290. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  291. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  292. data/spec/unit/indirector/node/write_only_yaml_spec.rb +1 -2
  293. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  294. data/spec/unit/indirector/none_spec.rb +5 -5
  295. data/spec/unit/indirector/plain_spec.rb +7 -8
  296. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  297. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  298. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  299. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  300. data/spec/unit/indirector/request_spec.rb +11 -12
  301. data/spec/unit/indirector/resource/ral_spec.rb +47 -54
  302. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  303. data/spec/unit/indirector/rest_spec.rb +113 -110
  304. data/spec/unit/indirector/ssl_file_spec.rb +74 -77
  305. data/spec/unit/indirector/status/local_spec.rb +0 -1
  306. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  307. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  308. data/spec/unit/indirector/terminus_spec.rb +31 -29
  309. data/spec/unit/indirector/yaml_spec.rb +33 -32
  310. data/spec/unit/indirector_spec.rb +1 -2
  311. data/spec/unit/info_service_spec.rb +3 -1
  312. data/spec/unit/interface/action_builder_spec.rb +0 -1
  313. data/spec/unit/interface/action_manager_spec.rb +0 -1
  314. data/spec/unit/interface/action_spec.rb +2 -3
  315. data/spec/unit/interface/documentation_spec.rb +0 -1
  316. data/spec/unit/interface/face_collection_spec.rb +19 -12
  317. data/spec/unit/interface_spec.rb +3 -3
  318. data/spec/unit/man_spec.rb +3 -4
  319. data/spec/unit/module_spec.rb +46 -51
  320. data/spec/unit/module_tool/applications/builder_spec.rb +5 -5
  321. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  322. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  323. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  324. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  325. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  326. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  327. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  328. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  329. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  330. data/spec/unit/module_tool/tar_spec.rb +12 -13
  331. data/spec/unit/module_tool_spec.rb +7 -12
  332. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  333. data/spec/unit/network/authconfig_spec.rb +17 -18
  334. data/spec/unit/network/authorization_spec.rb +4 -5
  335. data/spec/unit/network/authstore_spec.rb +0 -1
  336. data/spec/unit/network/format_handler_spec.rb +0 -1
  337. data/spec/unit/network/format_spec.rb +9 -10
  338. data/spec/unit/network/format_support_spec.rb +28 -29
  339. data/spec/unit/network/formats_spec.rb +4 -5
  340. data/spec/unit/network/http/api/ca/v1_spec.rb +1 -1
  341. data/spec/unit/network/http/api/indirected_routes_spec.rb +22 -29
  342. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  343. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  344. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  345. data/spec/unit/network/http/api_spec.rb +1 -3
  346. data/spec/unit/network/http/compression_spec.rb +21 -22
  347. data/spec/unit/network/http/connection_spec.rb +39 -36
  348. data/spec/unit/network/http/factory_spec.rb +5 -6
  349. data/spec/unit/network/http/handler_spec.rb +9 -18
  350. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  351. data/spec/unit/network/http/pool_spec.rb +28 -29
  352. data/spec/unit/network/http/rack/rest_spec.rb +24 -27
  353. data/spec/unit/network/http/rack_spec.rb +5 -6
  354. data/spec/unit/network/http/request_spec.rb +0 -2
  355. data/spec/unit/network/http/response_spec.rb +11 -13
  356. data/spec/unit/network/http/route_spec.rb +0 -1
  357. data/spec/unit/network/http/session_spec.rb +1 -2
  358. data/spec/unit/network/http/site_spec.rb +0 -1
  359. data/spec/unit/network/http/webrick/rest_spec.rb +40 -41
  360. data/spec/unit/network/http/webrick_spec.rb +49 -52
  361. data/spec/unit/network/http_pool_spec.rb +18 -9
  362. data/spec/unit/network/http_spec.rb +0 -1
  363. data/spec/unit/network/resolver_spec.rb +16 -17
  364. data/spec/unit/network/rights_spec.rb +52 -53
  365. data/spec/unit/network/server_spec.rb +12 -13
  366. data/spec/unit/node/environment_spec.rb +16 -14
  367. data/spec/unit/node/facts_spec.rb +5 -7
  368. data/spec/unit/node_spec.rb +4 -10
  369. data/spec/unit/other/selinux_spec.rb +2 -3
  370. data/spec/unit/parameter/boolean_spec.rb +1 -2
  371. data/spec/unit/parameter/package_options_spec.rb +1 -2
  372. data/spec/unit/parameter/path_spec.rb +0 -1
  373. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  374. data/spec/unit/parameter/value_spec.rb +0 -1
  375. data/spec/unit/parameter_spec.rb +9 -9
  376. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  377. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  378. data/spec/unit/parser/compiler_spec.rb +84 -96
  379. data/spec/unit/parser/environment_compiler_spec.rb +11 -9
  380. data/spec/unit/parser/files_spec.rb +0 -1
  381. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  382. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  383. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  384. data/spec/unit/parser/functions/file_spec.rb +13 -14
  385. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  386. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  387. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  388. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  389. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  390. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  391. data/spec/unit/parser/functions/split_spec.rb +0 -1
  392. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  393. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  394. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  395. data/spec/unit/parser/functions/template_spec.rb +13 -13
  396. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  397. data/spec/unit/parser/functions_spec.rb +3 -4
  398. data/spec/unit/parser/relationship_spec.rb +0 -1
  399. data/spec/unit/parser/resource_spec.rb +42 -42
  400. data/spec/unit/parser/scope_spec.rb +39 -35
  401. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  402. data/spec/unit/parser/type_loader_spec.rb +17 -19
  403. data/spec/unit/pops/adaptable_spec.rb +0 -1
  404. data/spec/unit/pops/benchmark_spec.rb +0 -1
  405. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  406. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  407. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  408. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  409. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  410. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  411. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +6 -6
  412. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  413. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  414. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  415. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  416. data/spec/unit/pops/factory_spec.rb +3 -4
  417. data/spec/unit/pops/issues_spec.rb +19 -20
  418. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  419. data/spec/unit/pops/loaders/loaders_spec.rb +30 -27
  420. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  421. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  422. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  423. data/spec/unit/pops/migration_spec.rb +3 -5
  424. data/spec/unit/pops/model/model_spec.rb +0 -1
  425. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  426. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  427. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  428. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  429. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  430. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  431. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  432. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  433. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  434. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  435. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  436. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  437. data/spec/unit/pops/pn_spec.rb +0 -1
  438. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  439. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  440. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  441. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  442. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  443. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  444. data/spec/unit/pops/types/type_calculator_spec.rb +36 -36
  445. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  446. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  447. data/spec/unit/pops/visitor_spec.rb +0 -1
  448. data/spec/unit/property/boolean_spec.rb +1 -1
  449. data/spec/unit/property/ensure_spec.rb +0 -1
  450. data/spec/unit/property/keyvalue_spec.rb +32 -34
  451. data/spec/unit/property/list_spec.rb +26 -27
  452. data/spec/unit/property/ordered_list_spec.rb +10 -14
  453. data/spec/unit/property_spec.rb +42 -43
  454. data/spec/unit/provider/aix_object_spec.rb +47 -45
  455. data/spec/unit/provider/augeas/augeas_spec.rb +192 -192
  456. data/spec/unit/provider/cisco_spec.rb +1 -2
  457. data/spec/unit/provider/command_spec.rb +9 -9
  458. data/spec/unit/provider/cron/crontab_spec.rb +10 -11
  459. data/spec/unit/provider/cron/parsed_spec.rb +22 -24
  460. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  461. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  462. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  463. data/spec/unit/provider/exec_spec.rb +0 -1
  464. data/spec/unit/provider/file/posix_spec.rb +22 -24
  465. data/spec/unit/provider/file/windows_spec.rb +15 -17
  466. data/spec/unit/provider/group/aix_spec.rb +3 -2
  467. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  468. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  469. data/spec/unit/provider/group/pw_spec.rb +11 -11
  470. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  471. data/spec/unit/provider/host/parsed_spec.rb +6 -6
  472. data/spec/unit/provider/interface/cisco_spec.rb +20 -24
  473. data/spec/unit/provider/ldap_spec.rb +61 -62
  474. data/spec/unit/provider/macauthorization_spec.rb +26 -47
  475. data/spec/unit/provider/mcx/mcxcontent_spec.rb +45 -47
  476. data/spec/unit/provider/mount/parsed_spec.rb +18 -24
  477. data/spec/unit/provider/mount_spec.rb +57 -66
  478. data/spec/unit/provider/naginator_spec.rb +13 -14
  479. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  480. data/spec/unit/provider/nameservice_spec.rb +38 -40
  481. data/spec/unit/provider/network_device_spec.rb +28 -28
  482. data/spec/unit/provider/package/aix_spec.rb +15 -15
  483. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  484. data/spec/unit/provider/package/apt_spec.rb +44 -27
  485. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  486. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  487. data/spec/unit/provider/package/base_spec.rb +4 -4
  488. data/spec/unit/provider/package/dnf_spec.rb +14 -16
  489. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  490. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  491. data/spec/unit/provider/package/gem_spec.rb +51 -43
  492. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  493. data/spec/unit/provider/package/macports_spec.rb +46 -42
  494. data/spec/unit/provider/package/nim_spec.rb +30 -39
  495. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  496. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  497. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  498. data/spec/unit/provider/package/pip_spec.rb +69 -71
  499. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  500. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  501. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  502. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  503. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  504. data/spec/unit/provider/package/portage_spec.rb +70 -74
  505. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  506. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  507. data/spec/unit/provider/package/sun_spec.rb +16 -18
  508. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  509. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  510. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  511. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  512. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  513. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  514. data/spec/unit/provider/package/windows_spec.rb +36 -32
  515. data/spec/unit/provider/package/yum_spec.rb +4 -4
  516. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  517. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  518. data/spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb +120 -130
  519. data/spec/unit/provider/selboolean_spec.rb +9 -11
  520. data/spec/unit/provider/selmodule_spec.rb +20 -22
  521. data/spec/unit/provider/service/base_spec.rb +4 -5
  522. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  523. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  524. data/spec/unit/provider/service/debian_spec.rb +37 -37
  525. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  526. data/spec/unit/provider/service/gentoo_spec.rb +50 -56
  527. data/spec/unit/provider/service/init_spec.rb +55 -55
  528. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  529. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  530. data/spec/unit/provider/service/openrc_spec.rb +43 -46
  531. data/spec/unit/provider/service/openwrt_spec.rb +26 -32
  532. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  533. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  534. data/spec/unit/provider/service/runit_spec.rb +29 -27
  535. data/spec/unit/provider/service/smf_spec.rb +74 -66
  536. data/spec/unit/provider/service/src_spec.rb +46 -47
  537. data/spec/unit/provider/service/systemd_spec.rb +93 -98
  538. data/spec/unit/provider/service/upstart_spec.rb +74 -72
  539. data/spec/unit/provider/service/windows_spec.rb +33 -41
  540. data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +54 -68
  541. data/spec/unit/provider/sshkey/parsed_spec.rb +7 -8
  542. data/spec/unit/provider/user/aix_spec.rb +31 -31
  543. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  544. data/spec/unit/provider/user/hpux_spec.rb +15 -15
  545. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  546. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  547. data/spec/unit/provider/user/pw_spec.rb +37 -35
  548. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  549. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  550. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  551. data/spec/unit/provider/vlan/cisco_spec.rb +10 -12
  552. data/spec/unit/provider/yumrepo/inifile_spec.rb +75 -80
  553. data/spec/unit/provider/zfs/zfs_spec.rb +26 -21
  554. data/spec/unit/provider/zone/solaris_spec.rb +56 -42
  555. data/spec/unit/provider/zpool/zpool_spec.rb +19 -20
  556. data/spec/unit/provider_spec.rb +29 -29
  557. data/spec/unit/puppet_pal_2pec.rb +4 -5
  558. data/spec/unit/puppet_pal_spec.rb +0 -1
  559. data/spec/unit/puppet_spec.rb +7 -8
  560. data/spec/unit/relationship_spec.rb +0 -1
  561. data/spec/unit/reports/http_spec.rb +21 -23
  562. data/spec/unit/reports/store_spec.rb +3 -4
  563. data/spec/unit/reports_spec.rb +12 -14
  564. data/spec/unit/resource/capability_finder_spec.rb +18 -16
  565. data/spec/unit/resource/catalog_spec.rb +72 -68
  566. data/spec/unit/resource/status_spec.rb +6 -8
  567. data/spec/unit/resource/type_collection_spec.rb +17 -18
  568. data/spec/unit/resource/type_spec.rb +34 -35
  569. data/spec/unit/resource_spec.rb +36 -32
  570. data/spec/unit/scheduler/job_spec.rb +0 -1
  571. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  572. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  573. data/spec/unit/settings/array_setting_spec.rb +1 -1
  574. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  575. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  576. data/spec/unit/settings/config_file_spec.rb +0 -1
  577. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  578. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  579. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  580. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  581. data/spec/unit/settings/file_setting_spec.rb +44 -46
  582. data/spec/unit/settings/path_setting_spec.rb +1 -2
  583. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  584. data/spec/unit/settings/string_setting_spec.rb +14 -15
  585. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  586. data/spec/unit/settings/value_translator_spec.rb +0 -1
  587. data/spec/unit/settings_spec.rb +226 -233
  588. data/spec/unit/ssl/base_spec.rb +14 -15
  589. data/spec/unit/ssl/certificate_authority/autosign_command_spec.rb +6 -7
  590. data/spec/unit/ssl/certificate_authority/interface_spec.rb +116 -113
  591. data/spec/unit/ssl/certificate_authority_spec.rb +258 -268
  592. data/spec/unit/ssl/certificate_factory_spec.rb +3 -5
  593. data/spec/unit/ssl/certificate_request_attributes_spec.rb +2 -3
  594. data/spec/unit/ssl/certificate_request_spec.rb +66 -67
  595. data/spec/unit/ssl/certificate_revocation_list_spec.rb +3 -4
  596. data/spec/unit/ssl/certificate_spec.rb +23 -25
  597. data/spec/unit/ssl/configuration_spec.rb +1 -4
  598. data/spec/unit/ssl/digest_spec.rb +0 -1
  599. data/spec/unit/ssl/host_spec.rb +217 -188
  600. data/spec/unit/ssl/inventory_spec.rb +25 -21
  601. data/spec/unit/ssl/key_spec.rb +30 -31
  602. data/spec/unit/ssl/validator_spec.rb +40 -40
  603. data/spec/unit/task_spec.rb +6 -7
  604. data/spec/unit/transaction/additional_resource_generator_spec.rb +6 -5
  605. data/spec/unit/transaction/event_manager_spec.rb +88 -88
  606. data/spec/unit/transaction/event_spec.rb +16 -15
  607. data/spec/unit/transaction/persistence_spec.rb +16 -17
  608. data/spec/unit/transaction/report_spec.rb +11 -12
  609. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  610. data/spec/unit/transaction_spec.rb +98 -100
  611. data/spec/unit/type/augeas_spec.rb +11 -10
  612. data/spec/unit/type/component_spec.rb +0 -1
  613. data/spec/unit/type/computer_spec.rb +7 -10
  614. data/spec/unit/type/cron_spec.rb +3 -7
  615. data/spec/unit/type/exec_spec.rb +60 -56
  616. data/spec/unit/type/file/checksum_spec.rb +9 -10
  617. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  618. data/spec/unit/type/file/content_spec.rb +58 -61
  619. data/spec/unit/type/file/ctime_spec.rb +0 -1
  620. data/spec/unit/type/file/ensure_spec.rb +12 -13
  621. data/spec/unit/type/file/group_spec.rb +5 -7
  622. data/spec/unit/type/file/mode_spec.rb +4 -6
  623. data/spec/unit/type/file/mtime_spec.rb +0 -1
  624. data/spec/unit/type/file/owner_spec.rb +6 -8
  625. data/spec/unit/type/file/selinux_spec.rb +17 -19
  626. data/spec/unit/type/file/source_spec.rb +104 -101
  627. data/spec/unit/type/file/type_spec.rb +0 -1
  628. data/spec/unit/type/file_spec.rb +195 -185
  629. data/spec/unit/type/filebucket_spec.rb +4 -5
  630. data/spec/unit/type/group_spec.rb +6 -8
  631. data/spec/unit/type/host_spec.rb +2 -3
  632. data/spec/unit/type/interface_spec.rb +2 -3
  633. data/spec/unit/type/k5login_spec.rb +3 -4
  634. data/spec/unit/type/macauthorization_spec.rb +6 -8
  635. data/spec/unit/type/mailalias_spec.rb +2 -3
  636. data/spec/unit/type/maillist_spec.rb +6 -9
  637. data/spec/unit/type/mcx_spec.rb +4 -8
  638. data/spec/unit/type/mount_spec.rb +26 -38
  639. data/spec/unit/type/nagios_spec.rb +0 -1
  640. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  641. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  642. data/spec/unit/type/package_spec.rb +53 -54
  643. data/spec/unit/type/resources_spec.rb +86 -88
  644. data/spec/unit/type/schedule_spec.rb +24 -26
  645. data/spec/unit/type/scheduled_task_spec.rb +1 -2
  646. data/spec/unit/type/selboolean_spec.rb +5 -6
  647. data/spec/unit/type/selmodule_spec.rb +0 -1
  648. data/spec/unit/type/service_spec.rb +47 -47
  649. data/spec/unit/type/ssh_authorized_key_spec.rb +5 -35
  650. data/spec/unit/type/sshkey_spec.rb +0 -2
  651. data/spec/unit/type/stage_spec.rb +0 -1
  652. data/spec/unit/type/tidy_spec.rb +61 -62
  653. data/spec/unit/type/user_spec.rb +41 -27
  654. data/spec/unit/type/vlan_spec.rb +2 -4
  655. data/spec/unit/type/whit_spec.rb +0 -1
  656. data/spec/unit/type/zfs_spec.rb +6 -7
  657. data/spec/unit/type/zone_spec.rb +14 -4
  658. data/spec/unit/type/zpool_spec.rb +4 -5
  659. data/spec/unit/type_spec.rb +54 -53
  660. data/spec/unit/util/at_fork_spec.rb +18 -19
  661. data/spec/unit/util/autoload_spec.rb +53 -54
  662. data/spec/unit/util/backups_spec.rb +34 -35
  663. data/spec/unit/util/character_encoding_spec.rb +8 -8
  664. data/spec/unit/util/checksums_spec.rb +38 -39
  665. data/spec/unit/util/colors_spec.rb +1 -2
  666. data/spec/unit/util/command_line_spec.rb +24 -25
  667. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  668. data/spec/unit/util/diff_spec.rb +7 -8
  669. data/spec/unit/util/errors_spec.rb +0 -1
  670. data/spec/unit/util/execution_spec.rb +187 -162
  671. data/spec/unit/util/execution_stub_spec.rb +0 -1
  672. data/spec/unit/util/feature_spec.rb +13 -13
  673. data/spec/unit/util/filetype_spec.rb +49 -49
  674. data/spec/unit/util/http_proxy_spec.rb +12 -12
  675. data/spec/unit/util/inifile_spec.rb +26 -31
  676. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  677. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  678. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  679. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  680. data/spec/unit/util/lockfile_spec.rb +0 -1
  681. data/spec/unit/util/log/destinations_spec.rb +30 -33
  682. data/spec/unit/util/log_spec.rb +35 -36
  683. data/spec/unit/util/logging_spec.rb +58 -66
  684. data/spec/unit/util/metric_spec.rb +0 -1
  685. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  686. data/spec/unit/util/multi_match_spec.rb +0 -1
  687. data/spec/unit/util/nagios_maker_spec.rb +35 -36
  688. data/spec/unit/util/network_device/cisco/device_spec.rb +59 -50
  689. data/spec/unit/util/network_device/cisco/facts_spec.rb +4 -5
  690. data/spec/unit/util/network_device/cisco/interface_spec.rb +29 -20
  691. data/spec/unit/util/network_device/config_spec.rb +0 -1
  692. data/spec/unit/util/network_device/ipcalc_spec.rb +0 -1
  693. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  694. data/spec/unit/util/network_device/transport/ssh_spec.rb +94 -60
  695. data/spec/unit/util/network_device/transport/telnet_spec.rb +18 -14
  696. data/spec/unit/util/network_device_spec.rb +7 -9
  697. data/spec/unit/util/package_spec.rb +0 -1
  698. data/spec/unit/util/pidlock_spec.rb +13 -14
  699. data/spec/unit/util/plist_spec.rb +40 -33
  700. data/spec/unit/util/posix_spec.rb +54 -51
  701. data/spec/unit/util/rdoc_spec.rb +9 -10
  702. data/spec/unit/util/reference_spec.rb +0 -1
  703. data/spec/unit/util/resource_template_spec.rb +20 -20
  704. data/spec/unit/util/retry_action_spec.rb +7 -8
  705. data/spec/unit/util/rubygems_spec.rb +14 -14
  706. data/spec/unit/util/run_mode_spec.rb +3 -4
  707. data/spec/unit/util/selinux_spec.rb +79 -72
  708. data/spec/unit/util/splayer_spec.rb +8 -9
  709. data/spec/unit/util/ssl_spec.rb +0 -1
  710. data/spec/unit/util/storage_spec.rb +3 -4
  711. data/spec/unit/util/suidmanager_spec.rb +45 -54
  712. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  713. data/spec/unit/util/tag_set_spec.rb +0 -1
  714. data/spec/unit/util/tagging_spec.rb +0 -1
  715. data/spec/unit/util/terminal_spec.rb +9 -10
  716. data/spec/unit/util/user_attr_spec.rb +1 -2
  717. data/spec/unit/util/warnings_spec.rb +3 -4
  718. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  719. data/spec/unit/util/watcher_spec.rb +51 -21
  720. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  721. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  722. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  723. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  724. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  725. data/spec/unit/util/windows/file_spec.rb +0 -1
  726. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  727. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  728. data/spec/unit/util/windows/service_spec.rb +66 -68
  729. data/spec/unit/util/windows/sid_spec.rb +11 -13
  730. data/spec/unit/util/windows/string_spec.rb +0 -1
  731. data/spec/unit/util_spec.rb +55 -59
  732. data/spec/unit/version_spec.rb +6 -6
  733. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/json_lockfile'
@@ -30,21 +29,20 @@ describe Puppet::Util::JsonLockfile do
30
29
 
31
30
  it "returns nil if the file read returned nil" do
32
31
  @lock.lock
33
- File.stubs(:read).returns nil
32
+ allow(File).to receive(:read).and_return(nil)
34
33
  expect(@lock.lock_data).to be_nil
35
34
  end
36
35
 
37
36
  it "returns nil if the file was empty" do
38
37
  @lock.lock
39
- File.stubs(:read).returns ''
38
+ allow(File).to receive(:read).and_return('')
40
39
  expect(@lock.lock_data).to be_nil
41
40
  end
42
41
 
43
42
  it "returns nil if the file was not in PSON" do
44
43
  @lock.lock
45
- File.stubs(:read).returns ']['
44
+ allow(File).to receive(:read).and_return('][')
46
45
  expect(@lock.lock_data).to be_nil
47
46
  end
48
-
49
47
  end
50
48
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/ldap/connection'
@@ -20,13 +19,15 @@ end
20
19
 
21
20
  describe Puppet::Util::Ldap::Connection do
22
21
  before do
23
- Puppet.features.stubs(:ldap?).returns true
22
+ allow(Puppet.features).to receive(:ldap?).and_return(true)
24
23
 
25
- @ldapconn = mock 'ldap'
26
- LDAP::Conn.stubs(:new).returns(@ldapconn)
27
- LDAP::SSLConn.stubs(:new).returns(@ldapconn)
28
-
29
- @ldapconn.stub_everything
24
+ @ldapconn = double(
25
+ 'ldap',
26
+ set_option: nil,
27
+ simple_bind: nil,
28
+ )
29
+ allow(LDAP::Conn).to receive(:new).and_return(@ldapconn)
30
+ allow(LDAP::SSLConn).to receive(:new).and_return(@ldapconn)
30
31
 
31
32
  @connection = Puppet::Util::Ldap::Connection.new("host", "port")
32
33
  end
@@ -50,19 +51,19 @@ describe Puppet::Util::Ldap::Connection do
50
51
  end
51
52
 
52
53
  it "should fail if ldap is unavailable" do
53
- Puppet.features.expects(:ldap?).returns(false)
54
+ expect(Puppet.features).to receive(:ldap?).and_return(false)
54
55
 
55
56
  expect { Puppet::Util::Ldap::Connection.new("host", "port") }.to raise_error(Puppet::Error)
56
57
  end
57
58
 
58
59
  it "should use neither ssl nor tls by default" do
59
- LDAP::Conn.expects(:new).with("host", "port").returns(@ldapconn)
60
+ expect(LDAP::Conn).to receive(:new).with("host", "port").and_return(@ldapconn)
60
61
 
61
62
  @connection.start
62
63
  end
63
64
 
64
65
  it "should use LDAP::SSLConn if ssl is requested" do
65
- LDAP::SSLConn.expects(:new).with("host", "port").returns(@ldapconn)
66
+ expect(LDAP::SSLConn).to receive(:new).with("host", "port").and_return(@ldapconn)
66
67
 
67
68
  @connection.ssl = true
68
69
 
@@ -70,7 +71,7 @@ describe Puppet::Util::Ldap::Connection do
70
71
  end
71
72
 
72
73
  it "should use LDAP::SSLConn and tls if tls is requested" do
73
- LDAP::SSLConn.expects(:new).with("host", "port", true).returns(@ldapconn)
74
+ expect(LDAP::SSLConn).to receive(:new).with("host", "port", true).and_return(@ldapconn)
74
75
 
75
76
  @connection.ssl = :tls
76
77
 
@@ -78,31 +79,31 @@ describe Puppet::Util::Ldap::Connection do
78
79
  end
79
80
 
80
81
  it "should set the protocol version to 3 and enable referrals" do
81
- @ldapconn.expects(:set_option).with(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
82
- @ldapconn.expects(:set_option).with(LDAP::LDAP_OPT_REFERRALS, LDAP::LDAP_OPT_ON)
82
+ expect(@ldapconn).to receive(:set_option).with(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
83
+ expect(@ldapconn).to receive(:set_option).with(LDAP::LDAP_OPT_REFERRALS, LDAP::LDAP_OPT_ON)
83
84
  @connection.start
84
85
  end
85
86
 
86
87
  it "should bind with the provided user and password" do
87
88
  @connection.user = "myuser"
88
89
  @connection.password = "mypassword"
89
- @ldapconn.expects(:simple_bind).with("myuser", "mypassword")
90
+ expect(@ldapconn).to receive(:simple_bind).with("myuser", "mypassword")
90
91
 
91
92
  @connection.start
92
93
  end
93
94
 
94
95
  it "should bind with no user and password if none has been provided" do
95
- @ldapconn.expects(:simple_bind).with(nil, nil)
96
+ expect(@ldapconn).to receive(:simple_bind).with(nil, nil)
96
97
  @connection.start
97
98
  end
98
99
  end
99
100
 
100
101
  describe "when closing connections" do
101
102
  it "should not close connections that are not open" do
102
- @connection.stubs(:connection).returns(@ldapconn)
103
+ allow(@connection).to receive(:connection).and_return(@ldapconn)
103
104
 
104
- @ldapconn.expects(:bound?).returns false
105
- @ldapconn.expects(:unbind).never
105
+ expect(@ldapconn).to receive(:bound?).and_return(false)
106
+ expect(@ldapconn).not_to receive(:unbind)
106
107
 
107
108
  @connection.close
108
109
  end
@@ -115,46 +116,46 @@ describe Puppet::Util::Ldap::Connection do
115
116
  describe "when creating a default connection" do
116
117
  it "should use the :ldapserver setting to determine the host" do
117
118
  Puppet[:ldapserver] = "myserv"
118
- Puppet::Util::Ldap::Connection.expects(:new).with { |host, port, options| host == "myserv" }
119
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with("myserv", anything, anything)
119
120
  Puppet::Util::Ldap::Connection.instance
120
121
  end
121
122
 
122
123
  it "should use the :ldapport setting to determine the port" do
123
124
  Puppet[:ldapport] = "456"
124
- Puppet::Util::Ldap::Connection.expects(:new).with { |host, port, options| port == "456" }
125
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, "456", anything)
125
126
  Puppet::Util::Ldap::Connection.instance
126
127
  end
127
128
 
128
129
  it "should set ssl to :tls if tls is enabled" do
129
130
  Puppet[:ldaptls] = true
130
- Puppet::Util::Ldap::Connection.expects(:new).with { |host, port, options| options[:ssl] == :tls }
131
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_including(ssl: :tls))
131
132
  Puppet::Util::Ldap::Connection.instance
132
133
  end
133
134
 
134
135
  it "should set ssl to 'true' if ssl is enabled and tls is not" do
135
136
  Puppet[:ldaptls] = false
136
137
  Puppet[:ldapssl] = true
137
- Puppet::Util::Ldap::Connection.expects(:new).with { |host, port, options| options[:ssl] == true }
138
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_including(ssl: true))
138
139
  Puppet::Util::Ldap::Connection.instance
139
140
  end
140
141
 
141
142
  it "should set ssl to false if neither ssl nor tls are enabled" do
142
143
  Puppet[:ldaptls] = false
143
144
  Puppet[:ldapssl] = false
144
- Puppet::Util::Ldap::Connection.expects(:new).with { |host, port, options| options[:ssl] == false }
145
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_including(ssl: false))
145
146
  Puppet::Util::Ldap::Connection.instance
146
147
  end
147
148
 
148
149
  it "should set the ldapuser if one is set" do
149
150
  Puppet[:ldapuser] = "foo"
150
- Puppet::Util::Ldap::Connection.expects(:new).with { |host, port, options| options[:user] == "foo" }
151
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_including(user: "foo"))
151
152
  Puppet::Util::Ldap::Connection.instance
152
153
  end
153
154
 
154
155
  it "should set the ldapuser and ldappassword if both is set" do
155
156
  Puppet[:ldapuser] = "foo"
156
157
  Puppet[:ldappassword] = "bar"
157
- Puppet::Util::Ldap::Connection.expects(:new).with { |host, port, options| options[:user] == "foo" and options[:password] == "bar" }
158
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_including(user: "foo", password: "bar"))
158
159
  Puppet::Util::Ldap::Connection.instance
159
160
  end
160
161
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/ldap/generator'
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/util/ldap/manager'
@@ -61,13 +60,13 @@ describe Puppet::Util::Ldap::Manager do
61
60
 
62
61
  describe "when generating attributes" do
63
62
  before do
64
- @generator = stub 'generator', :source => "one", :name => "myparam"
63
+ @generator = double('generator', :source => "one", :name => "myparam")
65
64
 
66
- Puppet::Util::Ldap::Generator.stubs(:new).with(:myparam).returns @generator
65
+ allow(Puppet::Util::Ldap::Generator).to receive(:new).with(:myparam).and_return(@generator)
67
66
  end
68
67
 
69
68
  it "should create a generator to do the parameter generation" do
70
- Puppet::Util::Ldap::Generator.expects(:new).with(:myparam).returns @generator
69
+ expect(Puppet::Util::Ldap::Generator).to receive(:new).with(:myparam).and_return(@generator)
71
70
  @manager.generates(:myparam)
72
71
  end
73
72
 
@@ -79,7 +78,7 @@ describe Puppet::Util::Ldap::Manager do
79
78
  @manager.generates(:myparam)
80
79
 
81
80
  attrs = {"myparam" => "testing"}
82
- @generator.expects(:generate).never
81
+ expect(@generator).not_to receive(:generate)
83
82
 
84
83
  @manager.generate attrs
85
84
 
@@ -88,7 +87,7 @@ describe Puppet::Util::Ldap::Manager do
88
87
 
89
88
  it "should look for the parameter as a string, not a symbol" do
90
89
  @manager.generates(:myparam)
91
- @generator.expects(:generate).with("yay").returns %w{double yay}
90
+ expect(@generator).to receive(:generate).with("yay").and_return(%w{double yay})
92
91
  attrs = {"one" => "yay"}
93
92
  @manager.generate attrs
94
93
 
@@ -102,19 +101,19 @@ describe Puppet::Util::Ldap::Manager do
102
101
 
103
102
  it "should use the source value to generate the new value if a source attribute is specified" do
104
103
  @manager.generates(:myparam)
105
- @generator.expects(:generate).with("yay").returns %w{double yay}
104
+ expect(@generator).to receive(:generate).with("yay").and_return(%w{double yay})
106
105
  @manager.generate "one" => "yay"
107
106
  end
108
107
 
109
108
  it "should not pass in any value if no source attribute is specified" do
110
- @generator.stubs(:source).returns nil
109
+ allow(@generator).to receive(:source).and_return(nil)
111
110
  @manager.generates(:myparam)
112
- @generator.expects(:generate).with.returns %w{double yay}
111
+ expect(@generator).to receive(:generate).and_return(%w{double yay})
113
112
  @manager.generate "one" => "yay"
114
113
  end
115
114
 
116
115
  it "should convert any results to arrays of strings if necessary" do
117
- @generator.expects(:generate).returns :test
116
+ expect(@generator).to receive(:generate).and_return(:test)
118
117
  @manager.generates(:myparam)
119
118
 
120
119
  attrs = {"one" => "two"}
@@ -123,7 +122,7 @@ describe Puppet::Util::Ldap::Manager do
123
122
  end
124
123
 
125
124
  it "should add the result to the passed-in attribute hash" do
126
- @generator.expects(:generate).returns %w{test}
125
+ expect(@generator).to receive(:generate).and_return(%w{test})
127
126
  @manager.generates(:myparam)
128
127
 
129
128
  attrs = {"one" => "two"}
@@ -244,9 +243,9 @@ describe Puppet::Util::Ldap::Manager do
244
243
 
245
244
  describe "when using an ldap connection" do
246
245
  before do
247
- @ldapconn = mock 'ldapconn'
248
- @conn = stub 'connection', :connection => @ldapconn, :start => nil, :close => nil
249
- Puppet::Util::Ldap::Connection.stubs(:new).returns(@conn)
246
+ @ldapconn = double('ldapconn')
247
+ @conn = double('connection', :connection => @ldapconn, :start => nil, :close => nil)
248
+ allow(Puppet::Util::Ldap::Connection).to receive(:new).and_return(@conn)
250
249
  end
251
250
 
252
251
  it "should fail unless a block is given" do
@@ -255,144 +254,148 @@ describe Puppet::Util::Ldap::Manager do
255
254
 
256
255
  it "should open the connection with its server set to :ldapserver" do
257
256
  Puppet[:ldapserver] = "myserver"
258
- Puppet::Util::Ldap::Connection.expects(:new).with { |*args| args[0] == "myserver" }.returns @conn
257
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with("myserver", anything, anything).and_return(@conn)
259
258
 
260
259
  @manager.connect { |c| }
261
260
  end
262
261
 
263
262
  it "should open the connection with its port set to the :ldapport" do
264
263
  Puppet[:ldapport] = "28"
265
- Puppet::Util::Ldap::Connection.expects(:new).with { |*args| args[1] == "28" }.returns @conn
264
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, "28", anything).and_return(@conn)
266
265
 
267
266
  @manager.connect { |c| }
268
267
  end
269
268
 
270
269
  it "should open the connection with no user if :ldapuser is not set" do
271
270
  Puppet[:ldapuser] = ""
272
- Puppet::Util::Ldap::Connection.expects(:new).with { |*args| args[2][:user].nil? }.returns @conn
271
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_excluding(:user)).and_return(@conn)
273
272
 
274
273
  @manager.connect { |c| }
275
274
  end
276
275
 
277
276
  it "should open the connection with its user set to the :ldapuser if it is set" do
278
277
  Puppet[:ldapuser] = "mypass"
279
- Puppet::Util::Ldap::Connection.expects(:new).with { |*args| args[2][:user] == "mypass" }.returns @conn
278
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_including(user: "mypass")).and_return(@conn)
280
279
 
281
280
  @manager.connect { |c| }
282
281
  end
283
282
 
284
283
  it "should open the connection with no password if :ldappassword is not set" do
285
284
  Puppet[:ldappassword] = ""
286
- Puppet::Util::Ldap::Connection.expects(:new).with { |*args| args[2][:password].nil? }.returns @conn
285
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_excluding(:password)).and_return(@conn)
287
286
 
288
287
  @manager.connect { |c| }
289
288
  end
290
289
 
291
290
  it "should open the connection with its password set to the :ldappassword if it is set" do
292
291
  Puppet[:ldappassword] = "mypass"
293
- Puppet::Util::Ldap::Connection.expects(:new).with { |*args| args[2][:password] == "mypass" }.returns @conn
292
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_including(password: "mypass")).and_return(@conn)
294
293
 
295
294
  @manager.connect { |c| }
296
295
  end
297
296
 
298
297
  it "should set ssl to :tls if ldaptls is enabled" do
299
298
  Puppet[:ldaptls] = true
300
- Puppet::Util::Ldap::Connection.expects(:new).with { |*args| args[2][:ssl] == :tls }.returns @conn
299
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_including(ssl: :tls)).and_return(@conn)
301
300
 
302
301
  @manager.connect { |c| }
303
302
  end
304
303
 
305
304
  it "should set ssl to true if ldapssl is enabled" do
306
305
  Puppet[:ldapssl] = true
307
- Puppet::Util::Ldap::Connection.expects(:new).with { |*args| args[2][:ssl] == true }.returns @conn
306
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_including(ssl: true)).and_return(@conn)
308
307
 
309
308
  @manager.connect { |c| }
310
309
  end
311
310
 
312
311
  it "should set ssl to false if neither ldaptls nor ldapssl is enabled" do
313
312
  Puppet[:ldapssl] = false
314
- Puppet::Util::Ldap::Connection.expects(:new).with { |*args| args[2][:ssl] == false }.returns @conn
313
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).with(anything, anything, hash_including(ssl: false)).and_return(@conn)
315
314
 
316
315
  @manager.connect { |c| }
317
316
  end
318
317
 
319
318
  it "should open, yield, and then close the connection" do
320
- @conn.expects(:start)
321
- @conn.expects(:close)
322
- Puppet::Util::Ldap::Connection.expects(:new).returns(@conn)
323
- @ldapconn.expects(:test)
319
+ expect(@conn).to receive(:start)
320
+ expect(@conn).to receive(:close)
321
+ expect(Puppet::Util::Ldap::Connection).to receive(:new).and_return(@conn)
322
+ expect(@ldapconn).to receive(:test)
324
323
  @manager.connect { |c| c.test }
325
324
  end
326
325
 
327
326
  it "should close the connection even if there's an exception in the passed block" do
328
- @conn.expects(:close)
327
+ expect(@conn).to receive(:close)
329
328
  expect { @manager.connect { |c| raise ArgumentError } }.to raise_error(ArgumentError)
330
329
  end
331
330
  end
332
331
 
333
332
  describe "when using ldap" do
334
333
  before do
335
- @conn = mock 'connection'
336
- @manager.stubs(:connect).yields @conn
337
- @manager.stubs(:objectclasses).returns [:oc1, :oc2]
334
+ @conn = double('connection')
335
+ allow(@manager).to receive(:connect).and_yield(@conn)
336
+ allow(@manager).to receive(:objectclasses).and_return([:oc1, :oc2])
338
337
  @manager.maps :one => :uno, :two => :dos, :three => :tres, :four => :quatro
339
338
  end
340
339
 
341
340
  describe "to create entries" do
342
341
  it "should convert the first argument to its :create method to a full dn and pass the resulting argument list to its connection" do
343
- @manager.expects(:dn).with("myname").returns "mydn"
344
- @conn.expects(:add).with { |name, attrs| name == "mydn" }
342
+ expect(@manager).to receive(:dn).with("myname").and_return("mydn")
343
+ expect(@conn).to receive(:add).with("mydn", anything)
345
344
 
346
345
  @manager.create("myname", {"attr" => "myattrs"})
347
346
  end
348
347
 
349
348
  it "should add the objectclasses to the attributes" do
350
- @manager.expects(:dn).with("myname").returns "mydn"
351
- @conn.expects(:add).with { |name, attrs| attrs["objectClass"].include?("oc1") and attrs["objectClass"].include?("oc2") }
349
+ expect(@manager).to receive(:dn).with("myname").and_return("mydn")
350
+ expect(@conn).to receive(:add) do |_, attrs|
351
+ expect(attrs["objectClass"]).to include("oc1", "oc2")
352
+ end
352
353
 
353
354
  @manager.create("myname", {:one => :testing})
354
355
  end
355
356
 
356
357
  it "should add the rdn to the attributes" do
357
- @manager.expects(:dn).with("myname").returns "mydn"
358
- @conn.expects(:add).with { |name, attrs| attrs["cn"] == %w{myname} }
358
+ expect(@manager).to receive(:dn).with("myname").and_return("mydn")
359
+ expect(@conn).to receive(:add).with(anything, hash_including("cn" => %w{myname}))
359
360
 
360
361
  @manager.create("myname", {:one => :testing})
361
362
  end
362
363
 
363
364
  it "should add 'top' to the objectclasses if it is not listed" do
364
- @manager.expects(:dn).with("myname").returns "mydn"
365
- @conn.expects(:add).with { |name, attrs| attrs["objectClass"].include?("top") }
365
+ expect(@manager).to receive(:dn).with("myname").and_return("mydn")
366
+ expect(@conn).to receive(:add) do |_, attrs|
367
+ expect(attrs["objectClass"]).to include("top")
368
+ end
366
369
 
367
370
  @manager.create("myname", {:one => :testing})
368
371
  end
369
372
 
370
373
  it "should add any generated values that are defined" do
371
- generator = stub 'generator', :source => :one, :name => "myparam"
374
+ generator = double('generator', :source => :one, :name => "myparam")
372
375
 
373
- Puppet::Util::Ldap::Generator.expects(:new).with(:myparam).returns generator
376
+ expect(Puppet::Util::Ldap::Generator).to receive(:new).with(:myparam).and_return(generator)
374
377
 
375
378
  @manager.generates(:myparam)
376
379
 
377
- @manager.stubs(:dn).with("myname").returns "mydn"
380
+ allow(@manager).to receive(:dn).with("myname").and_return("mydn")
378
381
 
379
- generator.expects(:generate).with(:testing).returns ["generated value"]
380
- @conn.expects(:add).with { |name, attrs| attrs["myparam"] == ["generated value"] }
382
+ expect(generator).to receive(:generate).with(:testing).and_return(["generated value"])
383
+ expect(@conn).to receive(:add).with(anything, hash_including("myparam" => ["generated value"]))
381
384
 
382
385
  @manager.create("myname", {:one => :testing})
383
386
  end
384
387
 
385
388
  it "should convert any generated values to arrays of strings if necessary" do
386
- generator = stub 'generator', :source => :one, :name => "myparam"
389
+ generator = double('generator', :source => :one, :name => "myparam")
387
390
 
388
- Puppet::Util::Ldap::Generator.expects(:new).with(:myparam).returns generator
391
+ expect(Puppet::Util::Ldap::Generator).to receive(:new).with(:myparam).and_return(generator)
389
392
 
390
393
  @manager.generates(:myparam)
391
394
 
392
- @manager.stubs(:dn).returns "mydn"
395
+ allow(@manager).to receive(:dn).and_return("mydn")
393
396
 
394
- generator.expects(:generate).returns :generated
395
- @conn.expects(:add).with { |name, attrs| attrs["myparam"] == ["generated"] }
397
+ expect(generator).to receive(:generate).and_return(:generated)
398
+ expect(@conn).to receive(:add).with(anything, hash_including("myparam" => ["generated"]))
396
399
 
397
400
  @manager.create("myname", {:one => :testing})
398
401
  end
@@ -400,8 +403,8 @@ describe Puppet::Util::Ldap::Manager do
400
403
 
401
404
  describe "do delete entries" do
402
405
  it "should convert the first argument to its :delete method to a full dn and pass the resulting argument list to its connection" do
403
- @manager.expects(:dn).with("myname").returns "mydn"
404
- @conn.expects(:delete).with("mydn")
406
+ expect(@manager).to receive(:dn).with("myname").and_return("mydn")
407
+ expect(@conn).to receive(:delete).with("mydn")
405
408
 
406
409
  @manager.delete("myname")
407
410
  end
@@ -409,8 +412,8 @@ describe Puppet::Util::Ldap::Manager do
409
412
 
410
413
  describe "to modify entries" do
411
414
  it "should convert the first argument to its :modify method to a full dn and pass the resulting argument list to its connection" do
412
- @manager.expects(:dn).with("myname").returns "mydn"
413
- @conn.expects(:modify).with("mydn", :mymods)
415
+ expect(@manager).to receive(:dn).with("myname").and_return("mydn")
416
+ expect(@conn).to receive(:modify).with("mydn", :mymods)
414
417
 
415
418
  @manager.modify("myname", :mymods)
416
419
  end
@@ -418,25 +421,25 @@ describe Puppet::Util::Ldap::Manager do
418
421
 
419
422
  describe "to find a single entry" do
420
423
  it "should use the dn of the provided name as the search base, a scope of 0, and 'objectclass=*' as the filter for a search2 call" do
421
- @manager.expects(:dn).with("myname").returns "mydn"
422
- @conn.expects(:search2).with("mydn", 0, "objectclass=*")
424
+ expect(@manager).to receive(:dn).with("myname").and_return("mydn")
425
+ expect(@conn).to receive(:search2).with("mydn", 0, "objectclass=*")
423
426
 
424
427
  @manager.find("myname")
425
428
  end
426
429
 
427
430
  it "should return nil if an exception is thrown because no result is found" do
428
- @manager.expects(:dn).with("myname").returns "mydn"
429
- @conn.expects(:search2).raises LDAP::ResultError
431
+ expect(@manager).to receive(:dn).with("myname").and_return("mydn")
432
+ expect(@conn).to receive(:search2).and_raise(LDAP::ResultError)
430
433
 
431
434
  expect(@manager.find("myname")).to be_nil
432
435
  end
433
436
 
434
437
  it "should return a converted provider hash if the result is found" do
435
- @manager.expects(:dn).with("myname").returns "mydn"
438
+ expect(@manager).to receive(:dn).with("myname").and_return("mydn")
436
439
  result = {"one" => "two"}
437
- @conn.expects(:search2).yields result
440
+ expect(@conn).to receive(:search2).and_yield(result)
438
441
 
439
- @manager.expects(:entry2provider).with(result).returns "myprovider"
442
+ expect(@manager).to receive(:entry2provider).with(result).and_return("myprovider")
440
443
 
441
444
  expect(@manager.find("myname")).to eq("myprovider")
442
445
  end
@@ -444,38 +447,38 @@ describe Puppet::Util::Ldap::Manager do
444
447
 
445
448
  describe "to search for multiple entries" do
446
449
  before do
447
- @manager.stubs(:filter).returns "myfilter"
450
+ allow(@manager).to receive(:filter).and_return("myfilter")
448
451
  end
449
452
 
450
453
  it "should use the manager's search base as the dn of the provided name as the search base" do
451
- @manager.expects(:base).returns "mybase"
452
- @conn.expects(:search2).with { |base, scope, filter| base == "mybase" }
454
+ expect(@manager).to receive(:base).and_return("mybase")
455
+ expect(@conn).to receive(:search2).with("mybase", anything, anything)
453
456
 
454
457
  @manager.search
455
458
  end
456
459
 
457
460
  it "should use a scope of 1" do
458
- @conn.expects(:search2).with { |base, scope, filter| scope == 1 }
461
+ expect(@conn).to receive(:search2).with(anything, 1, anything)
459
462
 
460
463
  @manager.search
461
464
  end
462
465
 
463
466
  it "should use any specified search filter" do
464
- @manager.expects(:filter).never
465
- @conn.expects(:search2).with { |base, scope, filter| filter == "boo" }
467
+ expect(@manager).not_to receive(:filter)
468
+ expect(@conn).to receive(:search2).with(anything, anything, "boo")
466
469
 
467
470
  @manager.search("boo")
468
471
  end
469
472
 
470
473
  it "should turn its objectclass list into its search filter if one is not specified" do
471
- @manager.expects(:filter).returns "yay"
472
- @conn.expects(:search2).with { |base, scope, filter| filter == "yay" }
474
+ expect(@manager).to receive(:filter).and_return("yay")
475
+ expect(@conn).to receive(:search2).with(anything, anything, "yay")
473
476
 
474
477
  @manager.search
475
478
  end
476
479
 
477
480
  it "should return nil if no result is found" do
478
- @conn.expects(:search2)
481
+ expect(@conn).to receive(:search2)
479
482
 
480
483
  expect(@manager.search).to be_nil
481
484
  end
@@ -483,9 +486,9 @@ describe Puppet::Util::Ldap::Manager do
483
486
  it "should return an array of the found results converted to provider hashes" do
484
487
  # LAK: AFAICT, it's impossible to yield multiple times in an expectation.
485
488
  one = {"dn" => "cn=one,dc=madstop,dc=com", "one" => "two"}
486
- @conn.expects(:search2).yields(one)
489
+ expect(@conn).to receive(:search2).and_yield(one)
487
490
 
488
- @manager.expects(:entry2provider).with(one).returns "myprov"
491
+ expect(@manager).to receive(:entry2provider).with(one).and_return("myprov")
489
492
 
490
493
  expect(@manager.search).to eq(["myprov"])
491
494
  end
@@ -500,29 +503,29 @@ describe Puppet::Util::Ldap::Manager do
500
503
 
501
504
  describe "is being updated" do
502
505
  it "should get created if the current attribute list is empty and the desired attribute list has :ensure == :present" do
503
- @manager.expects(:create)
506
+ expect(@manager).to receive(:create)
504
507
  @manager.update(@name, {}, {:ensure => :present})
505
508
  end
506
509
 
507
510
  it "should get created if the current attribute list has :ensure == :absent and the desired attribute list has :ensure == :present" do
508
- @manager.expects(:create)
511
+ expect(@manager).to receive(:create)
509
512
  @manager.update(@name, {:ensure => :absent}, {:ensure => :present})
510
513
  end
511
514
 
512
515
  it "should get deleted if the current attribute list has :ensure == :present and the desired attribute list has :ensure == :absent" do
513
- @manager.expects(:delete)
516
+ expect(@manager).to receive(:delete)
514
517
  @manager.update(@name, {:ensure => :present}, {:ensure => :absent})
515
518
  end
516
519
 
517
520
  it "should get modified if both attribute lists have :ensure == :present" do
518
- @manager.expects(:modify)
521
+ expect(@manager).to receive(:modify)
519
522
  @manager.update(@name, {:ensure => :present, :one => :two}, {:ensure => :present, :one => :three})
520
523
  end
521
524
  end
522
525
 
523
526
  describe "is being deleted" do
524
527
  it "should call the :delete method with its name and manager" do
525
- @manager.expects(:delete).with(@name)
528
+ expect(@manager).to receive(:delete).with(@name)
526
529
 
527
530
  @manager.update(@name, {}, {:ensure => :absent})
528
531
  end
@@ -535,59 +538,59 @@ describe Puppet::Util::Ldap::Manager do
535
538
  end
536
539
 
537
540
  it "should call the :create method with its name" do
538
- @manager.expects(:create).with { |name, attrs| name == @name }
541
+ expect(@manager).to receive(:create).with(@name, anything)
539
542
  @manager.update(@name, @is, @should)
540
543
  end
541
544
 
542
545
  it "should call the :create method with its property hash converted to ldap attribute names" do
543
- @manager.expects(:create).with { |name, attrs| attrs["uno"] == ["yay"] }
546
+ expect(@manager).to receive(:create).with(anything, hash_including("uno" => ["yay"]))
544
547
  @manager.update(@name, @is, @should)
545
548
  end
546
549
 
547
550
  it "should convert the property names to strings" do
548
- @manager.expects(:create).with { |name, attrs| attrs["uno"] == ["yay"] }
551
+ expect(@manager).to receive(:create).with(anything, hash_including("uno" => ["yay"]))
549
552
  @manager.update(@name, @is, @should)
550
553
  end
551
554
 
552
555
  it "should convert the property values to arrays if necessary" do
553
- @manager.expects(:create).with { |name, attrs| attrs["uno"] == ["yay"] }
556
+ expect(@manager).to receive(:create).with(anything, hash_including("uno" => ["yay"]))
554
557
  @manager.update(@name, @is, @should)
555
558
  end
556
559
 
557
560
  it "should convert the property values to strings if necessary" do
558
- @manager.expects(:create).with { |name, attrs| attrs["uno"] == ["yay"] }
561
+ expect(@manager).to receive(:create).with(anything, hash_including("uno" => ["yay"]))
559
562
  @manager.update(@name, @is, @should)
560
563
  end
561
564
 
562
565
  it "should not include :ensure in the properties sent" do
563
- @manager.expects(:create).with { |*args| args[1][:ensure].nil? }
566
+ expect(@manager).to receive(:create).with(anything, hash_excluding(:ensure))
564
567
  @manager.update(@name, @is, @should)
565
568
  end
566
569
 
567
570
  it "should not include attributes set to :absent in the properties sent" do
568
- @manager.expects(:create).with { |*args| args[1][:dos].nil? }
571
+ expect(@manager).to receive(:create).with(anything, hash_excluding(:dos))
569
572
  @manager.update(@name, @is, @should)
570
573
  end
571
574
  end
572
575
 
573
576
  describe "is being modified" do
574
577
  it "should call the :modify method with its name and an array of LDAP::Mod instances" do
575
- LDAP::Mod.stubs(:new).returns "whatever"
578
+ allow(LDAP::Mod).to receive(:new).and_return("whatever")
576
579
 
577
580
  @is = {:one => :yay}
578
581
  @should = {:one => :yay, :two => :foo}
579
582
 
580
- @manager.expects(:modify).with { |name, mods| name == @name }
583
+ expect(@manager).to receive(:modify).with(@name, anything)
581
584
  @manager.update(@name, @is, @should)
582
585
  end
583
586
 
584
587
  it "should create the LDAP::Mod with the property name converted to the ldap name as a string" do
585
588
  @is = {:one => :yay}
586
589
  @should = {:one => :yay, :two => :foo}
587
- mod = mock 'module'
588
- LDAP::Mod.expects(:new).with { |form, name, value| name == "dos" }.returns mod
590
+ mod = double('module')
591
+ expect(LDAP::Mod).to receive(:new).with(anything, "dos", anything).and_return(mod)
589
592
 
590
- @manager.stubs(:modify)
593
+ allow(@manager).to receive(:modify)
591
594
 
592
595
  @manager.update(@name, @is, @should)
593
596
  end
@@ -595,10 +598,10 @@ describe Puppet::Util::Ldap::Manager do
595
598
  it "should create an LDAP::Mod instance of type LDAP_MOD_ADD for each attribute being added, with the attribute value converted to a string of arrays" do
596
599
  @is = {:one => :yay}
597
600
  @should = {:one => :yay, :two => :foo}
598
- mod = mock 'module'
599
- LDAP::Mod.expects(:new).with(LDAP::LDAP_MOD_ADD, "dos", ["foo"]).returns mod
601
+ mod = double('module')
602
+ expect(LDAP::Mod).to receive(:new).with(LDAP::LDAP_MOD_ADD, "dos", ["foo"]).and_return(mod)
600
603
 
601
- @manager.stubs(:modify)
604
+ allow(@manager).to receive(:modify)
602
605
 
603
606
  @manager.update(@name, @is, @should)
604
607
  end
@@ -606,10 +609,10 @@ describe Puppet::Util::Ldap::Manager do
606
609
  it "should create an LDAP::Mod instance of type LDAP_MOD_DELETE for each attribute being deleted" do
607
610
  @is = {:one => :yay, :two => :foo}
608
611
  @should = {:one => :yay, :two => :absent}
609
- mod = mock 'module'
610
- LDAP::Mod.expects(:new).with(LDAP::LDAP_MOD_DELETE, "dos", []).returns mod
612
+ mod = double('module')
613
+ expect(LDAP::Mod).to receive(:new).with(LDAP::LDAP_MOD_DELETE, "dos", []).and_return(mod)
611
614
 
612
- @manager.stubs(:modify)
615
+ allow(@manager).to receive(:modify)
613
616
 
614
617
  @manager.update(@name, @is, @should)
615
618
  end
@@ -617,10 +620,10 @@ describe Puppet::Util::Ldap::Manager do
617
620
  it "should create an LDAP::Mod instance of type LDAP_MOD_REPLACE for each attribute being modified, with the attribute converted to a string of arrays" do
618
621
  @is = {:one => :yay, :two => :four}
619
622
  @should = {:one => :yay, :two => :five}
620
- mod = mock 'module'
621
- LDAP::Mod.expects(:new).with(LDAP::LDAP_MOD_REPLACE, "dos", ["five"]).returns mod
623
+ mod = double('module')
624
+ expect(LDAP::Mod).to receive(:new).with(LDAP::LDAP_MOD_REPLACE, "dos", ["five"]).and_return(mod)
622
625
 
623
- @manager.stubs(:modify)
626
+ allow(@manager).to receive(:modify)
624
627
 
625
628
  @manager.update(@name, @is, @should)
626
629
  end
@@ -628,11 +631,9 @@ describe Puppet::Util::Ldap::Manager do
628
631
  it "should pass all created Mod instances to the modify method" do
629
632
  @is = {:one => :yay, :two => :foo, :three => :absent}
630
633
  @should = {:one => :yay, :two => :foe, :three => :fee, :four => :fie}
631
- LDAP::Mod.expects(:new).times(3).returns("mod1").then.returns("mod2").then.returns("mod3")
634
+ expect(LDAP::Mod).to receive(:new).exactly(3).times().and_return("mod1", "mod2", "mod3")
632
635
 
633
- @manager.expects(:modify).with do |name, mods|
634
- mods.sort == %w{mod1 mod2 mod3}.sort
635
- end
636
+ expect(@manager).to receive(:modify).with(anything, contain_exactly(*%w{mod1 mod2 mod3}))
636
637
 
637
638
  @manager.update(@name, @is, @should)
638
639
  end