blacklight 7.33.0 → 8.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (387) hide show
  1. checksums.yaml +4 -4
  2. data/.env +2 -2
  3. data/.github/workflows/ruby.yml +32 -107
  4. data/.rubocop.yml +243 -2
  5. data/.rubocop_todo.yml +214 -270
  6. data/Gemfile +7 -6
  7. data/README.md +11 -3
  8. data/VERSION +1 -1
  9. data/app/assets/javascripts/blacklight/blacklight.esm.js +384 -0
  10. data/app/assets/javascripts/blacklight/blacklight.esm.js.map +1 -0
  11. data/app/assets/javascripts/blacklight/blacklight.js +351 -496
  12. data/app/assets/javascripts/blacklight/blacklight.js.map +1 -0
  13. data/app/assets/stylesheets/blacklight/_autocomplete.scss +25 -0
  14. data/app/assets/stylesheets/blacklight/_blacklight_base.scss +1 -1
  15. data/app/assets/stylesheets/blacklight/_bookmark.scss +16 -0
  16. data/app/assets/stylesheets/blacklight/_bootstrap_overrides.scss +8 -0
  17. data/app/assets/stylesheets/blacklight/_facets.scss +72 -44
  18. data/app/assets/stylesheets/blacklight/_header.scss +0 -15
  19. data/app/assets/stylesheets/blacklight/_icons.scss +0 -14
  20. data/app/assets/stylesheets/blacklight/_mixins.scss +20 -0
  21. data/app/assets/stylesheets/blacklight/_modal.scss +8 -2
  22. data/app/assets/stylesheets/blacklight/_search_form.scss +30 -3
  23. data/app/assets/stylesheets/blacklight/_search_history.scss +10 -1
  24. data/app/assets/stylesheets/blacklight/_search_results.scss +6 -2
  25. data/app/assets/stylesheets/blacklight/blacklight_defaults.scss +4 -1
  26. data/app/builders/blacklight/action_builder.rb +18 -9
  27. data/app/components/blacklight/advanced_search_form_component.html.erb +1 -1
  28. data/app/components/blacklight/advanced_search_form_component.rb +4 -6
  29. data/app/components/blacklight/constraints_component.rb +27 -37
  30. data/app/components/blacklight/document/action_component.html.erb +2 -9
  31. data/app/components/blacklight/document/action_component.rb +26 -8
  32. data/app/components/blacklight/document/actions_component.rb +1 -1
  33. data/app/components/blacklight/document/bookmark_component.html.erb +9 -0
  34. data/app/components/blacklight/document/bookmark_component.rb +4 -2
  35. data/app/components/blacklight/document/citation_component.rb +5 -3
  36. data/app/components/blacklight/document/group_component.rb +7 -3
  37. data/app/components/blacklight/document/sidebar_component.html.erb +2 -0
  38. data/app/components/blacklight/document/sidebar_component.rb +16 -0
  39. data/app/components/blacklight/document/thumbnail_component.html.erb +2 -7
  40. data/app/components/blacklight/document/thumbnail_component.rb +1 -9
  41. data/app/components/blacklight/document_component.html.erb +4 -0
  42. data/app/components/blacklight/document_component.rb +7 -23
  43. data/app/components/blacklight/document_metadata_component.rb +5 -6
  44. data/app/components/blacklight/document_title_component.rb +4 -1
  45. data/app/components/blacklight/facet_component.rb +1 -1
  46. data/app/components/blacklight/facet_field_checkboxes_component.html.erb +1 -1
  47. data/app/components/blacklight/facet_field_checkboxes_component.rb +1 -1
  48. data/app/components/blacklight/facet_field_component.html.erb +5 -5
  49. data/app/components/blacklight/facet_field_component.rb +9 -2
  50. data/app/components/blacklight/facet_field_list_component.html.erb +1 -1
  51. data/app/components/blacklight/facet_field_list_component.rb +37 -5
  52. data/app/components/blacklight/facet_field_no_layout_component.rb +0 -2
  53. data/app/components/blacklight/facet_item_component.rb +1 -43
  54. data/app/components/blacklight/facet_item_pivot_component.rb +21 -23
  55. data/app/components/blacklight/header_component.html.erb +2 -0
  56. data/app/components/blacklight/header_component.rb +26 -0
  57. data/app/components/blacklight/hidden_search_state_component.rb +1 -2
  58. data/app/components/blacklight/icons/legacy_icon_component.rb +30 -0
  59. data/app/components/blacklight/icons/list_component.rb +16 -0
  60. data/app/components/blacklight/icons/search_component.rb +16 -0
  61. data/app/components/blacklight/metadata_field_component.rb +24 -8
  62. data/app/components/blacklight/metadata_field_layout_component.rb +0 -18
  63. data/app/components/blacklight/response/facet_group_component.html.erb +3 -5
  64. data/app/components/blacklight/response/facet_group_component.rb +29 -8
  65. data/app/components/blacklight/response/sort_component.rb +1 -1
  66. data/app/components/blacklight/response/spellcheck_component.rb +17 -6
  67. data/app/components/blacklight/response/view_type_button_component.rb +2 -6
  68. data/app/components/blacklight/response/view_type_component.rb +2 -4
  69. data/app/components/blacklight/search/sidebar_component.html.erb +8 -0
  70. data/app/components/blacklight/search/sidebar_component.rb +17 -0
  71. data/app/components/blacklight/search_bar_component.html.erb +20 -15
  72. data/app/components/blacklight/search_bar_component.rb +2 -16
  73. data/app/components/blacklight/search_button_component.rb +3 -3
  74. data/app/components/blacklight/search_context_component.rb +43 -9
  75. data/app/components/blacklight/search_header_component.html.erb +2 -0
  76. data/app/components/blacklight/search_header_component.rb +6 -0
  77. data/app/components/blacklight/search_navbar_component.html.erb +5 -0
  78. data/app/components/blacklight/search_navbar_component.rb +34 -0
  79. data/app/components/blacklight/start_over_button_component.rb +5 -3
  80. data/app/components/blacklight/system/flash_message_component.html.erb +3 -1
  81. data/app/components/blacklight/system/flash_message_component.rb +10 -1
  82. data/app/components/blacklight/system/modal_component.html.erb +1 -1
  83. data/app/components/blacklight/system/modal_component.rb +0 -2
  84. data/app/components/blacklight/top_navbar_component.html.erb +12 -0
  85. data/app/components/blacklight/top_navbar_component.rb +13 -0
  86. data/app/controllers/bookmarks_controller.rb +1 -0
  87. data/app/controllers/catalog_controller.rb +1 -0
  88. data/app/controllers/concerns/blacklight/bookmarks.rb +10 -5
  89. data/app/controllers/concerns/blacklight/catalog.rb +21 -72
  90. data/app/controllers/concerns/blacklight/controller.rb +6 -43
  91. data/app/controllers/concerns/blacklight/search_context.rb +25 -7
  92. data/app/controllers/concerns/blacklight/search_history.rb +2 -0
  93. data/app/controllers/concerns/blacklight/searchable.rb +12 -1
  94. data/app/controllers/concerns/blacklight/token_based_user.rb +1 -0
  95. data/app/controllers/search_history_controller.rb +1 -0
  96. data/app/helpers/blacklight/blacklight_helper_behavior.rb +10 -308
  97. data/app/helpers/blacklight/catalog_helper_behavior.rb +22 -137
  98. data/app/helpers/blacklight/component_helper_behavior.rb +2 -53
  99. data/app/helpers/blacklight/configuration_helper_behavior.rb +2 -117
  100. data/app/helpers/blacklight/facets_helper_behavior.rb +4 -321
  101. data/app/helpers/blacklight/icon_helper_behavior.rb +5 -4
  102. data/app/helpers/blacklight/layout_helper_behavior.rb +1 -0
  103. data/app/helpers/blacklight/render_partials_helper_behavior.rb +11 -30
  104. data/app/helpers/blacklight/url_helper_behavior.rb +13 -97
  105. data/app/helpers/blacklight_helper.rb +1 -0
  106. data/app/helpers/catalog_helper.rb +1 -0
  107. data/app/javascript/blacklight/bookmark_toggle.js +13 -19
  108. data/app/javascript/blacklight/button_focus.js +12 -10
  109. data/app/javascript/blacklight/checkbox_submit.js +68 -122
  110. data/app/javascript/blacklight/core.js +6 -5
  111. data/app/javascript/blacklight/index.js +13 -0
  112. data/app/javascript/blacklight/modal.js +99 -164
  113. data/app/javascript/blacklight/modalForm.js +60 -0
  114. data/app/javascript/blacklight/search_context.js +45 -55
  115. data/app/models/blacklight/facet_paginator.rb +3 -2
  116. data/app/models/blacklight/icon.rb +4 -2
  117. data/app/models/bookmark.rb +0 -2
  118. data/app/models/concerns/blacklight/configurable.rb +5 -4
  119. data/app/models/concerns/blacklight/document/active_model_shim.rb +1 -0
  120. data/app/models/concerns/blacklight/document/attributes.rb +50 -0
  121. data/app/models/concerns/blacklight/document/cache_key.rb +1 -0
  122. data/app/models/concerns/blacklight/document/dublin_core.rb +2 -1
  123. data/app/models/concerns/blacklight/document/email.rb +1 -0
  124. data/app/models/concerns/blacklight/document/export.rb +2 -1
  125. data/app/models/concerns/blacklight/document/extensions.rb +1 -0
  126. data/app/models/concerns/blacklight/document/schema_org.rb +1 -0
  127. data/app/models/concerns/blacklight/document/semantic_fields.rb +1 -0
  128. data/app/models/concerns/blacklight/document/sms.rb +1 -0
  129. data/app/models/concerns/blacklight/document.rb +12 -20
  130. data/app/models/concerns/blacklight/suggest/response.rb +1 -0
  131. data/app/models/concerns/blacklight/user.rb +17 -8
  132. data/app/models/record_mailer.rb +13 -12
  133. data/app/models/search.rb +0 -1
  134. data/app/models/solr_document.rb +1 -0
  135. data/app/presenters/blacklight/clause_presenter.rb +1 -1
  136. data/app/presenters/blacklight/document_presenter.rb +13 -21
  137. data/app/presenters/blacklight/facet_field_presenter.rb +39 -14
  138. data/app/presenters/blacklight/facet_grouped_item_presenter.rb +1 -5
  139. data/app/presenters/blacklight/facet_item_pivot_presenter.rb +60 -0
  140. data/app/presenters/blacklight/facet_item_presenter.rb +3 -9
  141. data/app/presenters/blacklight/field_presenter.rb +1 -0
  142. data/app/presenters/blacklight/index_presenter.rb +2 -40
  143. data/app/presenters/blacklight/json_presenter.rb +7 -5
  144. data/app/presenters/blacklight/rendering/join.rb +1 -1
  145. data/app/presenters/blacklight/rendering/link_to_facet.rb +2 -5
  146. data/app/presenters/blacklight/show_presenter.rb +1 -9
  147. data/app/presenters/blacklight/thumbnail_presenter.rb +1 -1
  148. data/app/services/blacklight/bookmarks_search_builder.rb +22 -0
  149. data/app/services/blacklight/field_retriever.rb +1 -8
  150. data/app/services/blacklight/search_service.rb +8 -7
  151. data/app/values/blacklight/types.rb +95 -11
  152. data/app/views/bookmarks/_clear_bookmarks_widget.html.erb +8 -1
  153. data/app/views/bookmarks/_tools.html.erb +7 -12
  154. data/app/views/catalog/_advanced_search_form.html.erb +0 -1
  155. data/app/views/catalog/_bookmark_control.html.erb +1 -1
  156. data/app/views/catalog/_constraints.html.erb +1 -14
  157. data/app/views/catalog/_document.atom.builder +12 -14
  158. data/app/views/catalog/_document.html.erb +5 -3
  159. data/app/views/catalog/_document.rss.builder +2 -4
  160. data/app/views/catalog/_facets.html.erb +5 -4
  161. data/app/views/catalog/_home_text.html.erb +2 -14
  162. data/app/views/catalog/_search_form.html.erb +3 -3
  163. data/app/views/catalog/_search_header.html.erb +1 -2
  164. data/app/views/catalog/_search_results.html.erb +2 -2
  165. data/app/views/catalog/_search_sidebar.html.erb +5 -1
  166. data/app/views/catalog/_show_main_content.html.erb +10 -15
  167. data/app/views/catalog/_show_sidebar.html.erb +2 -2
  168. data/app/views/catalog/_show_tools.html.erb +7 -12
  169. data/app/views/catalog/_view_type_group.html.erb +1 -1
  170. data/app/views/catalog/email_success.html.erb +5 -6
  171. data/app/views/catalog/facet.html.erb +4 -2
  172. data/app/views/catalog/index.atom.builder +12 -14
  173. data/app/views/catalog/index.html.erb +4 -1
  174. data/app/views/catalog/index.json.jbuilder +19 -19
  175. data/app/views/catalog/index.rss.builder +1 -1
  176. data/app/views/catalog/opensearch.xml.builder +1 -1
  177. data/app/views/catalog/sms_success.html.erb +5 -6
  178. data/app/views/catalog/suggest.html.erb +3 -0
  179. data/app/views/layouts/blacklight/base.html.erb +20 -9
  180. data/app/views/search_history/index.html.erb +6 -2
  181. data/app/views/shared/_header_navbar.html.erb +1 -22
  182. data/app/views/shared/_modal.html.erb +3 -3
  183. data/blacklight.gemspec +6 -8
  184. data/config/importmap.rb +3 -0
  185. data/config/locales/blacklight.ar.yml +0 -1
  186. data/config/locales/blacklight.ca.yml +0 -1
  187. data/config/locales/blacklight.de.yml +0 -1
  188. data/config/locales/blacklight.en.yml +0 -1
  189. data/config/locales/blacklight.es.yml +0 -1
  190. data/config/locales/blacklight.fr.yml +0 -1
  191. data/config/locales/blacklight.hu.yml +0 -1
  192. data/config/locales/blacklight.it.yml +0 -1
  193. data/config/locales/blacklight.nl.yml +0 -1
  194. data/config/locales/blacklight.pt-BR.yml +0 -1
  195. data/config/locales/blacklight.sq.yml +0 -1
  196. data/config/locales/blacklight.zh.yml +0 -1
  197. data/config/routes.rb +3 -2
  198. data/db/migrate/20140202020201_create_searches.rb +1 -0
  199. data/db/migrate/20140202020202_create_bookmarks.rb +1 -0
  200. data/db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb +1 -0
  201. data/lib/blacklight/abstract_repository.rb +1 -0
  202. data/lib/blacklight/configuration/context.rb +4 -4
  203. data/lib/blacklight/configuration/display_field.rb +7 -9
  204. data/lib/blacklight/configuration/facet_field.rb +17 -11
  205. data/lib/blacklight/configuration/field.rb +1 -0
  206. data/lib/blacklight/configuration/fields.rb +12 -15
  207. data/lib/blacklight/configuration/index_field.rb +1 -0
  208. data/lib/blacklight/configuration/null_display_field.rb +17 -0
  209. data/lib/blacklight/configuration/search_field.rb +1 -0
  210. data/lib/blacklight/configuration/show_field.rb +1 -0
  211. data/lib/blacklight/configuration/sort_field.rb +1 -0
  212. data/lib/blacklight/configuration/tool_config.rb +1 -0
  213. data/lib/blacklight/configuration/view_config.rb +16 -6
  214. data/lib/blacklight/configuration.rb +318 -341
  215. data/lib/blacklight/engine.rb +10 -11
  216. data/lib/blacklight/exceptions.rb +2 -2
  217. data/lib/blacklight/nested_open_struct_with_hash_access.rb +6 -12
  218. data/lib/blacklight/open_struct_with_hash_access.rb +19 -17
  219. data/lib/blacklight/parameters.rb +7 -21
  220. data/lib/blacklight/routes/exportable.rb +1 -0
  221. data/lib/blacklight/routes/searchable.rb +2 -1
  222. data/lib/blacklight/routes.rb +1 -0
  223. data/lib/blacklight/search_builder.rb +10 -10
  224. data/lib/blacklight/search_state/filter_field.rb +8 -25
  225. data/lib/blacklight/search_state/pivot_filter_field.rb +144 -0
  226. data/lib/blacklight/search_state.rb +23 -79
  227. data/lib/blacklight/solr/document.rb +1 -0
  228. data/lib/blacklight/solr/facet_paginator.rb +1 -0
  229. data/lib/blacklight/solr/repository.rb +1 -0
  230. data/lib/blacklight/solr/request.rb +3 -0
  231. data/lib/blacklight/solr/response/facets.rb +21 -5
  232. data/lib/blacklight/solr/response/group.rb +1 -0
  233. data/lib/blacklight/solr/response/group_response.rb +1 -0
  234. data/lib/blacklight/solr/response/more_like_this.rb +1 -0
  235. data/lib/blacklight/solr/response/pagination_methods.rb +4 -3
  236. data/lib/blacklight/solr/response/params.rb +5 -4
  237. data/lib/blacklight/solr/response/response.rb +1 -0
  238. data/lib/blacklight/solr/response/spelling.rb +1 -0
  239. data/lib/blacklight/solr/response.rb +4 -3
  240. data/lib/blacklight/solr/search_builder_behavior.rb +16 -32
  241. data/lib/blacklight/solr.rb +1 -0
  242. data/lib/blacklight/version.rb +1 -0
  243. data/lib/blacklight.rb +8 -11
  244. data/lib/generators/blacklight/assets/importmap_generator.rb +55 -0
  245. data/lib/generators/blacklight/assets/propshaft_generator.rb +25 -0
  246. data/lib/generators/blacklight/assets/sprockets_generator.rb +66 -0
  247. data/lib/generators/blacklight/assets_generator.rb +13 -89
  248. data/lib/generators/blacklight/controller_generator.rb +3 -2
  249. data/lib/generators/blacklight/document_generator.rb +1 -0
  250. data/lib/generators/blacklight/install_generator.rb +5 -4
  251. data/lib/generators/blacklight/models_generator.rb +1 -0
  252. data/lib/generators/blacklight/search_builder_generator.rb +1 -0
  253. data/lib/generators/blacklight/solr_generator.rb +1 -1
  254. data/lib/generators/blacklight/templates/catalog_controller.rb +37 -7
  255. data/lib/generators/blacklight/templates/solr_document.rb +1 -1
  256. data/lib/generators/blacklight/test_support_generator.rb +4 -2
  257. data/lib/generators/blacklight/user_generator.rb +7 -9
  258. data/lib/railties/blacklight.rake +2 -3
  259. data/package.json +9 -12
  260. data/rollup.config.js +27 -0
  261. data/spec/components/blacklight/constraints_component_spec.rb +17 -13
  262. data/spec/components/blacklight/document_component_spec.rb +12 -22
  263. data/spec/components/blacklight/facet_component_spec.rb +2 -7
  264. data/spec/components/blacklight/facet_field_checkboxes_component_spec.rb +1 -2
  265. data/spec/components/blacklight/facet_field_list_component_spec.rb +7 -6
  266. data/spec/components/blacklight/facet_item_pivot_component_spec.rb +9 -7
  267. data/spec/components/blacklight/response/view_type_component_spec.rb +66 -0
  268. data/spec/components/blacklight/search_context_component_spec.rb +40 -0
  269. data/spec/controllers/blacklight/catalog/component_configuration_spec.rb +1 -6
  270. data/spec/controllers/blacklight/{base_spec.rb → catalog_spec.rb} +2 -2
  271. data/spec/controllers/bookmarks_controller_spec.rb +2 -3
  272. data/spec/controllers/catalog_controller_spec.rb +13 -127
  273. data/spec/features/autocomplete_spec.rb +1 -1
  274. data/spec/features/axe_spec.rb +1 -1
  275. data/spec/features/bookmarks_spec.rb +1 -1
  276. data/spec/features/facets_spec.rb +1 -1
  277. data/spec/features/search_context_spec.rb +4 -10
  278. data/spec/features/search_results_spec.rb +0 -33
  279. data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb +2 -138
  280. data/spec/helpers/blacklight/facets_helper_behavior_spec.rb +0 -387
  281. data/spec/helpers/blacklight/icon_helper_behavior_spec.rb +8 -0
  282. data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb +5 -7
  283. data/spec/helpers/blacklight/url_helper_behavior_spec.rb +9 -131
  284. data/spec/helpers/blacklight_helper_spec.rb +3 -242
  285. data/spec/helpers/catalog_helper_spec.rb +7 -118
  286. data/spec/i18n_spec.rb +1 -0
  287. data/spec/integration/generators/blacklight/solr_generator_spec.rb +1 -1
  288. data/spec/lib/blacklight/configuration/facet_field_spec.rb +27 -16
  289. data/spec/lib/blacklight/configuration/field_spec.rb +1 -1
  290. data/spec/lib/blacklight/configuration/view_config_spec.rb +1 -1
  291. data/spec/lib/blacklight/open_struct_with_hash_access_spec.rb +2 -2
  292. data/spec/lib/blacklight/parameters_spec.rb +1 -4
  293. data/spec/lib/blacklight/search_state/filter_field_spec.rb +4 -4
  294. data/spec/lib/blacklight/search_state/pivot_filter_field_spec.rb +117 -0
  295. data/spec/lib/blacklight/search_state_spec.rb +80 -198
  296. data/spec/lib/tasks/blacklight_task_spec.rb +1 -0
  297. data/spec/models/blacklight/configuration_spec.rb +39 -51
  298. data/spec/models/blacklight/document/active_model_shim_spec.rb +2 -2
  299. data/spec/models/blacklight/icon_spec.rb +31 -15
  300. data/spec/models/blacklight/search_builder_spec.rb +9 -9
  301. data/spec/models/blacklight/solr/document_spec.rb +3 -3
  302. data/spec/models/blacklight/solr/response/facets_spec.rb +27 -27
  303. data/spec/models/blacklight/solr/response/group_response_spec.rb +1 -0
  304. data/spec/models/blacklight/solr/response/group_spec.rb +1 -0
  305. data/spec/models/blacklight/solr/response_spec.rb +9 -2
  306. data/spec/models/blacklight/solr/search_builder_spec.rb +32 -23
  307. data/spec/models/blacklight/user_spec.rb +22 -0
  308. data/spec/models/solr_document_spec.rb +21 -3
  309. data/spec/presenters/blacklight/clause_presenter_spec.rb +1 -0
  310. data/spec/presenters/blacklight/document_presenter_spec.rb +2 -2
  311. data/spec/presenters/blacklight/facet_field_presenter_spec.rb +85 -12
  312. data/spec/presenters/blacklight/facet_grouped_item_presenter_spec.rb +1 -0
  313. data/spec/presenters/blacklight/facet_item_presenter_spec.rb +14 -13
  314. data/spec/presenters/blacklight/field_presenter_spec.rb +0 -14
  315. data/spec/presenters/blacklight/index_presenter_spec.rb +2 -4
  316. data/spec/presenters/blacklight/json_presenter_spec.rb +1 -0
  317. data/spec/presenters/blacklight/link_alternate_presenter_spec.rb +3 -2
  318. data/spec/presenters/blacklight/show_presenter_spec.rb +10 -25
  319. data/spec/presenters/thumbnail_presenter_spec.rb +1 -1
  320. data/spec/requests/load_suggestions_spec.rb +16 -0
  321. data/spec/routing/catalog_routing_spec.rb +2 -1
  322. data/spec/services/blacklight/search_service_spec.rb +31 -68
  323. data/spec/spec_helper.rb +3 -2
  324. data/spec/support/controller_level_helpers.rb +1 -2
  325. data/spec/support/features/search_helpers.rb +39 -0
  326. data/spec/support/features/session_helpers.rb +1 -0
  327. data/spec/support/features.rb +3 -0
  328. data/spec/test_app_templates/lib/generators/test_app_generator.rb +9 -2
  329. data/spec/views/catalog/_document.html.erb_spec.rb +3 -34
  330. data/spec/views/catalog/_facet_index_navigation.html.erb_spec.rb +1 -1
  331. data/spec/views/catalog/_search_header.erb_spec.rb +1 -0
  332. data/spec/views/catalog/_show_sidebar.erb_spec.rb +1 -0
  333. data/spec/views/catalog/_show_tools.html.erb_spec.rb +7 -54
  334. data/spec/views/catalog/_view_type_group.html.erb_spec.rb +17 -9
  335. data/spec/views/catalog/email_success.html.erb_spec.rb +2 -2
  336. data/spec/views/catalog/facet.html.erb_spec.rb +6 -3
  337. data/spec/views/catalog/index.atom.builder_spec.rb +18 -11
  338. data/spec/views/catalog/index.html.erb_spec.rb +5 -6
  339. data/spec/views/catalog/index.json.jbuilder_spec.rb +2 -2
  340. data/spec/views/catalog/show.html.erb_spec.rb +3 -25
  341. data/spec/views/catalog/sms_success.html.erb_spec.rb +2 -2
  342. data/tasks/blacklight.rake +6 -4
  343. metadata +66 -112
  344. data/.babelrc +0 -11
  345. data/app/assets/images/blacklight/list.svg +0 -1
  346. data/app/assets/images/blacklight/search.svg +0 -1
  347. data/app/assets/stylesheets/blacklight/_twitter_typeahead.scss +0 -37
  348. data/app/components/blacklight/content_areas_shim.rb +0 -13
  349. data/app/controllers/concerns/blacklight/base.rb +0 -7
  350. data/app/controllers/concerns/blacklight/default_component_configuration.rb +0 -64
  351. data/app/controllers/concerns/blacklight/facet.rb +0 -69
  352. data/app/controllers/concerns/blacklight/search_fields.rb +0 -46
  353. data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +0 -27
  354. data/app/helpers/blacklight/render_constraints_helper_behavior.rb +0 -188
  355. data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb +0 -97
  356. data/app/helpers/blacklight/suggest_helper_behavior.rb +0 -13
  357. data/app/javascript/blacklight/autocomplete.js +0 -36
  358. data/app/javascript/blacklight/facet_load.js +0 -22
  359. data/app/presenters/blacklight/search_bar_presenter.rb +0 -47
  360. data/app/views/catalog/_constraints_element.html.erb +0 -14
  361. data/app/views/catalog/_document_action.html.erb +0 -5
  362. data/app/views/catalog/_facet_group.html.erb +0 -5
  363. data/app/views/catalog/_facet_limit.html.erb +0 -3
  364. data/app/views/catalog/_index.html.erb +0 -1
  365. data/app/views/catalog/_index_header.html.erb +0 -22
  366. data/app/views/catalog/_previous_next_doc.html.erb +0 -2
  367. data/app/views/catalog/_show.html.erb +0 -6
  368. data/app/views/catalog/_show_header.html.erb +0 -2
  369. data/app/views/catalog/_thumbnail.html.erb +0 -1
  370. data/lib/blacklight/deprecations/engine_configuration.rb +0 -66
  371. data/lib/blacklight/deprecations/search_state_normalization.rb +0 -52
  372. data/spec/controllers/blacklight/facet_spec.rb +0 -33
  373. data/spec/controllers/blacklight/search_fields_spec.rb +0 -62
  374. data/spec/helpers/blacklight/hash_as_hidden_fields_behavior_spec.rb +0 -26
  375. data/spec/helpers/blacklight/render_constraints_helper_behavior_spec.rb +0 -92
  376. data/spec/helpers/blacklight/search_history_constraints_helper_behavior_spec.rb +0 -108
  377. data/spec/helpers/blacklight/suggest_helper_behavior_spec.rb +0 -48
  378. data/spec/lib/blacklight/engine_spec.rb +0 -41
  379. data/spec/presenters/blacklight/search_bar_presenter_spec.rb +0 -94
  380. data/spec/views/catalog/_constraints.html.erb_spec.rb +0 -33
  381. data/spec/views/catalog/_facet_group.html.erb_spec.rb +0 -84
  382. data/spec/views/catalog/_facets.html.erb_spec.rb +0 -15
  383. data/spec/views/catalog/_index.html.erb_spec.rb +0 -62
  384. data/spec/views/catalog/_index_header.html.erb_spec.rb +0 -35
  385. data/spec/views/catalog/_previous_next_doc.html.erb_spec.rb +0 -22
  386. data/spec/views/catalog/_show.html.erb_spec.rb +0 -62
  387. data/spec/views/catalog/_thumbnail.html.erb_spec.rb +0 -38
@@ -10,14 +10,13 @@ RSpec.describe Blacklight::FacetFieldCheckboxesComponent, type: :component do
10
10
  let(:facet_field) do
11
11
  instance_double(
12
12
  Blacklight::FacetFieldPresenter,
13
- facet_field: Blacklight::Configuration::NullField.new(key: 'field'),
13
+ facet_field: Blacklight::Configuration::NullField.new(key: 'field', item_component: Blacklight::FacetItemComponent, item_presenter: Blacklight::FacetItemPresenter),
14
14
  paginator: paginator,
15
15
  key: 'field',
16
16
  label: 'Field',
17
17
  active?: false,
18
18
  collapsed?: false,
19
19
  modal_path: nil,
20
- html_id: 'facet-field',
21
20
  search_state: search_state
22
21
  )
23
22
  end
@@ -11,16 +11,18 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
11
11
  instance_double(
12
12
  Blacklight::FacetFieldPresenter,
13
13
  paginator: paginator,
14
+ facet_field: facet_config,
14
15
  key: 'field',
15
16
  label: 'Field',
16
17
  active?: false,
17
18
  collapsed?: false,
18
19
  modal_path: nil,
19
- html_id: 'facet-field',
20
20
  values: []
21
21
  )
22
22
  end
23
23
 
24
+ let(:facet_config) { Blacklight::Configuration::NullField.new(key: 'field', item_component: Blacklight::FacetItemComponent, item_presenter: Blacklight::FacetItemPresenter) }
25
+
24
26
  let(:paginator) do
25
27
  instance_double(Blacklight::FacetPaginator, items: [
26
28
  double(label: 'x', hits: 10),
@@ -45,12 +47,12 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
45
47
  instance_double(
46
48
  Blacklight::FacetFieldPresenter,
47
49
  paginator: paginator,
50
+ facet_field: facet_config,
48
51
  key: 'field',
49
52
  label: 'Field',
50
53
  active?: true,
51
54
  collapsed?: false,
52
55
  modal_path: nil,
53
- html_id: 'facet-field',
54
56
  values: []
55
57
  )
56
58
  end
@@ -65,12 +67,12 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
65
67
  instance_double(
66
68
  Blacklight::FacetFieldPresenter,
67
69
  paginator: paginator,
70
+ facet_field: facet_config,
68
71
  key: 'field',
69
72
  label: 'Field',
70
73
  active?: false,
71
74
  collapsed?: true,
72
75
  modal_path: nil,
73
- html_id: 'facet-field',
74
76
  values: []
75
77
  )
76
78
  end
@@ -91,12 +93,12 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
91
93
  instance_double(
92
94
  Blacklight::FacetFieldPresenter,
93
95
  paginator: paginator,
96
+ facet_field: facet_config,
94
97
  key: 'field',
95
98
  label: 'Field',
96
99
  active?: false,
97
100
  collapsed?: false,
98
101
  modal_path: '/catalog/facet/modal',
99
- html_id: 'facet-field',
100
102
  values: []
101
103
  )
102
104
  end
@@ -111,13 +113,12 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
111
113
  instance_double(
112
114
  Blacklight::FacetFieldPresenter,
113
115
  paginator: paginator,
114
- facet_field: Blacklight::Configuration::NullField.new(key: 'field'),
116
+ facet_field: facet_config,
115
117
  key: 'field',
116
118
  label: 'Field',
117
119
  active?: false,
118
120
  collapsed?: false,
119
121
  modal_path: nil,
120
- html_id: 'facet-field',
121
122
  values: [%w[a b c]],
122
123
  search_state: search_state
123
124
  )
@@ -19,18 +19,20 @@ RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
19
19
 
20
20
  let(:facet_item) do
21
21
  instance_double(
22
- Blacklight::FacetItemPresenter,
23
- facet_config: Blacklight::Configuration::FacetField.new(key: 'z'),
22
+ Blacklight::FacetItemPivotPresenter,
23
+ facet_config: facet_config,
24
24
  facet_field: 'z',
25
25
  label: 'x',
26
26
  hits: 10,
27
27
  href: '/catalog?f[z]=x',
28
28
  selected?: false,
29
29
  search_state: search_state,
30
- items: [OpenStruct.new(value: 'x:1', hits: 5)]
30
+ facet_item_presenters: [OpenStruct.new(label: 'x:1', hits: 5, href: '/catalog?f[z][]=x:1', facet_config: facet_config)]
31
31
  )
32
32
  end
33
33
 
34
+ let(:facet_config) { Blacklight::Configuration::NullField.new(key: 'z', item_component: Blacklight::FacetItemComponent, item_presenter: Blacklight::FacetItemPivotPresenter) }
35
+
34
36
  it 'links to the facet and shows the number of hits' do
35
37
  expect(rendered).to have_selector 'li'
36
38
  expect(rendered).to have_link 'x', href: '/catalog?f%5Bz%5D=x'
@@ -39,21 +41,21 @@ RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
39
41
 
40
42
  it 'has the facet hierarchy' do
41
43
  expect(rendered).to have_selector 'li ul.pivot-facet'
42
- expect(rendered).to have_link 'x:1', href: /f%5Bz%5D%5B%5D=x%3A1/
44
+ expect(rendered).to have_link 'x:1', href: /f%5Bz%5D%5B%5D=x:1/
43
45
  end
44
46
 
45
47
  context 'with a selected facet' do
46
48
  let(:facet_item) do
47
49
  instance_double(
48
- Blacklight::FacetItemPresenter,
49
- facet_config: Blacklight::Configuration::FacetField.new,
50
+ Blacklight::FacetItemPivotPresenter,
51
+ facet_config: facet_config,
50
52
  facet_field: 'z',
51
53
  label: 'x',
52
54
  hits: 10,
53
55
  href: '/catalog',
54
56
  selected?: true,
55
57
  search_state: search_state,
56
- items: []
58
+ facet_item_presenters: []
57
59
  )
58
60
  end
59
61
 
@@ -0,0 +1,66 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ RSpec.describe Blacklight::Response::ViewTypeComponent, type: :component do
6
+ subject(:render) do
7
+ render_inline(described_class.new(response: response, views: views, search_state: search_state))
8
+ end
9
+
10
+ let(:response) { instance_double(Blacklight::Solr::Response, empty?: false) }
11
+ let(:search_state) { instance_double(Blacklight::SearchState, to_h: { controller: 'catalog', action: 'index' }) }
12
+ let(:view_config) { Blacklight::Configuration::ViewConfig.new }
13
+
14
+ describe "when some views exist" do
15
+ let(:views) do
16
+ {
17
+ abc: view_config,
18
+ def: view_config
19
+ }
20
+ end
21
+
22
+ it "draws the group" do
23
+ expect(render.css('.view-type-group')).to be_present
24
+ end
25
+ end
26
+
27
+ context 'with a icon component class' do
28
+ let(:views) do
29
+ { abc: Blacklight::Configuration::ViewConfig.new(icon: Blacklight::Icons::ListComponent), def: view_config }
30
+ end
31
+
32
+ it 'draws the icon' do
33
+ expect(render.css('.view-type-abc svg')).to be_present
34
+ end
35
+ end
36
+
37
+ context 'with a icon component instance' do
38
+ let(:views) do
39
+ { abc: Blacklight::Configuration::ViewConfig.new(icon: Blacklight::Icons::ListComponent.new), def: view_config }
40
+ end
41
+
42
+ it 'draws the icon' do
43
+ expect(render.css('.view-type-abc svg')).to be_present
44
+ end
45
+ end
46
+
47
+ context 'with a icon with the svg given in-line' do
48
+ let(:views) do
49
+ { abc: Blacklight::Configuration::ViewConfig.new(icon: Blacklight::Icons::IconComponent.new(svg: 'blah')), def: view_config }
50
+ end
51
+
52
+ it 'draws the icon' do
53
+ expect(render.css('.view-type-abc').text).to include 'blah'
54
+ end
55
+ end
56
+
57
+ describe "when no views exist" do
58
+ let(:views) do
59
+ {}
60
+ end
61
+
62
+ it "draws nothing" do
63
+ expect(render.to_html).to be_blank
64
+ end
65
+ end
66
+ end
@@ -0,0 +1,40 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ RSpec.describe Blacklight::SearchContextComponent, type: :component do
6
+ subject(:render) { render_inline(instance) }
7
+
8
+ let(:search_session) { {} }
9
+ let(:instance) { described_class.new(search_context: search_context, search_session: search_session) }
10
+
11
+ before do
12
+ allow(controller).to receive(:current_search_session).and_return(double(id: 9))
13
+ end
14
+
15
+ context 'when there is no next or previous' do
16
+ let(:search_context) { {} }
17
+
18
+ it "does not render content" do
19
+ expect(render.to_html).to be_blank
20
+ end
21
+ end
22
+
23
+ context 'when there is next and previous' do
24
+ let(:search_context) { { next: next_doc, prev: prev_doc } }
25
+ let(:prev_doc) { SolrDocument.new(id: '777') }
26
+ let(:next_doc) { SolrDocument.new(id: '888') }
27
+
28
+ before do
29
+ # allow(controller).to receive(:controller_tracking_method).and_return('track_catalog_path')
30
+ allow(controller).to receive(:controller_name).and_return('catalog')
31
+
32
+ allow(controller).to receive(:link_to_previous_document).and_return('')
33
+ allow(controller).to receive(:link_to_next_document).and_return('')
34
+ end
35
+
36
+ it "renders content" do
37
+ expect(render.css('.pagination-search-widgets').to_html).not_to be_blank
38
+ end
39
+ end
40
+ end
@@ -1,10 +1,9 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- RSpec.describe Blacklight::DefaultComponentConfiguration do
3
+ RSpec.describe CatalogController do
4
4
  subject do
5
5
  Class.new do
6
6
  include Blacklight::Configurable
7
- include Blacklight::DefaultComponentConfiguration
8
7
 
9
8
  def some_existing_action
10
9
  1
@@ -12,10 +11,6 @@ RSpec.describe Blacklight::DefaultComponentConfiguration do
12
11
  end
13
12
  end
14
13
 
15
- before do
16
- allow(Deprecation).to receive(:warn)
17
- end
18
-
19
14
  describe ".add_show_tools_partial" do
20
15
  it "defines an action method" do
21
16
  subject.blacklight_config.add_show_tools_partial :xyz
@@ -1,9 +1,9 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- RSpec.describe Blacklight::Base do
3
+ RSpec.describe Blacklight::Catalog do
4
4
  subject { controller }
5
5
 
6
- let(:controller) { (Class.new(ApplicationController) { include Blacklight::Base }).new }
6
+ let(:controller) { (Class.new(ApplicationController) { include Blacklight::Catalog }).new }
7
7
 
8
8
  describe "#search_state" do
9
9
  subject { controller.send(:search_state) }
@@ -7,11 +7,10 @@ RSpec.describe BookmarksController do
7
7
  end
8
8
 
9
9
  it 'opts out of search session tracking' do
10
- expect(@controller.blacklight_config.track_search_session).to eq false
10
+ expect(@controller.blacklight_config.track_search_session).to be false
11
11
  end
12
12
  end
13
13
 
14
- # jquery 1.9 ajax does error callback if 200 returns empty body. so use 204 instead.
15
14
  describe "update" do
16
15
  it "has a 200 status code when creating a new one" do
17
16
  put :update, xhr: true, params: { id: '2007020969', format: :js }
@@ -105,7 +104,7 @@ RSpec.describe BookmarksController do
105
104
  end
106
105
 
107
106
  context 'created over an hour ago' do
108
- let(:current_time) { Time.zone.now - 2.hours }
107
+ let(:current_time) { 2.hours.ago }
109
108
 
110
109
  it 'is expired' do
111
110
  get :index, params: { encrypted_user_id: token }
@@ -1,10 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  RSpec.describe CatalogController, api: true do
4
- around { |test| Deprecation.silence(Blacklight::Catalog) { test.call } }
5
-
6
4
  let(:doc_id) { '2007020969' }
7
- let(:mock_response) { instance_double(Blacklight::Solr::Response) }
8
5
  let(:mock_document) { instance_double(SolrDocument, export_formats: {}) }
9
6
  let(:search_service) { instance_double(Blacklight::SearchService) }
10
7
 
@@ -63,17 +60,17 @@ RSpec.describe CatalogController, api: true do
63
60
  end
64
61
 
65
62
  it "shows 0 results when the user asks for an invalid value to a custom facet query", integration: true do
66
- get :index, params: { f: { example_query_facet_field: 'bogus' } } # bogus custom facet value
63
+ get :index, params: { f: { example_query_facet_field: ['bogus'] } } # bogus custom facet value
67
64
  expect(assigns(:response).docs).to be_empty
68
65
  end
69
66
 
70
67
  it "returns results (possibly 0) when the user asks for a valid value to a custom facet query", integration: true do
71
- get :index, params: { f: { example_query_facet_field: 'years_25' } } # valid custom facet value with some results
68
+ get :index, params: { f: { example_query_facet_field: ['years_25'] } } # valid custom facet value with some results
72
69
  expect(assigns(:response).docs).not_to be_empty
73
70
  end
74
71
 
75
72
  it "returns no results when the users asks for a value that doesn't match any" do
76
- get :index, params: { f: { example_query_facet_field: 'years_5' } } # valid custom facet value with NO results
73
+ get :index, params: { f: { example_query_facet_field: ['years_5'] } } # valid custom facet value with NO results
77
74
  expect(assigns(:response).docs).to be_empty
78
75
  end
79
76
 
@@ -161,20 +158,20 @@ RSpec.describe CatalogController, api: true do
161
158
 
162
159
  format = facets.find { |x| x['id'] == 'format' }
163
160
 
164
- expect(format['attributes']['items'].map { |x| x['attributes'] }).to match_array([{ "value" => "Book", "hits" => 30, "label" => "Book" }])
161
+ expect(format['attributes']['items'].pluck('attributes')).to match_array([{ "value" => "Book", "hits" => 30, "label" => "Book" }])
165
162
  expect(format['links']['self']).to eq facet_catalog_url(format: :json, id: 'format')
166
163
  expect(format['attributes']['items'].first['links']['self']).to eq search_catalog_url(format: :json, f: { format: ['Book'] })
167
164
  end
168
165
 
169
166
  it "gets the search fields" do
170
167
  expect(search_fields).to have(4).fields
171
- expect(search_fields.map { |x| x['id'] }).to match_array %w[all_fields author subject title]
168
+ expect(search_fields.pluck('id')).to match_array %w[all_fields author subject title]
172
169
  expect(search_fields.first['links']['self']).to eq search_catalog_url(format: :json, search_field: 'all_fields')
173
170
  end
174
171
 
175
172
  describe "facets" do
176
173
  let(:query_facet) { facets.find { |x| x['id'] == 'example_query_facet_field' } }
177
- let(:query_facet_items) { query_facet['attributes']['items'].map { |x| x['attributes'] } }
174
+ let(:query_facet_items) { query_facet['attributes']['items'].pluck('attributes') }
178
175
 
179
176
  it "has items with labels and values" do
180
177
  expect(query_facet_items.first['label']).to eq 'within 25 Years'
@@ -339,7 +336,7 @@ RSpec.describe CatalogController, api: true do
339
336
  before do
340
337
  allow(mock_document).to receive_messages(export_formats: {})
341
338
  allow(controller).to receive(:search_service).and_return(search_service)
342
- expect(search_service).to receive(:fetch).and_return([mock_response, mock_document])
339
+ expect(search_service).to receive(:fetch).and_return(mock_document)
343
340
  allow(controller).to receive(:current_search_session).and_return(current_search)
344
341
  end
345
342
 
@@ -399,7 +396,7 @@ RSpec.describe CatalogController, api: true do
399
396
 
400
397
  it "renders show.html.erb" do
401
398
  allow(controller).to receive(:search_service).and_return(search_service)
402
- expect(search_service).to receive(:fetch).and_return([mock_response, mock_document])
399
+ expect(search_service).to receive(:fetch).and_return(mock_document)
403
400
 
404
401
  get :show, params: { id: doc_id }
405
402
  expect(response).to render_template(:show)
@@ -408,7 +405,7 @@ RSpec.describe CatalogController, api: true do
408
405
  describe '@document' do
409
406
  before do
410
407
  allow(controller).to receive(:search_service).and_return(search_service)
411
- expect(search_service).to receive(:fetch).and_return([mock_response, mock_document])
408
+ expect(search_service).to receive(:fetch).and_return(mock_document)
412
409
 
413
410
  get :show, params: { id: doc_id }
414
411
  end
@@ -434,7 +431,7 @@ RSpec.describe CatalogController, api: true do
434
431
  Mime::Type.register "application/mock", :mock
435
432
  SolrDocument.use_extension(FakeExtension)
436
433
  allow(controller).to receive(:search_service).and_return(search_service)
437
- expect(search_service).to receive(:fetch).and_return([nil, SolrDocument.new(id: 'my_fake_doc')])
434
+ expect(search_service).to receive(:fetch).and_return(SolrDocument.new(id: 'my_fake_doc'))
438
435
  end
439
436
 
440
437
  after do
@@ -470,23 +467,7 @@ RSpec.describe CatalogController, api: true do
470
467
  end
471
468
  end
472
469
 
473
- describe 'GET suggest' do
474
- it 'returns JSON' do
475
- get :suggest, params: { format: 'json' }
476
- expect(response.body).to eq [].to_json
477
- end
478
-
479
- it 'returns suggestions' do
480
- get :suggest, params: { format: 'json', q: 'new' }
481
- json = JSON.parse(response.body)
482
- expect(json.count).to eq 5
483
- expect(json.first['term']).to eq 'new jersey'
484
- end
485
- end
486
-
487
470
  describe "email/sms" do
488
- let(:mock_response) { instance_double(Blacklight::Solr::Response, documents: [SolrDocument.new(id: 'my_fake_doc'), SolrDocument.new(id: 'my_other_doc')]) }
489
-
490
471
  before do
491
472
  mock_document.extend(Blacklight::Document::Sms)
492
473
  mock_document.extend(Blacklight::Document::Email)
@@ -494,7 +475,7 @@ RSpec.describe CatalogController, api: true do
494
475
  allow(mock_document).to receive(:to_model).and_return(SolrDocument.new(id: 'my_fake_doc'))
495
476
 
496
477
  allow(controller).to receive(:search_service).and_return(search_service)
497
- expect(search_service).to receive(:fetch).and_return([mock_response, [mock_document]])
478
+ expect(search_service).to receive(:fetch).and_return([mock_document])
498
479
  request.env["HTTP_REFERER"] = "/catalog/#{doc_id}"
499
480
  SolrDocument.use_extension(Blacklight::Document::Email)
500
481
  SolrDocument.use_extension(Blacklight::Document::Sms)
@@ -581,7 +562,7 @@ RSpec.describe CatalogController, api: true do
581
562
 
582
563
  it "redirects back to the record upon success" do
583
564
  post :sms, params: { id: doc_id, to: '5555555555', carrier: 'txt.att.net' }
584
- expect(request.flash[:error]).to eq nil
565
+ expect(request.flash[:error]).to be_nil
585
566
  expect(request).to redirect_to(solr_document_path(doc_id))
586
567
  end
587
568
 
@@ -607,31 +588,6 @@ RSpec.describe CatalogController, api: true do
607
588
  get :citation, params: { id: "bad-record-identifer" }
608
589
  end.to raise_error Blacklight::Exceptions::RecordNotFound
609
590
  end
610
-
611
- context "when there is an invalid search", api: false do
612
- let(:service) { instance_double(Blacklight::SearchService) }
613
- let(:fake_error) { Blacklight::Exceptions::InvalidRequest.new }
614
-
615
- before do
616
- allow(controller).to receive(:search_service).and_return(service)
617
- allow(service).to receive(:search_results) { |*_args| raise fake_error }
618
- allow(Rails.env).to receive_messages(test?: false)
619
- end
620
-
621
- it "redirects the user to the root url for a bad search" do
622
- expect(controller.logger).to receive(:error).with(fake_error)
623
- get :index, params: { q: '+' }
624
- expect(response.redirect_url).to eq root_url
625
- expect(request.flash[:notice]).to eq "Sorry, I don't understand your search."
626
- expect(response).not_to be_successful
627
- expect(response.status).to eq 302
628
- end
629
-
630
- it "returns status 500 if the catalog path is raising an exception" do
631
- allow(controller).to receive(:flash).and_return(notice: I18n.t('blacklight.search.errors.request_error'))
632
- expect { get :index, params: { q: '+' } }.to raise_error Blacklight::Exceptions::InvalidRequest
633
- end
634
- end
635
591
  end
636
592
 
637
593
  context "without a user authentication provider" do
@@ -779,7 +735,7 @@ RSpec.describe CatalogController, api: true do
779
735
  end
780
736
 
781
737
  describe "with a facet" do
782
- before { allow(controller).to receive_messages(params: { f: { "field" => ["value"] } }) }
738
+ before { allow(controller).to receive_messages(params: { f: { "format" => ["value"] } }) }
783
739
 
784
740
  it { is_expected.to be true }
785
741
  end
@@ -841,76 +797,6 @@ RSpec.describe CatalogController, api: true do
841
797
  expect(controller.send(:search_facet_path, id: "some_facet", page: 5)).to eq facet_catalog_path(id: "some_facet")
842
798
  end
843
799
  end
844
-
845
- describe "facet_limit_for" do
846
- let(:blacklight_config) { controller.blacklight_config }
847
-
848
- it "returns specified value for facet_field specified" do
849
- expect(controller.facet_limit_for("subject_ssim")).to eq blacklight_config.facet_fields["subject_ssim"].limit
850
- end
851
-
852
- it "facet_limit_hash should return hash with key being facet_field and value being configured limit" do
853
- # facet_limit_hash has been removed from solrhelper in refactor. should it go back?
854
- skip "facet_limit_hash has been removed from solrhelper in refactor. should it go back?"
855
- expect(controller.facet_limit_hash).to eq blacklight_config[:facet][:limits]
856
- end
857
-
858
- it "handles no facet_limits in config" do
859
- blacklight_config.facet_fields = {}
860
- expect(controller.facet_limit_for("subject_ssim")).to be_nil
861
- end
862
-
863
- describe "for 'true' configured values" do
864
- before do
865
- allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
866
- end
867
-
868
- let(:blacklight_config) do
869
- Blacklight::Configuration.new do |config|
870
- config.add_facet_field "language_facet", limit: true
871
- end
872
- end
873
-
874
- it "returns nil if no @response available" do
875
- expect(controller.facet_limit_for("some_unknown_field")).to be_nil
876
- end
877
-
878
- it "gets from @response facet.limit if available" do
879
- response = instance_double(Blacklight::Solr::Response, aggregations: { "language_facet" => double(limit: nil) })
880
- controller.instance_variable_set(:@response, response)
881
- blacklight_config.facet_fields['language_facet'].limit = 10
882
- expect(controller.facet_limit_for("language_facet")).to eq 10
883
- end
884
-
885
- it "gets the limit from the facet field in @response" do
886
- response = instance_double(Blacklight::Solr::Response, aggregations: { "language_facet" => double(limit: 16) })
887
- controller.instance_variable_set(:@response, response)
888
- expect(controller.facet_limit_for("language_facet")).to eq 15
889
- end
890
-
891
- it "defaults to 10" do
892
- expect(controller.facet_limit_for("language_facet")).to eq 10
893
- end
894
- end
895
-
896
- context 'for facet fields with a key that is different from the field name' do
897
- before do
898
- allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
899
- end
900
-
901
- let(:blacklight_config) do
902
- Blacklight::Configuration.new do |config|
903
- config.add_facet_field 'some_key', field: 'x', limit: true
904
- end
905
- end
906
-
907
- it 'gets the limit from the facet field in the @response' do
908
- response = instance_double(Blacklight::Solr::Response, aggregations: { 'x' => double(limit: 16) })
909
- controller.instance_variable_set(:@response, response)
910
- expect(controller.facet_limit_for('some_key')).to eq 15
911
- end
912
- end
913
- end
914
800
  end
915
801
 
916
802
  # there must be at least one facet, and each facet must have at least one value
@@ -3,6 +3,6 @@
3
3
  RSpec.describe 'Autocomplete suggestions' do
4
4
  it 'search form has suggest path' do
5
5
  visit root_path
6
- expect(page).to have_css 'input[data-autocomplete-path="/catalog/suggest"]'
6
+ expect(page).to have_css 'auto-complete[src="/catalog/suggest"]'
7
7
  end
8
8
  end
@@ -28,6 +28,6 @@ RSpec.describe 'Accessibility testing', api: false, js: true do
28
28
 
29
29
  def be_accessible(skipping: [])
30
30
  # typeahead does funny things with the search bar
31
- be_axe_clean.excluding('.tt-hint').skipping(skipping + [('color-contrast' if Bootstrap::VERSION < '5')].compact)
31
+ be_axe_clean.excluding('.tt-hint').skipping(skipping + [('color-contrast' if defined?(Bootstrap) && Bootstrap::VERSION < '5')].compact)
32
32
  end
33
33
  end
@@ -45,7 +45,7 @@ RSpec.describe "Bookmarks" do
45
45
  check 'Bookmark'
46
46
 
47
47
  visit solr_document_path('2007020969')
48
- expect(page).to have_css('input[type="checkbox"]:checked')
48
+ expect(page).to have_css('input[type="checkbox"][checked]')
49
49
  uncheck 'In Bookmarks'
50
50
  end
51
51
 
@@ -69,7 +69,7 @@ RSpec.describe "Facets" do
69
69
  page.find('h3.facet-field-heading button', text: 'Pivot Field').click
70
70
 
71
71
  within '#facet-example_pivot_field' do
72
- expect(page).to have_css('.facet-leaf-node', text: "Book 30")
72
+ expect(page).to have_css('.facet-leaf-node', text: "Book 30", normalize_ws: true)
73
73
  expect(page).not_to have_css('.facet-select', text: 'Tibetan')
74
74
  page.find('.facet-toggle-handle').click
75
75
  click_link 'Tibetan'
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- RSpec.describe "Search Results context", js: true do
4
- it "passes the current search id through" do
3
+ RSpec.describe "Search Results context" do
4
+ it "passes the current search id through", js: true do
5
5
  search_for ''
6
6
  click_on 'Pluvial nectar of blessings'
7
7
  search_id = Search.last.id.to_s
@@ -16,7 +16,7 @@ RSpec.describe "Search Results context", js: true do
16
16
  expect(prev['data-context-href']).to eq "/catalog/2004310986/track?counter=8&document_id=2004310986&search_id=#{search_id}"
17
17
  end
18
18
 
19
- it "redirects context urls to the original url" do
19
+ it "redirects context urls to the original url", js: true do
20
20
  search_for ''
21
21
  first('.index_title a').click
22
22
  expect(page).to have_content "« Previous | 1 of 30 | Next »"
@@ -43,7 +43,7 @@ RSpec.describe "Search Results context", js: true do
43
43
  end
44
44
 
45
45
  context "navigating between search results using context pagination" do
46
- it "updates the back to search link with the current search pagination context" do
46
+ it "updates the back to search link with the current search pagination context", js: true do
47
47
  search_for ''
48
48
  expect(page).to have_content "1 - 10"
49
49
  find_all('.index_title a').last.click
@@ -55,9 +55,3 @@ RSpec.describe "Search Results context", js: true do
55
55
  end
56
56
  end
57
57
  end
58
-
59
- def search_for q
60
- visit root_path
61
- fill_in "q", with: q
62
- click_button 'search'
63
- end
@@ -58,36 +58,3 @@ RSpec.describe "Search Results" do
58
58
  expect(page).to have_xpath("//a[contains(@href, 77826928)]")
59
59
  end
60
60
  end
61
-
62
- def search_for q
63
- visit root_path
64
- fill_in "q", with: q
65
- click_button 'search'
66
- end
67
-
68
- def position_in_result_page(page, id)
69
- i = -1
70
- page.all(".index_title a").each_with_index do |link, idx|
71
- i = (idx + 1) if link['href'] =~ Regexp.new(Regexp.escape(id) + "$")
72
- end
73
- i.to_i
74
- end
75
-
76
- def number_of_results_for_query(query)
77
- visit root_path
78
- fill_in "q", with: query
79
- click_button "search"
80
- get_number_of_results_from_page(page)
81
- end
82
-
83
- def number_of_results_from_page(page)
84
- tmp_value = Capybara.ignore_hidden_elements
85
- Capybara.ignore_hidden_elements = false
86
- val = begin
87
- page.find("meta[name=totalResults]")['content'].to_i
88
- rescue StandardError
89
- 0
90
- end
91
- Capybara.ignore_hidden_elements = tmp_value
92
- val
93
- end