blacklight 6.19.1 → 7.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (425) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.npmignore +23 -0
  4. data/.rubocop.yml +40 -16
  5. data/.rubocop_todo.yml +478 -382
  6. data/.solr_wrapper.yml +9 -2
  7. data/.travis.yml +23 -25
  8. data/CONTRIBUTING.md +48 -0
  9. data/Gemfile +3 -2
  10. data/README.md +22 -5
  11. data/Rakefile +3 -2
  12. data/VERSION +1 -1
  13. data/Vagrantfile +2 -0
  14. data/app/assets/images/blacklight/list.svg +1 -0
  15. data/app/assets/images/blacklight/search.svg +1 -0
  16. data/app/assets/javascripts/blacklight/blacklight.js +483 -57
  17. data/app/assets/stylesheets/blacklight/_balanced_list.scss +7 -12
  18. data/app/assets/stylesheets/blacklight/_blacklight_base.scss +18 -15
  19. data/app/assets/stylesheets/blacklight/_bookmark.scss +1 -13
  20. data/app/assets/stylesheets/blacklight/_bootstrap_overrides.scss +27 -0
  21. data/app/assets/stylesheets/blacklight/_constraints.scss +17 -25
  22. data/app/assets/stylesheets/blacklight/_controls.scss +8 -16
  23. data/app/assets/stylesheets/blacklight/_facets.scss +64 -93
  24. data/app/assets/stylesheets/blacklight/_header.scss +35 -48
  25. data/app/assets/stylesheets/blacklight/_icons.scss +35 -0
  26. data/app/assets/stylesheets/blacklight/_layout.scss +0 -10
  27. data/app/assets/stylesheets/blacklight/_mixins.scss +15 -0
  28. data/app/assets/stylesheets/blacklight/_modal.scss +9 -17
  29. data/app/assets/stylesheets/blacklight/_pagination.scss +4 -13
  30. data/app/assets/stylesheets/blacklight/_search_form.scss +7 -0
  31. data/app/assets/stylesheets/blacklight/_search_history.scss +5 -13
  32. data/app/assets/stylesheets/blacklight/_search_results.scss +9 -8
  33. data/app/assets/stylesheets/blacklight/_twitter_typeahead.scss +1 -2
  34. data/app/assets/stylesheets/blacklight/blacklight.scss +1 -1
  35. data/app/builders/blacklight/action_builder.rb +57 -0
  36. data/app/controllers/bookmarks_controller.rb +2 -2
  37. data/app/controllers/catalog_controller.rb +2 -2
  38. data/app/controllers/concerns/blacklight/base.rb +0 -33
  39. data/app/controllers/concerns/blacklight/bookmarks.rb +20 -30
  40. data/app/controllers/concerns/blacklight/catalog.rb +256 -210
  41. data/app/controllers/concerns/blacklight/controller.rb +102 -124
  42. data/app/controllers/concerns/blacklight/default_component_configuration.rb +12 -43
  43. data/app/controllers/concerns/blacklight/facet.rb +10 -2
  44. data/app/controllers/concerns/blacklight/search_context.rb +11 -11
  45. data/app/controllers/concerns/blacklight/search_fields.rb +4 -14
  46. data/app/controllers/concerns/blacklight/search_history.rb +1 -6
  47. data/app/controllers/concerns/blacklight/searchable.rb +17 -0
  48. data/app/controllers/concerns/blacklight/token_based_user.rb +5 -7
  49. data/app/helpers/blacklight/blacklight_helper_behavior.rb +36 -118
  50. data/app/helpers/blacklight/catalog_helper_behavior.rb +100 -89
  51. data/app/helpers/blacklight/component_helper_behavior.rb +21 -21
  52. data/app/helpers/blacklight/configuration_helper_behavior.rb +30 -58
  53. data/app/helpers/blacklight/facets_helper_behavior.rb +56 -52
  54. data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +9 -11
  55. data/app/helpers/blacklight/icon_helper_behavior.rb +18 -0
  56. data/app/helpers/blacklight/layout_helper_behavior.rb +3 -3
  57. data/app/helpers/blacklight/render_constraints_helper_behavior.rb +8 -6
  58. data/app/helpers/blacklight/render_partials_helper_behavior.rb +207 -0
  59. data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb +19 -11
  60. data/app/helpers/blacklight/suggest_helper_behavior.rb +1 -0
  61. data/app/helpers/blacklight/url_helper_behavior.rb +50 -41
  62. data/app/{assets/javascripts → javascript}/blacklight/autocomplete.js +3 -2
  63. data/app/javascript/blacklight/bookmark_toggle.js +25 -0
  64. data/app/javascript/blacklight/checkbox_submit.js +134 -0
  65. data/app/{assets/javascripts → javascript}/blacklight/collapsable.js +1 -1
  66. data/app/javascript/blacklight/core.js +41 -0
  67. data/app/{assets/javascripts → javascript}/blacklight/facet_load.js +6 -6
  68. data/app/{assets/javascripts/blacklight/ajax_modal.js → javascript/blacklight/modal.js} +62 -64
  69. data/app/{assets/javascripts → javascript}/blacklight/search_context.js +10 -3
  70. data/app/models/blacklight/facet_paginator.rb +3 -3
  71. data/app/models/blacklight/icon.rb +58 -0
  72. data/app/models/blacklight/solr/facet_paginator.rb +3 -3
  73. data/app/models/blacklight/suggest_search.rb +1 -1
  74. data/app/models/bookmark.rb +5 -10
  75. data/app/models/concerns/blacklight/configurable.rb +13 -13
  76. data/app/models/concerns/blacklight/document.rb +23 -39
  77. data/app/models/concerns/blacklight/document/active_model_shim.rb +8 -11
  78. data/app/models/concerns/blacklight/document/cache_key.rb +1 -1
  79. data/app/models/concerns/blacklight/document/dublin_core.rb +2 -2
  80. data/app/models/concerns/blacklight/document/email.rb +5 -5
  81. data/app/models/concerns/blacklight/document/extensions.rb +5 -5
  82. data/app/models/concerns/blacklight/document/semantic_fields.rb +9 -9
  83. data/app/models/concerns/blacklight/document/sms.rb +3 -3
  84. data/app/models/concerns/blacklight/solr/document.rb +8 -8
  85. data/app/models/concerns/blacklight/user.rb +7 -6
  86. data/app/models/record_mailer.rb +8 -6
  87. data/app/models/search.rb +5 -7
  88. data/app/presenters/blacklight/document_presenter.rb +25 -140
  89. data/app/presenters/blacklight/field_presenter.rb +7 -5
  90. data/app/presenters/blacklight/index_presenter.rb +41 -70
  91. data/app/presenters/blacklight/json_presenter.rb +10 -14
  92. data/app/presenters/blacklight/link_alternate_presenter.rb +3 -1
  93. data/app/presenters/blacklight/rendering/abstract_step.rb +7 -5
  94. data/app/presenters/blacklight/rendering/helper_method.rb +10 -8
  95. data/app/presenters/blacklight/rendering/join.rb +5 -3
  96. data/app/presenters/blacklight/rendering/link_to_facet.rb +23 -19
  97. data/app/presenters/blacklight/rendering/microdata.rb +6 -3
  98. data/app/presenters/blacklight/rendering/pipeline.rb +7 -5
  99. data/app/presenters/blacklight/rendering/terminator.rb +2 -0
  100. data/app/presenters/blacklight/search_bar_presenter.rb +39 -0
  101. data/app/presenters/blacklight/show_presenter.rb +26 -72
  102. data/app/presenters/blacklight/thumbnail_presenter.rb +74 -0
  103. data/app/services/blacklight/document_factory.rb +13 -0
  104. data/app/services/blacklight/field_retriever.rb +26 -24
  105. data/app/services/blacklight/search_service.rb +153 -0
  106. data/app/values/blacklight/types.rb +31 -0
  107. data/app/views/blacklight/nav/_bookmark.html.erb +2 -2
  108. data/app/views/blacklight/nav/_search_history.html.erb +1 -1
  109. data/app/views/bookmarks/_tools.html.erb +2 -2
  110. data/app/views/bookmarks/index.html.erb +12 -13
  111. data/app/views/catalog/_bookmark_control.html.erb +26 -10
  112. data/app/views/catalog/_citation.html.erb +23 -18
  113. data/app/views/catalog/_constraints.html.erb +6 -7
  114. data/app/views/catalog/_constraints_element.html.erb +6 -6
  115. data/app/views/catalog/_did_you_mean.html.erb +1 -1
  116. data/app/views/catalog/{_document_default.atom.builder → _document.atom.builder} +19 -18
  117. data/app/views/catalog/_document.html.erb +5 -3
  118. data/app/views/catalog/{_document_default.rss.builder → _document.rss.builder} +2 -0
  119. data/app/views/catalog/_document_action.html.erb +2 -1
  120. data/app/views/catalog/_email_form.html.erb +8 -4
  121. data/app/views/catalog/_facet_group.html.erb +19 -0
  122. data/app/views/catalog/_facet_index_navigation.html.erb +5 -4
  123. data/app/views/catalog/_facet_layout.html.erb +6 -8
  124. data/app/views/catalog/_facet_limit.html.erb +3 -2
  125. data/app/views/catalog/_facet_pagination.html.erb +8 -8
  126. data/app/views/catalog/_facet_pivot.html.erb +2 -2
  127. data/app/views/catalog/_facets.html.erb +3 -21
  128. data/app/views/catalog/_field.json.jbuilder +10 -0
  129. data/app/views/catalog/{_group_default.html.erb → _group.html.erb} +1 -1
  130. data/app/views/catalog/_home_text.html.erb +32 -36
  131. data/app/views/catalog/_index.html.erb +10 -0
  132. data/app/views/catalog/{_index_header_default.html.erb → _index_header.html.erb} +3 -3
  133. data/app/views/catalog/_per_page_widget.html.erb +6 -7
  134. data/app/views/catalog/_previous_next_doc.html.erb +6 -14
  135. data/app/views/catalog/_results_pagination.html.erb +2 -2
  136. data/app/views/catalog/_search_form.html.erb +12 -8
  137. data/app/views/catalog/_search_header.html.erb +0 -3
  138. data/app/views/catalog/_search_results.html.erb +6 -2
  139. data/app/views/catalog/_show.html.erb +8 -0
  140. data/app/views/catalog/{_show_header_default.html.erb → _show_header.html.erb} +0 -0
  141. data/app/views/catalog/_show_main_content.html.erb +4 -4
  142. data/app/views/catalog/_show_more_like_this.html.erb +1 -1
  143. data/app/views/catalog/_show_sidebar.html.erb +10 -8
  144. data/app/views/catalog/_show_tools.html.erb +10 -21
  145. data/app/views/catalog/_sms_form.html.erb +8 -4
  146. data/app/views/catalog/_sort_and_per_page.html.erb +3 -3
  147. data/app/views/catalog/_sort_widget.html.erb +7 -7
  148. data/app/views/catalog/_thumbnail.html.erb +5 -0
  149. data/app/views/catalog/_view_type_group.html.erb +2 -2
  150. data/app/views/catalog/_zero_results.html.erb +1 -1
  151. data/app/views/catalog/citation.html.erb +1 -1
  152. data/app/views/catalog/citation.js.erb +1 -7
  153. data/app/views/catalog/email.html.erb +5 -3
  154. data/app/views/catalog/email_success.html.erb +12 -8
  155. data/app/views/catalog/facet.html.erb +10 -8
  156. data/app/views/catalog/facet.json.jbuilder +2 -0
  157. data/app/views/catalog/index.atom.builder +27 -29
  158. data/app/views/catalog/index.html.erb +9 -11
  159. data/app/views/catalog/index.json.jbuilder +84 -3
  160. data/app/views/catalog/index.rss.builder +8 -6
  161. data/app/views/catalog/opensearch.xml.builder +12 -10
  162. data/app/views/catalog/show.html.erb +11 -6
  163. data/app/views/catalog/show.json.jbuilder +21 -0
  164. data/app/views/catalog/sms.html.erb +3 -1
  165. data/app/views/catalog/sms_success.html.erb +12 -8
  166. data/app/views/kaminari/blacklight/_first_page.html.erb +2 -2
  167. data/app/views/kaminari/blacklight/_gap.html.erb +2 -2
  168. data/app/views/kaminari/blacklight/_last_page.html.erb +2 -2
  169. data/app/views/kaminari/blacklight/_next_page.html.erb +5 -5
  170. data/app/views/kaminari/blacklight/_page.html.erb +5 -3
  171. data/app/views/kaminari/blacklight/_prev_page.html.erb +4 -4
  172. data/app/views/kaminari/blacklight_compact/_paginator.html.erb +4 -4
  173. data/app/views/layouts/blacklight.html.erb +14 -41
  174. data/app/views/layouts/blacklight/base.html.erb +35 -0
  175. data/app/views/layouts/catalog_result.html.erb +11 -0
  176. data/app/views/record_mailer/email_record.text.erb +6 -5
  177. data/app/views/search_history/index.html.erb +16 -21
  178. data/app/views/{_flash_msg.html.erb → shared/_flash_msg.html.erb} +5 -3
  179. data/app/views/shared/_header_navbar.html.erb +8 -13
  180. data/app/views/shared/_modal.html.erb +6 -0
  181. data/app/views/shared/_user_util_links.html.erb +22 -0
  182. data/blacklight.gemspec +8 -11
  183. data/config/i18n-tasks.yml +17 -0
  184. data/config/locales/blacklight.de.yml +71 -82
  185. data/config/locales/blacklight.en.yml +15 -27
  186. data/config/locales/blacklight.es.yml +14 -26
  187. data/config/locales/blacklight.fr.yml +16 -33
  188. data/config/locales/blacklight.hu.yml +212 -0
  189. data/config/locales/blacklight.it.yml +15 -26
  190. data/config/locales/blacklight.nl.yml +212 -0
  191. data/config/locales/blacklight.pt-BR.yml +24 -29
  192. data/config/locales/blacklight.sq.yml +4 -28
  193. data/config/locales/blacklight.zh.yml +3 -25
  194. data/config/routes.rb +2 -10
  195. data/db/migrate/20140202020202_create_bookmarks.rb +0 -1
  196. data/db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb +1 -1
  197. data/lib/blacklight.rb +6 -4
  198. data/lib/blacklight/abstract_repository.rb +9 -9
  199. data/lib/blacklight/configuration.rb +100 -88
  200. data/lib/blacklight/configuration/context.rb +12 -1
  201. data/lib/blacklight/configuration/facet_field.rb +16 -9
  202. data/lib/blacklight/configuration/field.rb +32 -3
  203. data/lib/blacklight/configuration/fields.rb +15 -17
  204. data/lib/blacklight/configuration/null_field.rb +2 -0
  205. data/lib/blacklight/configuration/search_field.rb +2 -2
  206. data/lib/blacklight/configuration/sort_field.rb +2 -2
  207. data/lib/blacklight/configuration/view_config.rb +4 -0
  208. data/lib/blacklight/engine.rb +10 -7
  209. data/lib/blacklight/exceptions.rb +4 -7
  210. data/lib/blacklight/{utils.rb → nested_open_struct_with_hash_access.rb} +9 -81
  211. data/lib/blacklight/open_struct_with_hash_access.rb +49 -0
  212. data/lib/blacklight/parameters.rb +1 -1
  213. data/lib/blacklight/routes/exportable.rb +1 -3
  214. data/lib/blacklight/routes/searchable.rb +3 -3
  215. data/lib/blacklight/runtime_registry.rb +2 -0
  216. data/lib/blacklight/search_builder.rb +28 -35
  217. data/lib/blacklight/search_state.rb +10 -8
  218. data/lib/blacklight/solr/repository.rb +4 -3
  219. data/lib/blacklight/solr/request.rb +1 -1
  220. data/lib/blacklight/solr/response.rb +29 -30
  221. data/lib/blacklight/solr/response/facets.rb +29 -31
  222. data/lib/blacklight/solr/response/group.rb +3 -3
  223. data/lib/blacklight/solr/response/group_response.rb +1 -1
  224. data/lib/blacklight/solr/response/more_like_this.rb +2 -2
  225. data/lib/blacklight/solr/response/response.rb +2 -2
  226. data/lib/blacklight/solr/response/spelling.rb +4 -3
  227. data/lib/blacklight/solr/search_builder_behavior.rb +27 -31
  228. data/lib/blacklight/version.rb +1 -1
  229. data/lib/generators/blacklight/assets_generator.rb +12 -12
  230. data/lib/generators/blacklight/controller_generator.rb +4 -5
  231. data/lib/generators/blacklight/document_generator.rb +1 -1
  232. data/lib/generators/blacklight/install_generator.rb +15 -34
  233. data/lib/generators/blacklight/search_builder_generator.rb +1 -1
  234. data/lib/generators/blacklight/{solr5_generator.rb → solr_generator.rb} +12 -6
  235. data/lib/generators/blacklight/templates/.solr_wrapper.yml +5 -0
  236. data/lib/generators/blacklight/templates/alternate_controller.rb +4 -4
  237. data/lib/generators/blacklight/templates/blacklight.scss +0 -2
  238. data/lib/generators/blacklight/templates/catalog_controller.rb +57 -50
  239. data/lib/generators/blacklight/templates/config/blacklight.yml +1 -13
  240. data/{solr → lib/generators/blacklight/templates/solr}/conf/_rest_managed.json +0 -0
  241. data/{solr → lib/generators/blacklight/templates/solr}/conf/admin-extra.html +0 -0
  242. data/{solr → lib/generators/blacklight/templates/solr}/conf/elevate.xml +0 -0
  243. data/{solr → lib/generators/blacklight/templates/solr}/conf/mapping-ISOLatin1Accent.txt +0 -0
  244. data/{solr → lib/generators/blacklight/templates/solr}/conf/protwords.txt +0 -0
  245. data/lib/generators/blacklight/templates/solr/conf/schema.xml +388 -0
  246. data/{solr → lib/generators/blacklight/templates/solr}/conf/scripts.conf +0 -0
  247. data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml +195 -0
  248. data/{solr → lib/generators/blacklight/templates/solr}/conf/spellings.txt +0 -0
  249. data/{solr → lib/generators/blacklight/templates/solr}/conf/stopwords.txt +0 -0
  250. data/{solr → lib/generators/blacklight/templates/solr}/conf/stopwords_en.txt +0 -0
  251. data/{solr → lib/generators/blacklight/templates/solr}/conf/synonyms.txt +0 -0
  252. data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/example.xsl +0 -0
  253. data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/example_atom.xsl +0 -0
  254. data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/example_rss.xsl +0 -0
  255. data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/luke.xsl +0 -0
  256. data/lib/generators/blacklight/test_support_generator.rb +10 -10
  257. data/lib/generators/blacklight/user_generator.rb +5 -6
  258. data/lib/railties/blacklight.rake +7 -6
  259. data/package-lock.json +2793 -0
  260. data/package.json +30 -0
  261. data/spec/controllers/alternate_controller_spec.rb +5 -4
  262. data/spec/controllers/application_controller_spec.rb +1 -5
  263. data/spec/controllers/blacklight/base_spec.rb +6 -3
  264. data/spec/controllers/blacklight/catalog/component_configuration_spec.rb +11 -7
  265. data/spec/controllers/blacklight/facet_spec.rb +1 -2
  266. data/spec/controllers/blacklight/search_fields_spec.rb +25 -34
  267. data/spec/controllers/bookmarks_controller_spec.rb +17 -13
  268. data/spec/controllers/catalog_controller_spec.rb +332 -164
  269. data/spec/controllers/search_history_controller_spec.rb +6 -6
  270. data/spec/features/alternate_controller_spec.rb +4 -4
  271. data/spec/features/autocomplete_spec.rb +4 -2
  272. data/spec/features/bookmarks_spec.rb +10 -10
  273. data/spec/features/did_you_mean_spec.rb +7 -12
  274. data/spec/features/facets_spec.rb +16 -16
  275. data/spec/features/record_view_spec.rb +12 -18
  276. data/spec/features/search_context_spec.rb +6 -7
  277. data/spec/features/search_crawler_spec.rb +3 -5
  278. data/spec/features/search_filters_spec.rb +80 -80
  279. data/spec/features/search_formats_spec.rb +4 -5
  280. data/spec/features/search_history_spec.rb +6 -29
  281. data/spec/features/search_pagination_spec.rb +4 -2
  282. data/spec/features/search_results_spec.rb +14 -12
  283. data/spec/features/search_sort_spec.rb +2 -2
  284. data/spec/features/search_spec.rb +8 -9
  285. data/spec/features/sitelinks_search_box.rb +4 -4
  286. data/{solr → spec/fixtures}/sample_solr_documents.yml +688 -688
  287. data/spec/helpers/{configuration_helper_spec.rb → blacklight/configuration_helper_behavior_spec.rb} +97 -98
  288. data/spec/helpers/{facets_helper_spec.rb → blacklight/facets_helper_behavior_spec.rb} +72 -67
  289. data/spec/helpers/{hash_as_hidden_fields_spec.rb → blacklight/hash_as_hidden_fields_behavior_spec.rb} +2 -2
  290. data/spec/helpers/blacklight/icon_helper_behavior_spec.rb +10 -0
  291. data/spec/helpers/{layout_helper_spec.rb → blacklight/layout_helper_behavior_spec.rb} +5 -5
  292. data/spec/helpers/{render_constraints_helper_spec.rb → blacklight/render_constraints_helper_behavior_spec.rb} +10 -6
  293. data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb +92 -0
  294. data/spec/helpers/{search_history_constraints_helper_spec.rb → blacklight/search_history_constraints_helper_behavior_spec.rb} +29 -30
  295. data/spec/helpers/{suggest_helper_spec.rb → blacklight/suggest_helper_behavior_spec.rb} +9 -2
  296. data/spec/helpers/{url_helper_spec.rb → blacklight/url_helper_behavior_spec.rb} +61 -54
  297. data/spec/helpers/blacklight_helper_spec.rb +62 -151
  298. data/spec/helpers/catalog_helper_spec.rb +91 -98
  299. data/spec/i18n_spec.rb +18 -0
  300. data/spec/integration/generators/blacklight/{solr5_generator_spec.rb → solr_generator_spec.rb} +21 -13
  301. data/spec/lib/blacklight/configuration/facet_field_spec.rb +13 -0
  302. data/spec/lib/blacklight/configuration/field_spec.rb +15 -0
  303. data/spec/lib/blacklight/nested_open_struct_with_hash_access_spec.rb +17 -0
  304. data/spec/lib/blacklight/open_struct_with_hash_access_spec.rb +148 -0
  305. data/spec/lib/blacklight/parameters_spec.rb +4 -2
  306. data/spec/lib/blacklight/search_state_spec.rb +53 -36
  307. data/spec/lib/blacklight_spec.rb +14 -15
  308. data/spec/lib/tasks/blacklight_task_spec.rb +4 -6
  309. data/spec/models/blacklight/configurable_spec.rb +24 -27
  310. data/spec/models/blacklight/configuration/context_spec.rb +9 -10
  311. data/spec/models/blacklight/configuration_spec.rb +188 -165
  312. data/spec/models/blacklight/document/active_model_shim_spec.rb +15 -6
  313. data/spec/models/blacklight/document/cache_key_spec.rb +10 -3
  314. data/spec/models/blacklight/document/dublin_core_spec.rb +17 -20
  315. data/spec/models/blacklight/document/email_spec.rb +10 -10
  316. data/spec/models/blacklight/document/sms_spec.rb +10 -10
  317. data/spec/models/blacklight/document_spec.rb +10 -22
  318. data/spec/models/blacklight/facet_paginator_spec.rb +40 -30
  319. data/spec/models/blacklight/icon_spec.rb +58 -0
  320. data/spec/models/blacklight/search_builder_spec.rb +41 -26
  321. data/spec/models/blacklight/solr/document_spec.rb +224 -216
  322. data/spec/models/blacklight/solr/facet_paginator_spec.rb +6 -4
  323. data/spec/models/blacklight/solr/repository_spec.rb +50 -42
  324. data/spec/models/blacklight/solr/request_spec.rb +17 -18
  325. data/spec/models/blacklight/solr/response/facets_spec.rb +60 -60
  326. data/spec/models/blacklight/solr/response/group_response_spec.rb +16 -22
  327. data/spec/models/blacklight/solr/response/group_spec.rb +18 -25
  328. data/spec/models/blacklight/solr/response_spec.rb +69 -68
  329. data/spec/models/blacklight/solr/search_builder_spec.rb +150 -164
  330. data/spec/models/blacklight/suggest/response_spec.rb +2 -1
  331. data/spec/models/blacklight/suggest_search_spec.rb +4 -4
  332. data/spec/models/blacklight/user_spec.rb +9 -11
  333. data/spec/models/bookmark_spec.rb +7 -6
  334. data/spec/models/record_mailer_spec.rb +23 -21
  335. data/spec/models/search_spec.rb +19 -18
  336. data/spec/models/solr_document_spec.rb +33 -5
  337. data/spec/presenters/blacklight/document_presenter_spec.rb +86 -0
  338. data/spec/presenters/{index_presenter_spec.rb → blacklight/index_presenter_spec.rb} +25 -62
  339. data/spec/presenters/blacklight/json_presenter_spec.rb +59 -0
  340. data/spec/presenters/blacklight/link_alternate_presenter_spec.rb +3 -0
  341. data/spec/presenters/blacklight/search_bar_presenter_spec.rb +79 -0
  342. data/spec/presenters/{show_presenter_spec.rb → blacklight/show_presenter_spec.rb} +47 -62
  343. data/spec/presenters/pipeline_spec.rb +18 -11
  344. data/spec/presenters/thumbnail_presenter_spec.rb +174 -0
  345. data/spec/routing/catalog_routing_spec.rb +13 -15
  346. data/spec/services/blacklight/search_service_spec.rb +495 -0
  347. data/spec/spec_helper.rb +12 -24
  348. data/spec/support/features.rb +1 -1
  349. data/spec/support/features/session_helpers.rb +4 -4
  350. data/spec/test_app_templates/Gemfile.extra +2 -5
  351. data/spec/test_app_templates/lib/generators/test_app_generator.rb +12 -13
  352. data/spec/views/catalog/_constraints.html.erb_spec.rb +3 -6
  353. data/spec/views/catalog/_constraints_element.html.erb_spec.rb +17 -13
  354. data/spec/views/catalog/_document.html.erb_spec.rb +11 -11
  355. data/spec/views/catalog/_document_list.html.erb_spec.rb +2 -1
  356. data/spec/views/catalog/_facet_index_navigation.html.erb_spec.rb +5 -5
  357. data/spec/views/catalog/_facet_layout.html.erb_spec.rb +6 -6
  358. data/spec/views/catalog/_facets.html.erb_spec.rb +37 -16
  359. data/spec/views/catalog/{_index_default.erb_spec.rb → _index.html.erb_spec.rb} +14 -15
  360. data/spec/views/catalog/{_index_header_default.html.erb_spec.rb → _index_header.html.erb_spec.rb} +6 -9
  361. data/spec/views/catalog/_paginate_compact.html.erb_spec.rb +7 -30
  362. data/spec/views/catalog/_search_header.erb_spec.rb +1 -3
  363. data/spec/views/catalog/{_show_default.erb_spec.rb → _show.html.erb_spec.rb} +13 -14
  364. data/spec/views/catalog/_show_sidebar.erb_spec.rb +7 -10
  365. data/spec/views/catalog/_show_tools.html.erb_spec.rb +5 -5
  366. data/spec/views/catalog/_sort_and_per_page.html.erb_spec.rb +1 -2
  367. data/spec/views/catalog/_sort_widget.html.erb_spec.rb +3 -1
  368. data/spec/views/catalog/{_thumbnail_default.erb_spec.rb → _thumbnail.html.erb_spec.rb} +7 -9
  369. data/spec/views/catalog/_view_type_group.html.erb_spec.rb +12 -10
  370. data/spec/views/catalog/email_success.html.erb_spec.rb +8 -0
  371. data/spec/views/catalog/facet.html.erb_spec.rb +4 -3
  372. data/spec/views/catalog/facet.json.jbuilder_spec.rb +3 -2
  373. data/spec/views/catalog/index.atom.builder_spec.rb +11 -6
  374. data/spec/views/catalog/index.html.erb_spec.rb +6 -8
  375. data/spec/views/catalog/index.json.jbuilder_spec.rb +119 -26
  376. data/spec/views/catalog/opensearch.xml.builder_spec.rb +1 -1
  377. data/spec/views/catalog/show.html.erb_spec.rb +8 -8
  378. data/spec/views/catalog/show.json.jbuilder_spec.rb +40 -0
  379. data/spec/views/catalog/sms_success.html.erb_spec.rb +8 -0
  380. data/spec/views/{_user_util_links.html.erb_spec.rb → shared/_user_util_links.html.erb_spec.rb} +4 -7
  381. data/tasks/blacklight.rake +6 -6
  382. data/template.demo.rb +4 -12
  383. metadata +174 -207
  384. data/app/assets/javascripts/blacklight/autofocus.js +0 -16
  385. data/app/assets/javascripts/blacklight/bookmark_toggle.js +0 -23
  386. data/app/assets/javascripts/blacklight/checkbox_submit.js +0 -139
  387. data/app/assets/javascripts/blacklight/core.js +0 -30
  388. data/app/controllers/concerns/blacklight/request_builders.rb +0 -77
  389. data/app/controllers/concerns/blacklight/saved_searches.rb +0 -70
  390. data/app/controllers/concerns/blacklight/search_helper.rb +0 -161
  391. data/app/controllers/concerns/blacklight/suggest.rb +0 -25
  392. data/app/controllers/saved_searches_controller.rb +0 -4
  393. data/app/controllers/suggest_controller.rb +0 -4
  394. data/app/helpers/blacklight/deprecated_url_helper_behavior.rb +0 -57
  395. data/app/helpers/blacklight/render_partials_helper.rb +0 -205
  396. data/app/helpers/blacklight_configuration_helper.rb +0 -4
  397. data/app/helpers/blacklight_url_helper.rb +0 -4
  398. data/app/helpers/component_helper.rb +0 -4
  399. data/app/helpers/facets_helper.rb +0 -4
  400. data/app/helpers/hash_as_hidden_fields_helper.rb +0 -4
  401. data/app/helpers/layout_helper.rb +0 -4
  402. data/app/helpers/render_constraints_helper.rb +0 -4
  403. data/app/helpers/search_history_constraints_helper.rb +0 -4
  404. data/app/helpers/suggest_helper.rb +0 -4
  405. data/app/models/concerns/blacklight/solr/document/more_like_this.rb +0 -6
  406. data/app/views/_user_util_links.html.erb +0 -26
  407. data/app/views/blacklight/nav/_saved_searches.html.erb +0 -1
  408. data/app/views/catalog/_index_default.html.erb +0 -12
  409. data/app/views/catalog/_show_default.html.erb +0 -10
  410. data/app/views/catalog/_thumbnail_default.html.erb +0 -5
  411. data/app/views/saved_searches/index.html.erb +0 -32
  412. data/app/views/shared/_ajax_modal.html.erb +0 -6
  413. data/lib/generators/blacklight/solr4_generator.rb +0 -31
  414. data/lib/generators/blacklight/templates/config/jetty.yml +0 -13
  415. data/solr/conf/schema.xml +0 -629
  416. data/solr/conf/solrconfig.xml +0 -411
  417. data/spec/controllers/blacklight/search_helper_spec.rb +0 -489
  418. data/spec/controllers/saved_searches_controller_spec.rb +0 -32
  419. data/spec/controllers/suggest_controller_spec.rb +0 -17
  420. data/spec/features/saved_searches_spec.rb +0 -47
  421. data/spec/helpers/deprecated_url_helper_behavior_spec.rb +0 -101
  422. data/spec/lib/blacklight/utils_spec.rb +0 -167
  423. data/spec/models/blacklight/solr/document/more_like_this_spec.rb +0 -18
  424. data/spec/presenters/document_presenter_spec.rb +0 -438
  425. data/spec/support/backport_test.rb +0 -14
data/spec/spec_helper.rb CHANGED
@@ -5,14 +5,9 @@
5
5
 
6
6
  ENV["RAILS_ENV"] ||= 'test'
7
7
 
8
- if ENV["COVERAGE"] or ENV["CI"]
9
- require 'simplecov'
10
- require 'coveralls'
11
-
12
- SimpleCov.formatter = Coveralls::SimpleCov::Formatter
13
- SimpleCov.start do
14
- add_filter "/spec/"
15
- end
8
+ require 'simplecov'
9
+ SimpleCov.start do
10
+ add_filter "/spec/"
16
11
  end
17
12
 
18
13
  require 'rsolr'
@@ -27,26 +22,22 @@ require 'rspec/collection_matchers'
27
22
  require 'capybara/rspec'
28
23
  require 'selenium-webdriver'
29
24
  require 'equivalent-xml'
25
+ require 'webdrivers'
30
26
 
31
- Capybara.javascript_driver = :headless_chrome
32
-
33
- Capybara.register_driver :headless_chrome do |app|
34
- capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
35
- chromeOptions: { args: %w[headless disable-gpu] }
36
- )
37
-
38
- Capybara::Selenium::Driver.new(app,
39
- browser: :chrome,
40
- desired_capabilities: capabilities)
41
- end
27
+ Capybara.javascript_driver = :selenium_chrome_headless
42
28
 
43
29
  # Requires supporting ruby files with custom matchers and macros, etc,
44
30
  # in spec/support/ and its subdirectories.
45
31
  # Blacklight, again, make sure we're looking in the right place for em.
46
32
  # Relative to HERE, NOT to Rails.root, which is off somewhere else.
47
- Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each {|f| require f}
33
+ Dir[Pathname.new(File.expand_path('support/**/*.rb', __dir__))].each { |f| require f }
48
34
 
49
35
  RSpec.configure do |config|
36
+ config.disable_monkey_patching!
37
+
38
+ # When we're testing the API, only run the api tests
39
+ config.filter_run api: true if ENV['BLACKLIGHT_API_TEST']
40
+
50
41
  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
51
42
  config.fixture_path = "#{::Rails.root}/spec/fixtures"
52
43
 
@@ -59,6 +50,7 @@ RSpec.configure do |config|
59
50
  config.include Devise::Test::ControllerHelpers, type: :controller
60
51
  else
61
52
  config.include Devise::TestHelpers, type: :controller
53
+ config.include Devise::TestHelpers, type: :i18n
62
54
  end
63
55
 
64
56
  config.infer_spec_type_from_file_location!
@@ -69,10 +61,6 @@ RSpec.configure do |config|
69
61
  config.include(ControllerLevelHelpers, type: :view)
70
62
  config.before(:each, type: :view) { initialize_controller_helpers(view) }
71
63
 
72
- unless Rails.version > '5'
73
- config.include BackportTest, type: :controller
74
- end
75
-
76
64
  config.expect_with :rspec do |expectations|
77
65
  expectations.include_chain_clauses_in_custom_matcher_descriptions = true
78
66
  end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
  # spec/support/features.rb
3
3
 
4
- require File.expand_path("../features/session_helpers.rb", __FILE__)
4
+ require File.expand_path('features/session_helpers.rb', __dir__)
5
5
 
6
6
  RSpec.configure do |config|
7
7
  config.include Features::SessionHelpers, type: :feature
@@ -13,11 +13,11 @@ module Features
13
13
 
14
14
  def sign_in(login = 'user1')
15
15
  email = "#{login}@#{login}.com"
16
- user = User.create(:email => email, :password => "password", :password_confirmation => "password")
16
+ User.create(email: email, password: "password", password_confirmation: "password")
17
17
  visit new_user_session_path
18
- fill_in("user_email", :with => email)
19
- fill_in("user_password", :with => "password")
20
-
18
+ fill_in("user_email", with: email)
19
+ fill_in("user_password", with: "password")
20
+
21
21
  if has_button? "Sign in"
22
22
  click_button("Sign in")
23
23
  elsif has_button? "Log in"
@@ -1,5 +1,2 @@
1
- if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^5\./ || ENV['RAILS_VERSION'] == 'edge'
2
- gem 'rails-controller-testing'
3
- gem 'thor', '~> 0.20'
4
- gem 'deprecation'
5
- end
1
+ gem 'rails-controller-testing'
2
+ gem 'thor', '~> 0.20'
@@ -2,32 +2,31 @@
2
2
  require 'rails/generators'
3
3
 
4
4
  class TestAppGenerator < Rails::Generators::Base
5
- source_root File.expand_path("../../../../test_app_templates", __FILE__)
5
+ source_root File.expand_path('../../../test_app_templates', __dir__)
6
6
 
7
- def fix_travis_rails_4
8
- if ENV['TRAVIS']
9
- insert_into_file 'app/assets/stylesheets/application.css', :before =>'/*' do
10
- "@charset \"UTF-8\";\n"
11
- end
12
- end
13
- end
14
-
15
- def remove_index
7
+ def remove_index
16
8
  remove_file "public/index.html"
17
9
  end
18
10
 
19
11
  def run_blacklight_generator
20
- say_status("warning", "GENERATING BL", :yellow)
12
+ say_status("warning", "GENERATING BL", :yellow)
21
13
 
22
14
  Bundler.with_clean_env do
23
15
  run "bundle install"
24
16
  end
17
+ options = '--devise'
18
+ if ENV['BLACKLIGHT_API_TEST']
19
+ options += ' --skip-assets'
20
+ inject_into_class 'app/controllers/application_controller.rb', 'ApplicationController' do
21
+ " include ActionController::MimeResponds\n" # see https://github.com/projectblacklight/blacklight/issues/1894
22
+ end
23
+ end
25
24
 
26
- generate 'blacklight:install', '--devise --marc --jettywrapper'
25
+ generate 'blacklight:install', options
27
26
  end
28
27
 
29
28
  def run_test_support_generator
30
- say_status("warning", "GENERATING test_support", :yellow)
29
+ say_status("warning", "GENERATING test_support", :yellow)
31
30
 
32
31
  generate 'blacklight:test_support'
33
32
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- describe "catalog/constraints" do
3
+ RSpec.describe "catalog/constraints" do
4
4
  let :blacklight_config do
5
5
  Blacklight::Configuration.new do |config|
6
6
  config.view.xyz
@@ -18,8 +18,7 @@ describe "catalog/constraints" do
18
18
  allow(view).to receive_messages(query_has_constraints?: true)
19
19
  allow(view).to receive(:blacklight_config).and_return(blacklight_config)
20
20
  render partial: "catalog/constraints"
21
- expect(rendered).to have_selector("#startOverLink")
22
- expect(rendered).to have_link("Start Over", :href => 'http://xyz')
21
+ expect(rendered).to have_link("Start Over", href: 'http://xyz')
23
22
  end
24
23
 
25
24
  it "renders a start over link with the current view type" do
@@ -28,8 +27,6 @@ describe "catalog/constraints" do
28
27
  params[:view] = 'xyz'
29
28
  allow(view).to receive(:blacklight_config).and_return(blacklight_config)
30
29
  render partial: "catalog/constraints"
31
- expect(rendered).to have_selector("#startOverLink")
32
- expect(rendered).to have_link("Start Over", :href => 'http://xyz?view=xyz')
30
+ expect(rendered).to have_link("Start Over", href: 'http://xyz?view=xyz')
33
31
  end
34
-
35
32
  end
@@ -1,26 +1,28 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- describe "catalog/_constraints_element.html.erb" do
3
+ RSpec.describe "catalog/_constraints_element.html.erb" do
4
4
  describe "for simple display" do
5
5
  before do
6
- render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value"}
6
+ render partial: "catalog/constraints_element", locals: { label: "my label", value: "my value" }
7
7
  end
8
+
8
9
  it "renders label and value" do
9
- expect(rendered).to have_selector("span.appliedFilter.constraint") do |s|
10
+ expect(rendered).to have_selector("span.applied-filter.constraint") do |s|
10
11
  expect(s).to have_css("span.constraint-value")
11
- expect(s).to_not have_css("a.constraint-value")
12
- expect(s).to have_selector "span.filterName", :content => "my label"
13
- expect(s).to have_selector "span.filterValue", :content => "my value"
12
+ expect(s).not_to have_css("a.constraint-value")
13
+ expect(s).to have_selector "span.filter-name", content: "my label"
14
+ expect(s).to have_selector "span.filter-value", content: "my value"
14
15
  end
15
16
  end
16
17
  end
17
18
 
18
19
  describe "with remove link" do
19
20
  before do
20
- render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:remove => "http://remove"}}
21
+ render partial: "catalog/constraints_element", locals: { label: "my label", value: "my value", options: { remove: "http://remove" } }
21
22
  end
23
+
22
24
  it "includes remove link" do
23
- expect(rendered).to have_selector("span.appliedFilter") do |s|
25
+ expect(rendered).to have_selector("span.applied-filter") do |s|
24
26
  expect(s).to have_selector(".remove[href='http://remove']")
25
27
  end
26
28
  end
@@ -33,20 +35,22 @@ describe "catalog/_constraints_element.html.erb" do
33
35
 
34
36
  describe "with custom classes" do
35
37
  before do
36
- render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:classes => ["class1", "class2"]}}
38
+ render partial: "catalog/constraints_element", locals: { label: "my label", value: "my value", options: { classes: %w[class1 class2] } }
37
39
  end
40
+
38
41
  it "includes them" do
39
- expect(rendered).to have_selector("span.appliedFilter.constraint.class1.class2")
42
+ expect(rendered).to have_selector("span.applied-filter.constraint.class1.class2")
40
43
  end
41
44
  end
42
45
 
43
46
  describe "with no escaping" do
44
47
  before do
45
- render( :partial => "catalog/constraints_element", :locals => {:label => "<span class='custom_label'>my label</span>".html_safe, :value => "<span class='custom_value'>my value</span>".html_safe} )
48
+ render(partial: "catalog/constraints_element", locals: { label: "<span class='custom_label'>my label</span>".html_safe, value: "<span class='custom_value'>my value</span>".html_safe })
46
49
  end
50
+
47
51
  it "does not escape key and value" do
48
- expect(rendered).to have_selector("span.appliedFilter.constraint span.filterName span.custom_label")
49
- expect(rendered).to have_selector("span.appliedFilter.constraint span.filterValue span.custom_value")
52
+ expect(rendered).to have_selector("span.applied-filter.constraint span.filter-name span.custom_label")
53
+ expect(rendered).to have_selector("span.applied-filter.constraint span.filter-value span.custom_value")
50
54
  end
51
55
  end
52
56
  end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- describe "catalog/_document" do
4
- let(:document) { SolrDocument.new :id => 'xyz', :format => 'a' }
3
+ RSpec.describe "catalog/_document" do
4
+ let(:document) { SolrDocument.new id: 'xyz', format: 'a' }
5
5
  let(:blacklight_config) { Blacklight::Configuration.new }
6
6
 
7
7
  before do
@@ -10,23 +10,23 @@ describe "catalog/_document" do
10
10
  end
11
11
 
12
12
  it "renders the header, thumbnail and index by default" do
13
- stub_template "catalog/_index_header_default.html.erb" => "document_header"
14
- stub_template "catalog/_thumbnail_default.html.erb" => "thumbnail_default"
13
+ stub_template "catalog/_index_header.html.erb" => "document_header"
14
+ stub_template "catalog/_thumbnail.html.erb" => "thumbnail_default"
15
15
  stub_template "catalog/_index_default.html.erb" => "index_default"
16
- render :partial => "catalog/document", :locals => {:document => document, :document_counter => 1}
16
+ render partial: "catalog/document", locals: { document: document, document_counter: 1 }
17
17
  expect(rendered).to match /document_header/
18
18
  expect(rendered).to match /thumbnail_default/
19
19
  expect(rendered).to match /index_default/
20
- expect(rendered).to have_selector('div.document[@itemscope]')
21
- expect(rendered).to have_selector('div.document[@itemtype="http://schema.org/Thing"]')
20
+ expect(rendered).to have_selector('.document[@itemscope]')
21
+ expect(rendered).to have_selector('.document[@itemtype="http://schema.org/Thing"]')
22
22
  end
23
23
 
24
24
  it "uses the index.partials parameter to determine the partials to render" do
25
- blacklight_config.index.partials = ['a', 'b', 'c']
25
+ blacklight_config.index.partials = %w[a b c]
26
26
  stub_template "catalog/_a_default.html.erb" => "a_partial"
27
27
  stub_template "catalog/_b_default.html.erb" => "b_partial"
28
28
  stub_template "catalog/_c_default.html.erb" => "c_partial"
29
- render :partial => "catalog/document", :locals => {:document => document, :document_counter => 1}
29
+ render partial: "catalog/document", locals: { document: document, document_counter: 1 }
30
30
  expect(rendered).to match /a_partial/
31
31
  expect(rendered).to match /b_partial/
32
32
  expect(rendered).to match /c_partial/
@@ -35,12 +35,12 @@ describe "catalog/_document" do
35
35
  it 'has a css class with the document position' do
36
36
  allow(view).to receive(:render_document_partials)
37
37
  render partial: 'catalog/document', locals: { document: document, document_counter: 5 }
38
- expect(rendered).to have_selector 'div.document-position-5'
38
+ expect(rendered).to have_selector '.document-position-5'
39
39
  end
40
40
 
41
41
  it 'has a data attribute with the document position' do
42
42
  allow(view).to receive(:render_document_partials)
43
43
  render partial: 'catalog/document', locals: { document: document, document_counter: 5 }
44
- expect(rendered).to have_selector 'div.document[@data-document-counter="5"]'
44
+ expect(rendered).to have_selector '.document[@data-document-counter="5"]'
45
45
  end
46
46
  end
@@ -1,9 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- describe "catalog/_document_list", type: :view do
3
+ RSpec.describe "catalog/_document_list", type: :view do
4
4
  before do
5
5
  allow(view).to receive_messages(document_index_view_type: "some-view", documents: [])
6
6
  end
7
+
7
8
  it "includes a class for the current view" do
8
9
  render
9
10
  expect(rendered).to have_selector(".documents-some-view")
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- describe 'catalog/_facet_index_navigation.html.erb', type: :view do
3
+ RSpec.describe 'catalog/_facet_index_navigation.html.erb', type: :view do
4
4
  let(:pagination) { Blacklight::Solr::FacetPaginator.new([]) }
5
- let(:facet) { Blacklight::Configuration::FacetField.new({ index_range: '0'..'9' })}
5
+ let(:facet) { Blacklight::Configuration::FacetField.new(index_range: '0'..'9') }
6
6
  let(:blacklight_config) { Blacklight::Configuration.new }
7
7
 
8
8
  before do
@@ -21,9 +21,9 @@ describe 'catalog/_facet_index_navigation.html.erb', type: :view do
21
21
  expect(rendered).to have_link '9'
22
22
  end
23
23
 
24
- it 'renders a "clear filter" button' do
24
+ it 'renders an "all" button' do
25
25
  render
26
- expect(rendered).to have_selector '.btn.disabled', text: 'Clear Filter'
26
+ expect(rendered).to have_selector '.page-link', text: 'All'
27
27
  end
28
28
 
29
29
  context 'with a selected index' do
@@ -35,7 +35,7 @@ describe 'catalog/_facet_index_navigation.html.erb', type: :view do
35
35
  end
36
36
  it 'enables the clear facets button' do
37
37
  render
38
- expect(rendered).to have_link 'Clear Filter'
38
+ expect(rendered).to have_link 'All'
39
39
  end
40
40
  end
41
41
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- describe "catalog/facet_layout" do
3
+ RSpec.describe "catalog/facet_layout" do
4
4
  let :blacklight_config do
5
5
  Blacklight::Configuration.new do |config|
6
6
  config.facet_fields[facet_field.field] = facet_field
@@ -22,19 +22,19 @@ describe "catalog/facet_layout" do
22
22
 
23
23
  it "has a title with a link for a11y" do
24
24
  render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
25
- expect(rendered).to have_selector 'h3 a', text: 'Some Field'
25
+ expect(rendered).to have_selector 'h3', text: 'Some Field'
26
26
  end
27
27
 
28
28
  it "is collapsable" do
29
29
  render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
30
- expect(rendered).to have_selector '.panel-heading.collapsed'
31
- expect(rendered).to have_selector '.collapse .panel-body'
30
+ expect(rendered).to have_selector '.card-header.collapsed'
31
+ expect(rendered).to have_selector '.collapse .card-body'
32
32
  end
33
33
 
34
34
  it "is configured to be open by default" do
35
35
  allow(facet_field).to receive_messages(collapse: false)
36
36
  render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
37
- expect(rendered).to_not have_selector '.panel-heading.collapsed'
38
- expect(rendered).to have_selector '.in .panel-body'
37
+ expect(rendered).not_to have_selector '.card-header.collapsed'
38
+ expect(rendered).to have_selector '.show .card-body'
39
39
  end
40
40
  end
@@ -1,40 +1,61 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- describe "catalog/_facets" do
3
+ RSpec.describe "catalog/_facets" do
4
4
  let(:blacklight_config) { Blacklight::Configuration.new }
5
5
 
6
6
  before do
7
7
  allow(view).to receive_messages(blacklight_config: blacklight_config)
8
- allow(view).to receive(:search_action_path) do |*args|
9
- '/catalog'
10
- end
8
+ allow(view).to receive(:search_action_path).and_return('/catalog')
11
9
  end
12
10
 
13
11
  context "without any facet fields" do
14
12
  it "does not have a header if no facets are displayed" do
15
- allow(view).to receive_messages(:render_facet_partials => '')
13
+ allow(view).to receive_messages(render_facet_partials: '')
16
14
  render
17
- expect(rendered).to_not have_selector('h4')
15
+ expect(rendered).not_to have_selector('h4')
18
16
  end
19
17
  end
20
- context "with facet fields" do
21
18
 
19
+ context "with facet groups" do
22
20
  let :facet_field do
23
- Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label').normalize!
21
+ Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label', group: nil).normalize!
24
22
  end
25
23
 
26
24
  before do
27
25
  blacklight_config.facet_fields['facet_field_1'] = facet_field
28
- @mock_display_facet_1 = double(:name => 'facet_field_1', sort: nil, offset: nil, prefix: nil, :items => [Blacklight::Solr::Response::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
29
- allow(view).to receive_messages(:facet_field_names => [:facet_field_1], :facet_limit_for => 10)
30
- @response = double()
26
+ @mock_display_facet_1 = double(name: 'facet_field_1', sort: nil, offset: nil, prefix: nil, items: [Blacklight::Solr::Response::Facets::FacetItem.new(value: 'Value', hits: 1234)])
27
+ allow(view).to receive_messages(facet_group_names: [nil], facet_field_names: [:facet_field_1], facet_limit_for: 10)
28
+ @response = double
31
29
  allow(@response).to receive(:aggregations).and_return("facet_field_1" => @mock_display_facet_1)
32
30
  end
33
31
 
34
- it "has a header" do
35
- allow(view).to receive_messages(:render_facet_partials => '')
36
- render
37
- expect(rendered).to have_selector('.facets-heading')
32
+ context "with the default facet group" do
33
+ it "has a header" do
34
+ allow(view).to receive_messages(render_facet_partials: '')
35
+ render
36
+ expect(rendered).to have_selector('.facets-heading')
37
+ end
38
+ end
39
+
40
+ context "with a named facet group" do
41
+ let :facet_field do
42
+ Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label', group: 'group_1').normalize!
43
+ end
44
+
45
+ before do
46
+ blacklight_config.facet_fields['facet_field_1'] = facet_field
47
+ @mock_display_facet_1 = double(name: 'facet_field_1', sort: nil, offset: nil, prefix: nil, items: [Blacklight::Solr::Response::Facets::FacetItem.new(value: 'Value', hits: 1234)])
48
+ allow(view).to receive_messages(facet_group_names: [nil, 'group_1'], facet_field_names: [:facet_field_1], facet_limit_for: 10)
49
+ @response = double
50
+ allow(@response).to receive(:aggregations).and_return("facet_field_1" => @mock_display_facet_1)
51
+ end
52
+
53
+ it "has a header" do
54
+ allow(view).to receive_messages(render_facet_partials: '')
55
+ render
56
+ expect(rendered).to have_selector('.facets-heading')
57
+ expect(rendered).to have_selector('#facets-group_1')
58
+ end
38
59
  end
39
60
 
40
61
  describe "facet display" do
@@ -47,7 +68,7 @@ describe "catalog/_facets" do
47
68
  # The .facet-content class is used by blacklight_range_limit js, and
48
69
  # should be applied to the .panel-collapse div that contains the collapsible
49
70
  # facet content. Please make sure it remains if possible.
50
- expect(rendered).to have_selector('.facet-content a.facet_select')
71
+ expect(rendered).to have_selector('.facet-content a.facet-select')
51
72
  expect(rendered).to have_selector('.facet-content .facet-count')
52
73
  end
53
74
  end