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

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

Potentially problematic release.


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

Files changed (632) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +4 -8
  4. data/lib/puppet/application/device.rb +99 -83
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/configurer.rb +5 -4
  7. data/lib/puppet/defaults.rb +31 -11
  8. data/lib/puppet/indirector/request.rb +26 -15
  9. data/lib/puppet/network/http/connection.rb +15 -7
  10. data/lib/puppet/transaction/event_manager.rb +1 -5
  11. data/lib/puppet/type/file/source.rb +0 -1
  12. data/lib/puppet/util/connection.rb +15 -6
  13. data/lib/puppet/util/http_proxy.rb +3 -2
  14. data/lib/puppet/version.rb +1 -1
  15. data/locales/puppet.pot +99 -40
  16. data/man/man5/puppet.conf.5 +8 -8
  17. data/man/man8/puppet-agent.8 +1 -1
  18. data/man/man8/puppet-apply.8 +1 -1
  19. data/man/man8/puppet-catalog.8 +1 -1
  20. data/man/man8/puppet-config.8 +1 -1
  21. data/man/man8/puppet-describe.8 +1 -1
  22. data/man/man8/puppet-device.8 +1 -1
  23. data/man/man8/puppet-doc.8 +1 -1
  24. data/man/man8/puppet-epp.8 +1 -1
  25. data/man/man8/puppet-facts.8 +1 -1
  26. data/man/man8/puppet-filebucket.8 +1 -1
  27. data/man/man8/puppet-generate.8 +1 -1
  28. data/man/man8/puppet-help.8 +1 -1
  29. data/man/man8/puppet-key.8 +1 -1
  30. data/man/man8/puppet-lookup.8 +1 -1
  31. data/man/man8/puppet-man.8 +1 -1
  32. data/man/man8/puppet-module.8 +1 -1
  33. data/man/man8/puppet-node.8 +1 -1
  34. data/man/man8/puppet-parser.8 +1 -1
  35. data/man/man8/puppet-plugin.8 +1 -1
  36. data/man/man8/puppet-report.8 +1 -1
  37. data/man/man8/puppet-resource.8 +1 -1
  38. data/man/man8/puppet-script.8 +1 -1
  39. data/man/man8/puppet-ssl.8 +1 -1
  40. data/man/man8/puppet-status.8 +1 -1
  41. data/man/man8/puppet.8 +2 -2
  42. data/spec/integration/agent/logging_spec.rb +5 -7
  43. data/spec/integration/application/apply_spec.rb +18 -16
  44. data/spec/integration/application/doc_spec.rb +1 -2
  45. data/spec/integration/application/lookup_spec.rb +5 -5
  46. data/spec/integration/configurer_spec.rb +5 -6
  47. data/spec/integration/defaults_spec.rb +5 -6
  48. data/spec/integration/directory_environments_spec.rb +1 -1
  49. data/spec/integration/faces/config_spec.rb +3 -4
  50. data/spec/integration/faces/documentation_spec.rb +0 -1
  51. data/spec/integration/faces/plugin_spec.rb +1 -1
  52. data/spec/integration/file_bucket/file_spec.rb +2 -4
  53. data/spec/integration/file_serving/content_spec.rb +0 -1
  54. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  55. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  56. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  57. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  58. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  59. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  60. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  61. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  62. data/spec/integration/network/authconfig_spec.rb +23 -24
  63. data/spec/integration/network/formats_spec.rb +0 -1
  64. data/spec/integration/node/environment_spec.rb +0 -1
  65. data/spec/integration/node/facts_spec.rb +9 -10
  66. data/spec/integration/node_spec.rb +6 -7
  67. data/spec/integration/parser/catalog_spec.rb +1 -5
  68. data/spec/integration/parser/collection_spec.rb +1 -2
  69. data/spec/integration/parser/compiler_spec.rb +6 -6
  70. data/spec/integration/parser/scope_spec.rb +1 -1
  71. data/spec/integration/parser/undef_param_spec.rb +1 -1
  72. data/spec/integration/provider/service/init_spec.rb +4 -5
  73. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  74. data/spec/integration/provider/service/windows_spec.rb +1 -2
  75. data/spec/integration/reference/providers_spec.rb +1 -2
  76. data/spec/integration/reports_spec.rb +1 -2
  77. data/spec/integration/resource/catalog_spec.rb +14 -17
  78. data/spec/integration/resource/type_collection_spec.rb +4 -5
  79. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  80. data/spec/integration/ssl/host_spec.rb +1 -2
  81. data/spec/integration/ssl/key_spec.rb +0 -1
  82. data/spec/integration/test/test_helper_spec.rb +0 -1
  83. data/spec/integration/transaction/report_spec.rb +6 -11
  84. data/spec/integration/transaction_spec.rb +18 -19
  85. data/spec/integration/type/exec_spec.rb +0 -1
  86. data/spec/integration/type/file_spec.rb +13 -14
  87. data/spec/integration/type/package_spec.rb +19 -23
  88. data/spec/integration/type/tidy_spec.rb +1 -2
  89. data/spec/integration/type_spec.rb +0 -1
  90. data/spec/integration/util/autoload_spec.rb +1 -2
  91. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  92. data/spec/integration/util/settings_spec.rb +0 -1
  93. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  94. data/spec/integration/util/windows/principal_spec.rb +0 -1
  95. data/spec/integration/util/windows/process_spec.rb +4 -6
  96. data/spec/integration/util/windows/registry_spec.rb +41 -51
  97. data/spec/integration/util/windows/security_spec.rb +2 -4
  98. data/spec/integration/util/windows/user_spec.rb +18 -20
  99. data/spec/integration/util_spec.rb +4 -7
  100. data/spec/lib/puppet_spec/compiler.rb +1 -1
  101. data/spec/lib/puppet_spec/files.rb +0 -1
  102. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  103. data/spec/lib/puppet_spec/scope.rb +1 -2
  104. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  105. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  106. data/spec/shared_behaviours/file_serving.rb +6 -8
  107. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  108. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  109. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  110. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  111. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  112. data/spec/spec_helper.rb +10 -1
  113. data/spec/unit/agent/disabler_spec.rb +4 -5
  114. data/spec/unit/agent/locker_spec.rb +12 -13
  115. data/spec/unit/agent_spec.rb +80 -85
  116. data/spec/unit/application/agent_spec.rb +88 -93
  117. data/spec/unit/application/apply_spec.rb +82 -83
  118. data/spec/unit/application/config_spec.rb +0 -1
  119. data/spec/unit/application/describe_spec.rb +6 -7
  120. data/spec/unit/application/device_spec.rb +395 -419
  121. data/spec/unit/application/doc_spec.rb +44 -46
  122. data/spec/unit/application/face_base_spec.rb +61 -62
  123. data/spec/unit/application/facts_spec.rb +3 -4
  124. data/spec/unit/application/filebucket_spec.rb +66 -74
  125. data/spec/unit/application/indirection_base_spec.rb +8 -6
  126. data/spec/unit/application/lookup_spec.rb +26 -26
  127. data/spec/unit/application/resource_spec.rb +42 -48
  128. data/spec/unit/application/ssl_spec.rb +3 -3
  129. data/spec/unit/application_spec.rb +82 -92
  130. data/spec/unit/capability_spec.rb +6 -6
  131. data/spec/unit/certificate_factory_spec.rb +3 -5
  132. data/spec/unit/configurer/downloader_spec.rb +20 -21
  133. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  134. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  135. data/spec/unit/configurer_spec.rb +189 -192
  136. data/spec/unit/confine/exists_spec.rb +17 -15
  137. data/spec/unit/confine/false_spec.rb +5 -6
  138. data/spec/unit/confine/feature_spec.rb +7 -5
  139. data/spec/unit/confine/true_spec.rb +5 -6
  140. data/spec/unit/confine/variable_spec.rb +14 -15
  141. data/spec/unit/confine_collection_spec.rb +28 -29
  142. data/spec/unit/confine_spec.rb +13 -14
  143. data/spec/unit/confiner_spec.rb +10 -11
  144. data/spec/unit/context/trusted_information_spec.rb +1 -1
  145. data/spec/unit/daemon_spec.rb +35 -36
  146. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  147. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  148. data/spec/unit/datatypes_spec.rb +3 -4
  149. data/spec/unit/defaults_spec.rb +18 -13
  150. data/spec/unit/environments_spec.rb +7 -7
  151. data/spec/unit/etc_spec.rb +30 -32
  152. data/spec/unit/external/pson_spec.rb +0 -1
  153. data/spec/unit/face/catalog_spec.rb +0 -1
  154. data/spec/unit/face/config_spec.rb +31 -35
  155. data/spec/unit/face/epp_face_spec.rb +3 -4
  156. data/spec/unit/face/facts_spec.rb +5 -6
  157. data/spec/unit/face/generate_spec.rb +4 -5
  158. data/spec/unit/face/help_spec.rb +7 -8
  159. data/spec/unit/face/key_spec.rb +0 -1
  160. data/spec/unit/face/man_spec.rb +1 -2
  161. data/spec/unit/face/module/install_spec.rb +3 -5
  162. data/spec/unit/face/module/list_spec.rb +2 -12
  163. data/spec/unit/face/module/search_spec.rb +11 -9
  164. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  165. data/spec/unit/face/node_spec.rb +23 -24
  166. data/spec/unit/face/parser_spec.rb +3 -3
  167. data/spec/unit/face/plugin_spec.rb +36 -9
  168. data/spec/unit/face/status_spec.rb +0 -1
  169. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  170. data/spec/unit/file_bucket/file_spec.rb +0 -2
  171. data/spec/unit/file_serving/base_spec.rb +14 -15
  172. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  173. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  174. data/spec/unit/file_serving/content_spec.rb +10 -11
  175. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  176. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  177. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  178. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  179. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  180. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  181. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  182. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  183. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  184. data/spec/unit/file_serving/mount_spec.rb +0 -1
  185. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  186. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  187. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  188. data/spec/unit/file_system_spec.rb +2 -2
  189. data/spec/unit/forge/errors_spec.rb +1 -1
  190. data/spec/unit/forge/forge_spec.rb +13 -14
  191. data/spec/unit/forge/module_release_spec.rb +18 -18
  192. data/spec/unit/forge/repository_spec.rb +29 -30
  193. data/spec/unit/forge_spec.rb +15 -11
  194. data/spec/unit/functions/binary_file_spec.rb +3 -3
  195. data/spec/unit/functions/contain_spec.rb +0 -2
  196. data/spec/unit/functions/defined_spec.rb +0 -1
  197. data/spec/unit/functions/epp_spec.rb +2 -2
  198. data/spec/unit/functions/find_file_spec.rb +7 -7
  199. data/spec/unit/functions/include_spec.rb +0 -4
  200. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  201. data/spec/unit/functions/lookup_spec.rb +1 -2
  202. data/spec/unit/functions/module_directory_spec.rb +12 -12
  203. data/spec/unit/functions/require_spec.rb +0 -3
  204. data/spec/unit/functions/shared.rb +5 -8
  205. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  206. data/spec/unit/functions4_spec.rb +9 -10
  207. data/spec/unit/gettext/config_spec.rb +4 -4
  208. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  209. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  210. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  211. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  212. data/spec/unit/hiera_puppet_spec.rb +20 -20
  213. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  214. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  215. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  216. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  217. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  218. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  219. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  220. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  221. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  222. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  223. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  224. data/spec/unit/indirector/envelope_spec.rb +1 -2
  225. data/spec/unit/indirector/exec_spec.rb +4 -5
  226. data/spec/unit/indirector/face_spec.rb +9 -9
  227. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  228. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  229. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  230. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  231. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  232. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  233. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  234. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  235. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  236. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  237. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  238. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  239. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  240. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  241. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  242. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  243. data/spec/unit/indirector/file_server_spec.rb +87 -87
  244. data/spec/unit/indirector/indirection_spec.rb +242 -226
  245. data/spec/unit/indirector/json_spec.rb +7 -9
  246. data/spec/unit/indirector/key/file_spec.rb +21 -22
  247. data/spec/unit/indirector/memory_spec.rb +6 -7
  248. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  249. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  250. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  251. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  252. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  253. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  254. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  255. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  256. data/spec/unit/indirector/none_spec.rb +5 -5
  257. data/spec/unit/indirector/plain_spec.rb +7 -8
  258. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  259. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  260. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  261. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  262. data/spec/unit/indirector/request_spec.rb +11 -12
  263. data/spec/unit/indirector/resource/ral_spec.rb +46 -54
  264. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  265. data/spec/unit/indirector/rest_spec.rb +113 -110
  266. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  267. data/spec/unit/indirector/status/local_spec.rb +0 -1
  268. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  269. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  270. data/spec/unit/indirector/terminus_spec.rb +27 -27
  271. data/spec/unit/indirector/yaml_spec.rb +5 -6
  272. data/spec/unit/indirector_spec.rb +1 -2
  273. data/spec/unit/info_service_spec.rb +1 -1
  274. data/spec/unit/interface/action_builder_spec.rb +0 -1
  275. data/spec/unit/interface/action_manager_spec.rb +0 -1
  276. data/spec/unit/interface/action_spec.rb +2 -3
  277. data/spec/unit/interface/documentation_spec.rb +0 -1
  278. data/spec/unit/interface/face_collection_spec.rb +19 -12
  279. data/spec/unit/interface_spec.rb +3 -3
  280. data/spec/unit/man_spec.rb +3 -4
  281. data/spec/unit/module_spec.rb +46 -51
  282. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  283. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  284. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  285. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  286. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  287. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  288. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  289. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  290. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  291. data/spec/unit/module_tool/tar_spec.rb +12 -13
  292. data/spec/unit/module_tool_spec.rb +7 -12
  293. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  294. data/spec/unit/network/authconfig_spec.rb +17 -18
  295. data/spec/unit/network/authorization_spec.rb +4 -5
  296. data/spec/unit/network/authstore_spec.rb +0 -1
  297. data/spec/unit/network/format_handler_spec.rb +0 -1
  298. data/spec/unit/network/format_spec.rb +9 -10
  299. data/spec/unit/network/format_support_spec.rb +28 -29
  300. data/spec/unit/network/formats_spec.rb +4 -5
  301. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  302. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  303. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  304. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  305. data/spec/unit/network/http/api_spec.rb +0 -2
  306. data/spec/unit/network/http/compression_spec.rb +21 -22
  307. data/spec/unit/network/http/connection_spec.rb +41 -36
  308. data/spec/unit/network/http/factory_spec.rb +5 -6
  309. data/spec/unit/network/http/handler_spec.rb +9 -18
  310. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  311. data/spec/unit/network/http/pool_spec.rb +28 -29
  312. data/spec/unit/network/http/request_spec.rb +0 -2
  313. data/spec/unit/network/http/response_spec.rb +11 -13
  314. data/spec/unit/network/http/route_spec.rb +0 -1
  315. data/spec/unit/network/http/session_spec.rb +1 -2
  316. data/spec/unit/network/http/site_spec.rb +0 -1
  317. data/spec/unit/network/http_pool_spec.rb +18 -9
  318. data/spec/unit/network/http_spec.rb +0 -1
  319. data/spec/unit/network/resolver_spec.rb +25 -26
  320. data/spec/unit/network/rights_spec.rb +52 -53
  321. data/spec/unit/node/environment_spec.rb +14 -15
  322. data/spec/unit/node/facts_spec.rb +5 -7
  323. data/spec/unit/node_spec.rb +4 -10
  324. data/spec/unit/other/selinux_spec.rb +0 -1
  325. data/spec/unit/parameter/boolean_spec.rb +1 -2
  326. data/spec/unit/parameter/package_options_spec.rb +1 -2
  327. data/spec/unit/parameter/path_spec.rb +0 -1
  328. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  329. data/spec/unit/parameter/value_spec.rb +0 -1
  330. data/spec/unit/parameter_spec.rb +9 -9
  331. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  332. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  333. data/spec/unit/parser/compiler_spec.rb +84 -96
  334. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  335. data/spec/unit/parser/files_spec.rb +0 -1
  336. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  337. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  338. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  339. data/spec/unit/parser/functions/file_spec.rb +13 -14
  340. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  341. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  342. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  343. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  344. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  345. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  346. data/spec/unit/parser/functions/split_spec.rb +0 -1
  347. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  348. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  349. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  350. data/spec/unit/parser/functions/template_spec.rb +13 -13
  351. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  352. data/spec/unit/parser/functions_spec.rb +6 -7
  353. data/spec/unit/parser/relationship_spec.rb +0 -1
  354. data/spec/unit/parser/resource_spec.rb +42 -42
  355. data/spec/unit/parser/scope_spec.rb +39 -35
  356. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  357. data/spec/unit/parser/type_loader_spec.rb +17 -19
  358. data/spec/unit/pops/adaptable_spec.rb +0 -1
  359. data/spec/unit/pops/benchmark_spec.rb +0 -1
  360. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  361. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  362. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  363. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  364. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  365. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  366. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  367. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  368. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  371. data/spec/unit/pops/factory_spec.rb +3 -4
  372. data/spec/unit/pops/issues_spec.rb +19 -20
  373. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  374. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  375. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  376. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  377. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  378. data/spec/unit/pops/migration_spec.rb +3 -5
  379. data/spec/unit/pops/model/model_spec.rb +0 -1
  380. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  381. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  382. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  383. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  384. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  385. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  386. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  387. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  388. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  389. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  390. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  391. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  392. data/spec/unit/pops/pn_spec.rb +0 -1
  393. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  394. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  395. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  396. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  397. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  398. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  399. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  400. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  401. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  402. data/spec/unit/pops/visitor_spec.rb +0 -1
  403. data/spec/unit/property/boolean_spec.rb +1 -1
  404. data/spec/unit/property/ensure_spec.rb +0 -1
  405. data/spec/unit/property/keyvalue_spec.rb +32 -34
  406. data/spec/unit/property/list_spec.rb +26 -27
  407. data/spec/unit/property/ordered_list_spec.rb +10 -14
  408. data/spec/unit/property_spec.rb +42 -43
  409. data/spec/unit/provider/aix_object_spec.rb +47 -45
  410. data/spec/unit/provider/command_spec.rb +9 -9
  411. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  412. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  413. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  414. data/spec/unit/provider/exec_spec.rb +0 -1
  415. data/spec/unit/provider/file/posix_spec.rb +22 -24
  416. data/spec/unit/provider/file/windows_spec.rb +15 -17
  417. data/spec/unit/provider/group/aix_spec.rb +3 -2
  418. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  419. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  420. data/spec/unit/provider/group/pw_spec.rb +11 -11
  421. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  422. data/spec/unit/provider/ldap_spec.rb +61 -62
  423. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  424. data/spec/unit/provider/nameservice_spec.rb +38 -40
  425. data/spec/unit/provider/package/aix_spec.rb +15 -15
  426. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  427. data/spec/unit/provider/package/apt_spec.rb +44 -27
  428. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  429. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  430. data/spec/unit/provider/package/base_spec.rb +4 -4
  431. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  432. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  433. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  434. data/spec/unit/provider/package/gem_spec.rb +51 -43
  435. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  436. data/spec/unit/provider/package/macports_spec.rb +46 -42
  437. data/spec/unit/provider/package/nim_spec.rb +30 -39
  438. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  439. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  440. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  441. data/spec/unit/provider/package/pip_spec.rb +71 -72
  442. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  443. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  444. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  445. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  446. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  447. data/spec/unit/provider/package/portage_spec.rb +70 -74
  448. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  449. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  450. data/spec/unit/provider/package/sun_spec.rb +16 -18
  451. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  452. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  453. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  454. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  455. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  456. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  457. data/spec/unit/provider/package/windows_spec.rb +36 -32
  458. data/spec/unit/provider/package/yum_spec.rb +7 -7
  459. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  460. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  461. data/spec/unit/provider/service/base_spec.rb +4 -5
  462. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  463. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  464. data/spec/unit/provider/service/debian_spec.rb +38 -38
  465. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  466. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  467. data/spec/unit/provider/service/init_spec.rb +53 -52
  468. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  469. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  470. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  471. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  472. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  473. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  474. data/spec/unit/provider/service/runit_spec.rb +29 -27
  475. data/spec/unit/provider/service/smf_spec.rb +74 -66
  476. data/spec/unit/provider/service/src_spec.rb +46 -47
  477. data/spec/unit/provider/service/systemd_spec.rb +104 -113
  478. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  479. data/spec/unit/provider/service/windows_spec.rb +33 -41
  480. data/spec/unit/provider/user/aix_spec.rb +31 -31
  481. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  482. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  483. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  484. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  485. data/spec/unit/provider/user/pw_spec.rb +37 -35
  486. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  487. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  488. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  489. data/spec/unit/provider_spec.rb +35 -35
  490. data/spec/unit/puppet_pal_2pec.rb +4 -5
  491. data/spec/unit/puppet_pal_spec.rb +0 -1
  492. data/spec/unit/puppet_spec.rb +6 -7
  493. data/spec/unit/relationship_spec.rb +0 -1
  494. data/spec/unit/reports/http_spec.rb +21 -23
  495. data/spec/unit/reports/store_spec.rb +3 -4
  496. data/spec/unit/reports_spec.rb +12 -14
  497. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  498. data/spec/unit/resource/catalog_spec.rb +72 -68
  499. data/spec/unit/resource/status_spec.rb +6 -8
  500. data/spec/unit/resource/type_collection_spec.rb +17 -18
  501. data/spec/unit/resource/type_spec.rb +34 -35
  502. data/spec/unit/resource_spec.rb +36 -32
  503. data/spec/unit/rest/client_spec.rb +58 -27
  504. data/spec/unit/rest/route_spec.rb +5 -5
  505. data/spec/unit/scheduler/job_spec.rb +0 -1
  506. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  507. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  508. data/spec/unit/settings/array_setting_spec.rb +1 -1
  509. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  510. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  511. data/spec/unit/settings/config_file_spec.rb +0 -1
  512. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  513. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  514. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  515. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  516. data/spec/unit/settings/file_setting_spec.rb +44 -46
  517. data/spec/unit/settings/path_setting_spec.rb +1 -2
  518. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  519. data/spec/unit/settings/string_setting_spec.rb +14 -15
  520. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  521. data/spec/unit/settings/value_translator_spec.rb +0 -1
  522. data/spec/unit/settings_spec.rb +228 -235
  523. data/spec/unit/ssl/base_spec.rb +14 -15
  524. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  525. data/spec/unit/ssl/certificate_spec.rb +23 -25
  526. data/spec/unit/ssl/digest_spec.rb +0 -1
  527. data/spec/unit/ssl/host_spec.rb +166 -149
  528. data/spec/unit/ssl/key_spec.rb +30 -31
  529. data/spec/unit/ssl/validator_spec.rb +38 -39
  530. data/spec/unit/task_spec.rb +44 -45
  531. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  532. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  533. data/spec/unit/transaction/event_spec.rb +16 -15
  534. data/spec/unit/transaction/persistence_spec.rb +16 -17
  535. data/spec/unit/transaction/report_spec.rb +11 -12
  536. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  537. data/spec/unit/transaction_spec.rb +100 -101
  538. data/spec/unit/type/component_spec.rb +0 -1
  539. data/spec/unit/type/exec_spec.rb +60 -56
  540. data/spec/unit/type/file/checksum_spec.rb +9 -10
  541. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  542. data/spec/unit/type/file/content_spec.rb +58 -61
  543. data/spec/unit/type/file/ctime_spec.rb +0 -1
  544. data/spec/unit/type/file/ensure_spec.rb +12 -13
  545. data/spec/unit/type/file/group_spec.rb +5 -7
  546. data/spec/unit/type/file/mode_spec.rb +4 -6
  547. data/spec/unit/type/file/mtime_spec.rb +0 -1
  548. data/spec/unit/type/file/owner_spec.rb +6 -8
  549. data/spec/unit/type/file/selinux_spec.rb +17 -19
  550. data/spec/unit/type/file/source_spec.rb +104 -101
  551. data/spec/unit/type/file/type_spec.rb +0 -1
  552. data/spec/unit/type/file_spec.rb +195 -185
  553. data/spec/unit/type/filebucket_spec.rb +4 -5
  554. data/spec/unit/type/group_spec.rb +6 -8
  555. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  556. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  557. data/spec/unit/type/package_spec.rb +56 -57
  558. data/spec/unit/type/resources_spec.rb +72 -74
  559. data/spec/unit/type/schedule_spec.rb +24 -26
  560. data/spec/unit/type/service_spec.rb +48 -48
  561. data/spec/unit/type/stage_spec.rb +0 -1
  562. data/spec/unit/type/tidy_spec.rb +61 -62
  563. data/spec/unit/type/user_spec.rb +24 -25
  564. data/spec/unit/type/whit_spec.rb +0 -1
  565. data/spec/unit/type_spec.rb +55 -54
  566. data/spec/unit/util/at_fork_spec.rb +18 -19
  567. data/spec/unit/util/autoload_spec.rb +55 -56
  568. data/spec/unit/util/backups_spec.rb +34 -35
  569. data/spec/unit/util/character_encoding_spec.rb +5 -5
  570. data/spec/unit/util/checksums_spec.rb +38 -39
  571. data/spec/unit/util/colors_spec.rb +1 -2
  572. data/spec/unit/util/command_line_spec.rb +24 -25
  573. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  574. data/spec/unit/util/diff_spec.rb +7 -8
  575. data/spec/unit/util/errors_spec.rb +0 -1
  576. data/spec/unit/util/execution_spec.rb +185 -161
  577. data/spec/unit/util/execution_stub_spec.rb +0 -1
  578. data/spec/unit/util/feature_spec.rb +21 -14
  579. data/spec/unit/util/filetype_spec.rb +49 -49
  580. data/spec/unit/util/http_proxy_spec.rb +12 -12
  581. data/spec/unit/util/inifile_spec.rb +26 -31
  582. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  583. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  584. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  585. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  586. data/spec/unit/util/lockfile_spec.rb +0 -1
  587. data/spec/unit/util/log/destinations_spec.rb +30 -33
  588. data/spec/unit/util/log_spec.rb +35 -36
  589. data/spec/unit/util/logging_spec.rb +58 -72
  590. data/spec/unit/util/metric_spec.rb +0 -1
  591. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  592. data/spec/unit/util/multi_match_spec.rb +0 -1
  593. data/spec/unit/util/network_device/config_spec.rb +0 -1
  594. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  595. data/spec/unit/util/network_device_spec.rb +7 -9
  596. data/spec/unit/util/package_spec.rb +0 -1
  597. data/spec/unit/util/pidlock_spec.rb +21 -22
  598. data/spec/unit/util/plist_spec.rb +40 -33
  599. data/spec/unit/util/posix_spec.rb +54 -51
  600. data/spec/unit/util/rdoc_spec.rb +9 -10
  601. data/spec/unit/util/reference_spec.rb +0 -1
  602. data/spec/unit/util/resource_template_spec.rb +20 -20
  603. data/spec/unit/util/retry_action_spec.rb +7 -8
  604. data/spec/unit/util/rubygems_spec.rb +7 -8
  605. data/spec/unit/util/run_mode_spec.rb +3 -4
  606. data/spec/unit/util/selinux_spec.rb +79 -72
  607. data/spec/unit/util/splayer_spec.rb +8 -9
  608. data/spec/unit/util/ssl_spec.rb +0 -1
  609. data/spec/unit/util/storage_spec.rb +3 -4
  610. data/spec/unit/util/suidmanager_spec.rb +45 -54
  611. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  612. data/spec/unit/util/tag_set_spec.rb +0 -1
  613. data/spec/unit/util/tagging_spec.rb +0 -1
  614. data/spec/unit/util/terminal_spec.rb +9 -10
  615. data/spec/unit/util/user_attr_spec.rb +1 -2
  616. data/spec/unit/util/warnings_spec.rb +3 -4
  617. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  618. data/spec/unit/util/watcher_spec.rb +51 -21
  619. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  620. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  621. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  622. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  623. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  624. data/spec/unit/util/windows/file_spec.rb +0 -1
  625. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  626. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  627. data/spec/unit/util/windows/service_spec.rb +66 -68
  628. data/spec/unit/util/windows/sid_spec.rb +11 -13
  629. data/spec/unit/util/windows/string_spec.rb +0 -1
  630. data/spec/unit/util_spec.rb +55 -57
  631. data/spec/unit/version_spec.rb +6 -6
  632. metadata +2 -2
@@ -1726,10 +1726,10 @@ describe 'The type calculator' do
1726
1726
  scope = {}
1727
1727
 
1728
1728
  t = type_alias_t('Tree', 'Hash[String,Variant[String,Tree]]')
1729
- loader = mock
1730
- loader.expects(:load).with(:type, 'tree').returns t
1729
+ loader = double
1730
+ expect(loader).to receive(:load).with(:type, 'tree').and_return(t)
1731
1731
 
1732
- Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
1732
+ expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
1733
1733
 
1734
1734
  t.resolve(scope)
1735
1735
  expect(calculator.assignable?(t, parser.parse('Hash[String,Variant[String,Hash[String,Variant[String,String]]]]'))).to be_truthy
@@ -1741,11 +1741,11 @@ describe 'The type calculator' do
1741
1741
 
1742
1742
  t1 = type_alias_t('Tree1', 'Hash[String,Variant[String,Tree1]]')
1743
1743
  t2 = type_alias_t('Tree2', 'Hash[String,Variant[String,Tree2]]')
1744
- loader = mock
1745
- loader.expects(:load).with(:type, 'tree1').returns t1
1746
- loader.expects(:load).with(:type, 'tree2').returns t2
1744
+ loader = double
1745
+ expect(loader).to receive(:load).with(:type, 'tree1').and_return(t1)
1746
+ expect(loader).to receive(:load).with(:type, 'tree2').and_return(t2)
1747
1747
 
1748
- Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
1748
+ expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
1749
1749
 
1750
1750
  t1.resolve(scope)
1751
1751
  t2.resolve(scope)
@@ -1755,11 +1755,11 @@ describe 'The type calculator' do
1755
1755
  it 'crossing recursive aliases are assignable' do
1756
1756
  t1 = type_alias_t('Tree1', 'Hash[String,Variant[String,Tree2]]')
1757
1757
  t2 = type_alias_t('Tree2', 'Hash[String,Variant[String,Tree1]]')
1758
- loader = mock
1759
- loader.expects(:load).with(:type, 'tree1').returns t1
1760
- loader.expects(:load).with(:type, 'tree2').returns t2
1758
+ loader = double
1759
+ expect(loader).to receive(:load).with(:type, 'tree1').and_return(t1)
1760
+ expect(loader).to receive(:load).with(:type, 'tree2').and_return(t2)
1761
1761
 
1762
- Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
1762
+ expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
1763
1763
 
1764
1764
  t1.resolve(loader)
1765
1765
  t2.resolve(loader)
@@ -1770,9 +1770,9 @@ describe 'The type calculator' do
1770
1770
  scope = {}
1771
1771
 
1772
1772
  ta = type_alias_t('PositiveInteger', 'Integer[0,default]')
1773
- loader = mock
1774
- loader.expects(:load).with(:type, 'positiveinteger').returns ta
1775
- Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
1773
+ loader = double
1774
+ expect(loader).to receive(:load).with(:type, 'positiveinteger').and_return(ta)
1775
+ expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
1776
1776
 
1777
1777
  t1 = type_t(range_t(0, :default))
1778
1778
  t2 = parser.parse('Type[PositiveInteger]', scope)
@@ -1783,9 +1783,9 @@ describe 'The type calculator' do
1783
1783
  scope = {}
1784
1784
 
1785
1785
  ta = type_alias_t('PositiveIntegerType', 'Type[Integer[0,default]]')
1786
- loader = mock
1787
- loader.expects(:load).with(:type, 'positiveintegertype').returns ta
1788
- Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
1786
+ loader = double
1787
+ expect(loader).to receive(:load).with(:type, 'positiveintegertype').and_return(ta)
1788
+ expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
1789
1789
 
1790
1790
  t1 = type_t(range_t(0, :default))
1791
1791
  t2 = parser.parse('PositiveIntegerType', scope)
@@ -1796,9 +1796,9 @@ describe 'The type calculator' do
1796
1796
  scope = {}
1797
1797
 
1798
1798
  ta = type_alias_t('PositiveInteger', 'Integer[0,default]')
1799
- loader = mock
1800
- loader.expects(:load).with(:type, 'positiveinteger').returns ta
1801
- Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
1799
+ loader = double
1800
+ expect(loader).to receive(:load).with(:type, 'positiveinteger').and_return(ta)
1801
+ expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
1802
1802
 
1803
1803
  t1 = type_t(type_t(range_t(0, :default)))
1804
1804
  t2 = parser.parse('Type[Type[PositiveInteger]]', scope)
@@ -1809,9 +1809,9 @@ describe 'The type calculator' do
1809
1809
  scope = {}
1810
1810
 
1811
1811
  ta = type_alias_t('PositiveIntegerType', 'Type[Integer[0,default]]')
1812
- loader = mock
1813
- loader.expects(:load).with(:type, 'positiveintegertype').returns ta
1814
- Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
1812
+ loader = double
1813
+ expect(loader).to receive(:load).with(:type, 'positiveintegertype').and_return(ta)
1814
+ expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
1815
1815
 
1816
1816
  t1 = type_t(type_t(range_t(0, :default)))
1817
1817
  t2 = parser.parse('Type[PositiveIntegerType]', scope)
@@ -2122,10 +2122,10 @@ describe 'The type calculator' do
2122
2122
 
2123
2123
  it 'should consider x an instance of the aliased type that uses self recursion' do
2124
2124
  t = type_alias_t('Tree', 'Hash[String,Variant[String,Tree]]')
2125
- loader = mock
2126
- loader.expects(:load).with(:type, 'tree').returns t
2125
+ loader = double
2126
+ expect(loader).to receive(:load).with(:type, 'tree').and_return(t)
2127
2127
 
2128
- Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
2128
+ expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
2129
2129
 
2130
2130
  t.resolve(loader)
2131
2131
  expect(calculator.instance?(t, {'a'=>{'aa'=>{'aaa'=>'aaaa'}}, 'b'=>'bb'})).to be_truthy
@@ -2134,11 +2134,11 @@ describe 'The type calculator' do
2134
2134
  it 'should consider x an instance of the aliased type that uses contains an alias that causes self recursion' do
2135
2135
  t1 = type_alias_t('Tree', 'Hash[String,Variant[String,OtherTree]]')
2136
2136
  t2 = type_alias_t('OtherTree', 'Hash[String,Tree]')
2137
- loader = mock
2138
- loader.expects(:load).with(:type, 'tree').returns t1
2139
- loader.expects(:load).with(:type, 'othertree').returns t2
2137
+ loader = double
2138
+ expect(loader).to receive(:load).with(:type, 'tree').and_return(t1)
2139
+ expect(loader).to receive(:load).with(:type, 'othertree').and_return(t2)
2140
2140
 
2141
- Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
2141
+ expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
2142
2142
 
2143
2143
  t1.resolve(loader)
2144
2144
  expect(calculator.instance?(t1, {'a'=>{'aa'=>{'aaa'=>'aaaa'}}, 'b'=>'bb'})).to be_truthy
@@ -172,39 +172,39 @@ describe TypeParser do
172
172
 
173
173
  context 'with scope context and loader' do
174
174
  let!(:scope) { {} }
175
- let(:loader) { mock }
175
+ let(:loader) { double }
176
176
 
177
177
  before :each do
178
- Adapters::LoaderAdapter.expects(:loader_for_model_object).returns loader
178
+ expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(loader)
179
179
  end
180
180
 
181
181
  it 'interprets anything that is not found by the loader to be a type reference' do
182
- loader.expects(:load).with(:type, 'nonesuch').returns nil
182
+ expect(loader).to receive(:load).with(:type, 'nonesuch').and_return(nil)
183
183
  expect(parser.parse('Nonesuch', scope)).to be_the_type(types.type_reference('Nonesuch'))
184
184
  end
185
185
 
186
186
  it 'interprets anything that is found by the loader to be what the loader found' do
187
- loader.expects(:load).with(:type, 'file').returns types.resource('File')
187
+ expect(loader).to receive(:load).with(:type, 'file').and_return(types.resource('File'))
188
188
  expect(parser.parse('File', scope)).to be_the_type(types.resource('File'))
189
189
  end
190
190
 
191
191
  it "parses a resource type with title" do
192
- loader.expects(:load).with(:type, 'file').returns types.resource('File')
192
+ expect(loader).to receive(:load).with(:type, 'file').and_return(types.resource('File'))
193
193
  expect(parser.parse("File['/tmp/foo']", scope)).to be_the_type(types.resource('file', '/tmp/foo'))
194
194
  end
195
195
 
196
196
  it "parses a resource type using 'Resource[type]' form" do
197
- loader.expects(:load).with(:type, 'file').returns types.resource('File')
197
+ expect(loader).to receive(:load).with(:type, 'file').and_return(types.resource('File'))
198
198
  expect(parser.parse("Resource[File]", scope)).to be_the_type(types.resource('file'))
199
199
  end
200
200
 
201
201
  it "parses a resource type with title using 'Resource[type, title]'" do
202
- loader.expects(:load).with(:type, 'file').returns nil
202
+ expect(loader).to receive(:load).with(:type, 'file').and_return(nil)
203
203
  expect(parser.parse("Resource[File, '/tmp/foo']", scope)).to be_the_type(types.resource('file', '/tmp/foo'))
204
204
  end
205
205
 
206
206
  it "parses a resource type with title using 'Resource[Type[title]]'" do
207
- loader.expects(:load).with(:type, 'nonesuch').returns nil
207
+ expect(loader).to receive(:load).with(:type, 'nonesuch').and_return(nil)
208
208
  expect(parser.parse("Resource[Nonesuch['fife']]", scope)).to be_the_type(types.resource('nonesuch', 'fife'))
209
209
  end
210
210
  end
@@ -213,27 +213,27 @@ describe TypeParser do
213
213
  let(:loader) { Puppet::Pops::Loader::BaseLoader.new(nil, "type_parser_unit_test_loader") }
214
214
 
215
215
  it 'interprets anything that is not found by the loader to be a type reference' do
216
- loader.expects(:load).with(:type, 'nonesuch').returns nil
216
+ expect(loader).to receive(:load).with(:type, 'nonesuch').and_return(nil)
217
217
  expect(parser.parse('Nonesuch', loader)).to be_the_type(types.type_reference('Nonesuch'))
218
218
  end
219
219
 
220
220
  it 'interprets anything that is found by the loader to be what the loader found' do
221
- loader.expects(:load).with(:type, 'file').returns types.resource('File')
221
+ expect(loader).to receive(:load).with(:type, 'file').and_return(types.resource('File'))
222
222
  expect(parser.parse('File', loader)).to be_the_type(types.resource('file'))
223
223
  end
224
224
 
225
225
  it "parses a resource type with title" do
226
- loader.expects(:load).with(:type, 'file').returns types.resource('File')
226
+ expect(loader).to receive(:load).with(:type, 'file').and_return(types.resource('File'))
227
227
  expect(parser.parse("File['/tmp/foo']", loader)).to be_the_type(types.resource('file', '/tmp/foo'))
228
228
  end
229
229
 
230
230
  it "parses a resource type using 'Resource[type]' form" do
231
- loader.expects(:load).with(:type, 'file').returns types.resource('File')
231
+ expect(loader).to receive(:load).with(:type, 'file').and_return(types.resource('File'))
232
232
  expect(parser.parse("Resource[File]", loader)).to be_the_type(types.resource('file'))
233
233
  end
234
234
 
235
235
  it "parses a resource type with title using 'Resource[type, title]'" do
236
- loader.expects(:load).with(:type, 'file').returns types.resource('File')
236
+ expect(loader).to receive(:load).with(:type, 'file').and_return(types.resource('File'))
237
237
  expect(parser.parse("Resource[File, '/tmp/foo']", loader)).to be_the_type(types.resource('file', '/tmp/foo'))
238
238
  end
239
239
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/pops'
4
3
  require 'puppet_spec/pops'
@@ -1012,7 +1011,7 @@ describe "validating 4x" do
1012
1011
  result = '$hg_oais::archivematica::requirements::automation_tools::USER' =~ Puppet::Pops::Patterns::VAR_NAME
1013
1012
  t2 = Time.now.nsec
1014
1013
  expect(result).to be(nil)
1015
- expect(t2-t).to be < 1000000 # one ms as a check for very slow operation, is in fact at ~< 10 microsecond
1014
+ expect(t2-t).to be < 1000000 # one ms as a check for very slow operation, is in fact at ~< 10 microsecond
1016
1015
  end
1017
1016
  end
1018
1017
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/pops'
4
3
 
@@ -2,7 +2,7 @@ require 'spec_helper'
2
2
  require 'puppet/property/boolean'
3
3
 
4
4
  describe Puppet::Property::Boolean do
5
- let (:resource) { mock('resource') }
5
+ let (:resource) { double('resource') }
6
6
  subject { described_class.new(:resource => resource) }
7
7
 
8
8
  [ true, :true, 'true', :yes, 'yes', 'TrUe', 'yEs' ].each do |arg|
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/property/ensure'
@@ -1,9 +1,7 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/property/keyvalue'
5
4
 
6
-
7
5
  describe 'Puppet::Property::KeyValue' do
8
6
  let(:klass) { Puppet::Property::KeyValue }
9
7
 
@@ -15,7 +13,7 @@ describe 'Puppet::Property::KeyValue' do
15
13
  before do
16
14
  # Wow that's a messy interface to the resource.
17
15
  klass.initvars
18
- @resource = stub 'resource', :[]= => nil, :property => nil
16
+ @resource = double('resource', :[]= => nil, :property => nil)
19
17
  @property = klass.new(:resource => @resource)
20
18
  klass.log_only_changed_or_new_keys = false
21
19
  end
@@ -65,20 +63,20 @@ describe 'Puppet::Property::KeyValue' do
65
63
 
66
64
  describe "when calling inclusive?" do
67
65
  it "should use the membership method to look up on the @resource" do
68
- @property.expects(:membership).returns(:key_value_membership)
69
- @resource.expects(:[]).with(:key_value_membership)
66
+ expect(@property).to receive(:membership).and_return(:key_value_membership)
67
+ expect(@resource).to receive(:[]).with(:key_value_membership)
70
68
  @property.inclusive?
71
69
  end
72
70
 
73
71
  it "should return true when @resource[membership] == inclusive" do
74
- @property.stubs(:membership).returns(:key_value_membership)
75
- @resource.stubs(:[]).with(:key_value_membership).returns(:inclusive)
72
+ allow(@property).to receive(:membership).and_return(:key_value_membership)
73
+ allow(@resource).to receive(:[]).with(:key_value_membership).and_return(:inclusive)
76
74
  expect(@property.inclusive?).to eq(true)
77
75
  end
78
76
 
79
77
  it "should return false when @resource[membership] != inclusive" do
80
- @property.stubs(:membership).returns(:key_value_membership)
81
- @resource.stubs(:[]).with(:key_value_membership).returns(:minimum)
78
+ allow(@property).to receive(:membership).and_return(:key_value_membership)
79
+ allow(@resource).to receive(:[]).with(:key_value_membership).and_return(:minimum)
82
80
  expect(@property.inclusive?).to eq(false)
83
81
  end
84
82
  end
@@ -89,12 +87,12 @@ describe 'Puppet::Property::KeyValue' do
89
87
  end
90
88
 
91
89
  it "should set every key to nil if inclusive?" do
92
- @property.stubs(:inclusive?).returns(true)
90
+ allow(@property).to receive(:inclusive?).and_return(true)
93
91
  expect(@property.process_current_hash({:foo => "bar", :do => "re"})).to eq({ :foo => nil, :do => nil })
94
92
  end
95
93
 
96
94
  it "should return the hash if !inclusive?" do
97
- @property.stubs(:inclusive?).returns(false)
95
+ allow(@property).to receive(:inclusive?).and_return(false)
98
96
  expect(@property.process_current_hash({:foo => "bar", :do => "re"})).to eq({:foo => "bar", :do => "re"})
99
97
  end
100
98
  end
@@ -106,22 +104,22 @@ describe 'Puppet::Property::KeyValue' do
106
104
 
107
105
  it "should call process_current_hash" do
108
106
  @property.should = ["foo=baz", "bar=boo"]
109
- @property.stubs(:retrieve).returns({:do => "re", :mi => "fa" })
110
- @property.expects(:process_current_hash).returns({})
107
+ allow(@property).to receive(:retrieve).and_return({:do => "re", :mi => "fa" })
108
+ expect(@property).to receive(:process_current_hash).and_return({})
111
109
  @property.should
112
110
  end
113
111
 
114
112
  it "should return the hashed values of @should and the nilled values of retrieve if inclusive" do
115
113
  @property.should = ["foo=baz", "bar=boo"]
116
- @property.expects(:retrieve).returns({:do => "re", :mi => "fa" })
117
- @property.expects(:inclusive?).returns(true)
114
+ expect(@property).to receive(:retrieve).and_return({:do => "re", :mi => "fa" })
115
+ expect(@property).to receive(:inclusive?).and_return(true)
118
116
  expect(@property.should).to eq({ :foo => "baz", :bar => "boo", :do => nil, :mi => nil })
119
117
  end
120
118
 
121
119
  it "should return the hashed @should + the unique values of retrieve if !inclusive" do
122
120
  @property.should = ["foo=baz", "bar=boo"]
123
- @property.expects(:retrieve).returns({:foo => "diff", :do => "re", :mi => "fa"})
124
- @property.expects(:inclusive?).returns(false)
121
+ expect(@property).to receive(:retrieve).and_return({:foo => "diff", :do => "re", :mi => "fa"})
122
+ expect(@property).to receive(:inclusive?).and_return(false)
125
123
  expect(@property.should).to eq({ :foo => "baz", :bar => "boo", :do => "re", :mi => "fa" })
126
124
  end
127
125
 
@@ -132,14 +130,14 @@ describe 'Puppet::Property::KeyValue' do
132
130
  :key3 => "new_value3",
133
131
  :key4 => "value4"
134
132
  }
135
- @property.stubs(:retrieve).returns(
133
+ allow(@property).to receive(:retrieve).and_return(
136
134
  {
137
135
  :key1 => "value1",
138
136
  :key2 => "value2",
139
137
  :key3 => "value3"
140
138
  }
141
139
  )
142
- @property.stubs(:inclusive?).returns(false)
140
+ allow(@property).to receive(:inclusive?).and_return(false)
143
141
 
144
142
  @property.should
145
143
  expect(@property.instance_variable_get(:@changed_or_new_keys)).to eql([:key1, :key3, :key4])
@@ -148,25 +146,25 @@ describe 'Puppet::Property::KeyValue' do
148
146
 
149
147
  describe "when calling retrieve" do
150
148
  before do
151
- @provider = mock("provider")
152
- @property.stubs(:provider).returns(@provider)
149
+ @provider = double("provider")
150
+ allow(@property).to receive(:provider).and_return(@provider)
153
151
  end
154
152
 
155
153
  it "should send 'name' to the provider" do
156
- @provider.expects(:send).with(:keys)
157
- @property.expects(:name).returns(:keys)
154
+ expect(@provider).to receive(:send).with(:keys)
155
+ expect(@property).to receive(:name).and_return(:keys)
158
156
  @property.retrieve
159
157
  end
160
158
 
161
159
  it "should return a hash with the provider returned info" do
162
- @provider.stubs(:send).with(:keys).returns({"do" => "re", "mi" => "fa" })
163
- @property.stubs(:name).returns(:keys)
160
+ allow(@provider).to receive(:send).with(:keys).and_return({"do" => "re", "mi" => "fa" })
161
+ allow(@property).to receive(:name).and_return(:keys)
164
162
  @property.retrieve == {"do" => "re", "mi" => "fa" }
165
163
  end
166
164
 
167
165
  it "should return :absent when the provider returns :absent" do
168
- @provider.stubs(:send).with(:keys).returns(:absent)
169
- @property.stubs(:name).returns(:keys)
166
+ allow(@provider).to receive(:send).with(:keys).and_return(:absent)
167
+ allow(@property).to receive(:name).and_return(:keys)
170
168
  @property.retrieve == :absent
171
169
  end
172
170
  end
@@ -185,9 +183,9 @@ describe 'Puppet::Property::KeyValue' do
185
183
 
186
184
  describe "when calling safe_insync?" do
187
185
  before do
188
- @provider = mock("provider")
189
- @property.stubs(:provider).returns(@provider)
190
- @property.stubs(:name).returns(:prop_name)
186
+ @provider = double("provider")
187
+ allow(@property).to receive(:provider).and_return(@provider)
188
+ allow(@property).to receive(:name).and_return(:prop_name)
191
189
  end
192
190
 
193
191
  it "should return true unless @should is defined and not nil" do
@@ -199,16 +197,16 @@ describe 'Puppet::Property::KeyValue' do
199
197
  end
200
198
 
201
199
  it "should return true if hashified should value == (retrieved) value passed in" do
202
- @provider.stubs(:prop_name).returns({ :foo => "baz", :bar => "boo" })
200
+ allow(@provider).to receive(:prop_name).and_return({ :foo => "baz", :bar => "boo" })
203
201
  @property.should = ["foo=baz", "bar=boo"]
204
- @property.expects(:inclusive?).returns(true)
202
+ expect(@property).to receive(:inclusive?).and_return(true)
205
203
  expect(@property.safe_insync?({ :foo => "baz", :bar => "boo" })).to eq(true)
206
204
  end
207
205
 
208
206
  it "should return false if prepared value != should value" do
209
- @provider.stubs(:prop_name).returns({ "foo" => "bee", "bar" => "boo" })
207
+ allow(@provider).to receive(:prop_name).and_return({ "foo" => "bee", "bar" => "boo" })
210
208
  @property.should = ["foo=baz", "bar=boo"]
211
- @property.expects(:inclusive?).returns(true)
209
+ expect(@property).to receive(:inclusive?).and_return(true)
212
210
  expect(@property.safe_insync?({ "foo" => "bee", "bar" => "boo" })).to eq(false)
213
211
  end
214
212
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/property/list'
@@ -15,7 +14,7 @@ describe list_class do
15
14
  before do
16
15
  # Wow that's a messy interface to the resource.
17
16
  list_class.initvars
18
- @resource = stub 'resource', :[]= => nil, :property => nil
17
+ @resource = double('resource', :[]= => nil, :property => nil)
19
18
  @property = list_class.new(:resource => @resource)
20
19
  end
21
20
 
@@ -55,20 +54,20 @@ describe list_class do
55
54
 
56
55
  describe "when calling inclusive?" do
57
56
  it "should use the membership method to look up on the @resource" do
58
- @property.expects(:membership).returns(:membership)
59
- @resource.expects(:[]).with(:membership)
57
+ expect(@property).to receive(:membership).and_return(:membership)
58
+ expect(@resource).to receive(:[]).with(:membership)
60
59
  @property.inclusive?
61
60
  end
62
61
 
63
62
  it "should return true when @resource[membership] == inclusive" do
64
- @property.stubs(:membership).returns(:membership)
65
- @resource.stubs(:[]).with(:membership).returns(:inclusive)
63
+ allow(@property).to receive(:membership).and_return(:membership)
64
+ allow(@resource).to receive(:[]).with(:membership).and_return(:inclusive)
66
65
  expect(@property.inclusive?).to eq(true)
67
66
  end
68
67
 
69
68
  it "should return false when @resource[membership] != inclusive" do
70
- @property.stubs(:membership).returns(:membership)
71
- @resource.stubs(:[]).with(:membership).returns(:minimum)
69
+ allow(@property).to receive(:membership).and_return(:membership)
70
+ allow(@resource).to receive(:[]).with(:membership).and_return(:minimum)
72
71
  expect(@property.inclusive?).to eq(false)
73
72
  end
74
73
  end
@@ -80,14 +79,14 @@ describe list_class do
80
79
 
81
80
  it "should return the sorted values of @should as a string if inclusive" do
82
81
  @property.should = ["foo", "bar"]
83
- @property.expects(:inclusive?).returns(true)
82
+ expect(@property).to receive(:inclusive?).and_return(true)
84
83
  expect(@property.should).to eq("bar,foo")
85
84
  end
86
85
 
87
86
  it "should return the uniq sorted values of @should + retrieve as a string if !inclusive" do
88
87
  @property.should = ["foo", "bar"]
89
- @property.expects(:inclusive?).returns(false)
90
- @property.expects(:retrieve).returns(["foo","baz"])
88
+ expect(@property).to receive(:inclusive?).and_return(false)
89
+ expect(@property).to receive(:retrieve).and_return(["foo","baz"])
91
90
  expect(@property.should).to eq("bar,baz,foo")
92
91
  end
93
92
  end
@@ -95,25 +94,25 @@ describe list_class do
95
94
  describe "when calling retrieve" do
96
95
  let(:provider) { @provider }
97
96
  before do
98
- @provider = mock("provider")
99
- @property.stubs(:provider).returns(provider)
97
+ @provider = double("provider")
98
+ allow(@property).to receive(:provider).and_return(provider)
100
99
  end
101
100
 
102
101
  it "should send 'name' to the provider" do
103
- @provider.expects(:send).with(:group)
104
- @property.expects(:name).returns(:group)
102
+ expect(@provider).to receive(:send).with(:group)
103
+ expect(@property).to receive(:name).and_return(:group)
105
104
  @property.retrieve
106
105
  end
107
106
 
108
107
  it "should return an array with the provider returned info" do
109
- @provider.stubs(:send).with(:group).returns("foo,bar,baz")
110
- @property.stubs(:name).returns(:group)
108
+ allow(@provider).to receive(:send).with(:group).and_return("foo,bar,baz")
109
+ allow(@property).to receive(:name).and_return(:group)
111
110
  @property.retrieve == ["foo", "bar", "baz"]
112
111
  end
113
112
 
114
113
  it "should return :absent when the provider returns :absent" do
115
- @provider.stubs(:send).with(:group).returns(:absent)
116
- @property.stubs(:name).returns(:group)
114
+ allow(@provider).to receive(:send).with(:group).and_return(:absent)
115
+ allow(@property).to receive(:name).and_return(:group)
117
116
  @property.retrieve == :absent
118
117
  end
119
118
 
@@ -137,35 +136,35 @@ describe list_class do
137
136
 
138
137
  it "should call prepare_is_for_comparison with value passed in and should" do
139
138
  @property.should = "foo"
140
- @property.expects(:prepare_is_for_comparison).with("bar")
141
- @property.expects(:should)
139
+ expect(@property).to receive(:prepare_is_for_comparison).with("bar")
140
+ expect(@property).to receive(:should)
142
141
  @property.safe_insync?("bar")
143
142
  end
144
143
 
145
144
  it "should return true if 'is' value is array of comma delimited should values" do
146
145
  @property.should = "bar,foo"
147
- @property.expects(:inclusive?).returns(true)
146
+ expect(@property).to receive(:inclusive?).and_return(true)
148
147
  expect(@property).to be_safe_insync(["bar","foo"])
149
148
  end
150
149
 
151
150
  it "should return true if 'is' value is :absent and should value is empty string" do
152
151
  @property.should = ""
153
- @property.expects(:inclusive?).returns(true)
152
+ expect(@property).to receive(:inclusive?).and_return(true)
154
153
  expect(@property).to be_safe_insync([])
155
154
  end
156
155
 
157
156
  it "should return false if prepared value != should value" do
158
157
  @property.should = "bar,baz,foo"
159
- @property.expects(:inclusive?).returns(true)
158
+ expect(@property).to receive(:inclusive?).and_return(true)
160
159
  expect(@property).to_not be_safe_insync(["bar","foo"])
161
160
  end
162
161
  end
163
162
 
164
163
  describe "when calling dearrayify" do
165
164
  it "should sort and join the array with 'delimiter'" do
166
- array = mock "array"
167
- array.expects(:sort).returns(array)
168
- array.expects(:join).with(@property.delimiter)
165
+ array = double("array")
166
+ expect(array).to receive(:sort).and_return(array)
167
+ expect(array).to receive(:join).with(@property.delimiter)
169
168
  @property.dearrayify(array)
170
169
  end
171
170
  end