blacklight 7.40.0 → 8.0.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.env +2 -3
- data/.github/workflows/ruby.yml +36 -114
- data/.rubocop.yml +243 -14
- data/.rubocop_todo.yml +137 -429
- data/Gemfile +11 -6
- data/README.md +11 -3
- data/VERSION +1 -1
- data/app/assets/javascripts/blacklight/blacklight.esm.js +384 -0
- data/app/assets/javascripts/blacklight/blacklight.esm.js.map +1 -0
- data/app/assets/javascripts/blacklight/blacklight.js +374 -493
- data/app/assets/javascripts/blacklight/blacklight.js.map +1 -0
- data/app/assets/stylesheets/blacklight/_autocomplete.scss +25 -0
- data/app/assets/stylesheets/blacklight/_blacklight_base.scss +1 -1
- data/app/assets/stylesheets/blacklight/_bookmark.scss +16 -0
- data/app/assets/stylesheets/blacklight/_bootstrap_overrides.scss +8 -0
- data/app/assets/stylesheets/blacklight/_constraints.scss +4 -4
- data/app/assets/stylesheets/blacklight/_facets.scss +72 -44
- data/app/assets/stylesheets/blacklight/_header.scss +0 -15
- data/app/assets/stylesheets/blacklight/_icons.scss +0 -14
- data/app/assets/stylesheets/blacklight/_mixins.scss +20 -0
- data/app/assets/stylesheets/blacklight/_modal.scss +8 -2
- data/app/assets/stylesheets/blacklight/_search_form.scss +30 -3
- data/app/assets/stylesheets/blacklight/_search_history.scss +10 -1
- data/app/assets/stylesheets/blacklight/_search_results.scss +6 -2
- data/app/assets/stylesheets/blacklight/blacklight_defaults.scss +4 -1
- data/app/builders/blacklight/action_builder.rb +18 -9
- data/app/components/blacklight/advanced_search_form_component.html.erb +3 -3
- data/app/components/blacklight/advanced_search_form_component.rb +8 -10
- data/app/components/blacklight/constraints_component.rb +27 -37
- data/app/components/blacklight/document/action_component.rb +9 -9
- data/app/components/blacklight/document/actions_component.rb +2 -2
- data/app/components/blacklight/document/bookmark_component.html.erb +9 -0
- data/app/components/blacklight/document/bookmark_component.rb +4 -2
- data/app/components/blacklight/document/citation_component.rb +5 -3
- data/app/components/blacklight/document/group_component.rb +7 -3
- data/app/components/blacklight/document/sidebar_component.html.erb +2 -0
- data/app/components/blacklight/document/sidebar_component.rb +16 -0
- data/app/components/blacklight/document/thumbnail_component.html.erb +2 -7
- data/app/components/blacklight/document/thumbnail_component.rb +1 -9
- data/app/components/blacklight/document_component.html.erb +1 -1
- data/app/components/blacklight/document_component.rb +16 -78
- data/app/components/blacklight/document_metadata_component.html.erb +2 -4
- data/app/components/blacklight/document_metadata_component.rb +5 -10
- data/app/components/blacklight/facet_component.rb +3 -3
- data/app/components/blacklight/facet_field_checkboxes_component.html.erb +4 -4
- data/app/components/blacklight/facet_field_checkboxes_component.rb +1 -1
- data/app/components/blacklight/facet_field_component.html.erb +4 -5
- data/app/components/blacklight/facet_field_component.rb +9 -2
- data/app/components/blacklight/facet_field_list_component.html.erb +3 -3
- data/app/components/blacklight/facet_field_list_component.rb +37 -5
- data/app/components/blacklight/facet_field_no_layout_component.rb +0 -2
- data/app/components/blacklight/facet_item_component.rb +1 -43
- data/app/components/blacklight/facet_item_pivot_component.rb +21 -23
- data/app/components/blacklight/header_component.rb +1 -1
- data/app/components/blacklight/hidden_search_state_component.rb +1 -2
- data/app/components/blacklight/icons/icon_component.rb +4 -9
- data/app/components/blacklight/icons/legacy_icon_component.rb +30 -0
- data/app/components/blacklight/icons/list_component.rb +16 -0
- data/app/components/blacklight/icons/search_component.rb +16 -0
- data/app/components/blacklight/metadata_field_component.html.erb +2 -2
- data/app/components/blacklight/metadata_field_component.rb +24 -8
- data/app/components/blacklight/metadata_field_layout_component.rb +4 -25
- data/app/components/blacklight/response/facet_group_component.html.erb +3 -5
- data/app/components/blacklight/response/facet_group_component.rb +29 -8
- data/app/components/blacklight/response/pagination_component.html.erb +1 -1
- data/app/components/blacklight/response/pagination_component.rb +2 -11
- data/app/components/blacklight/response/sort_component.html.erb +6 -1
- data/app/components/blacklight/response/sort_component.rb +1 -16
- data/app/components/blacklight/response/spellcheck_component.rb +18 -7
- data/app/components/blacklight/response/view_type_button_component.rb +3 -7
- data/app/components/blacklight/response/view_type_component.rb +4 -6
- data/app/components/blacklight/search/sidebar_component.html.erb +8 -0
- data/app/components/blacklight/search/sidebar_component.rb +17 -0
- data/app/components/blacklight/search_bar_component.html.erb +20 -15
- data/app/components/blacklight/search_bar_component.rb +2 -16
- data/app/components/blacklight/search_button_component.rb +3 -3
- data/app/components/blacklight/search_context_component.rb +43 -9
- data/app/components/blacklight/search_header_component.html.erb +2 -0
- data/app/components/blacklight/search_header_component.rb +6 -0
- data/app/components/blacklight/start_over_button_component.rb +5 -3
- data/app/components/blacklight/system/dropdown_component.rb +8 -5
- data/app/components/blacklight/system/flash_message_component.html.erb +4 -2
- data/app/components/blacklight/system/flash_message_component.rb +12 -3
- data/app/components/blacklight/system/modal_component.html.erb +1 -1
- data/app/components/blacklight/system/modal_component.rb +1 -3
- data/app/components/blacklight/top_navbar_component.html.erb +1 -1
- data/app/components/blacklight/top_navbar_component.rb +0 -4
- data/app/controllers/bookmarks_controller.rb +1 -0
- data/app/controllers/catalog_controller.rb +1 -0
- data/app/controllers/concerns/blacklight/bookmarks.rb +10 -9
- data/app/controllers/concerns/blacklight/catalog.rb +21 -83
- data/app/controllers/concerns/blacklight/controller.rb +3 -41
- data/app/controllers/concerns/blacklight/search_context.rb +25 -7
- data/app/controllers/concerns/blacklight/search_history.rb +2 -0
- data/app/controllers/concerns/blacklight/searchable.rb +12 -1
- data/app/controllers/concerns/blacklight/token_based_user.rb +13 -1
- data/app/controllers/search_history_controller.rb +1 -0
- data/app/helpers/blacklight/blacklight_helper_behavior.rb +12 -310
- data/app/helpers/blacklight/catalog_helper_behavior.rb +22 -139
- data/app/helpers/blacklight/component_helper_behavior.rb +2 -53
- data/app/helpers/blacklight/configuration_helper_behavior.rb +2 -119
- data/app/helpers/blacklight/facets_helper_behavior.rb +4 -321
- data/app/helpers/blacklight/icon_helper_behavior.rb +5 -7
- data/app/helpers/blacklight/layout_helper_behavior.rb +4 -3
- data/app/helpers/blacklight/render_partials_helper_behavior.rb +11 -31
- data/app/helpers/blacklight/url_helper_behavior.rb +12 -97
- data/app/helpers/blacklight_helper.rb +1 -0
- data/app/helpers/catalog_helper.rb +1 -0
- data/app/javascript/blacklight/bookmark_toggle.js +13 -19
- data/app/javascript/blacklight/button_focus.js +12 -10
- data/app/javascript/blacklight/checkbox_submit.js +68 -123
- data/app/javascript/blacklight/core.js +5 -7
- data/app/javascript/blacklight/index.js +13 -0
- data/app/javascript/blacklight/modal.js +99 -164
- data/app/javascript/blacklight/modalForm.js +60 -0
- data/app/javascript/blacklight/search_context.js +46 -54
- data/app/models/blacklight/facet_paginator.rb +3 -2
- data/app/models/blacklight/icon.rb +4 -2
- data/app/models/bookmark.rb +0 -2
- data/app/models/concerns/blacklight/configurable.rb +5 -4
- data/app/models/concerns/blacklight/document/active_model_shim.rb +1 -10
- data/app/models/concerns/blacklight/document/cache_key.rb +1 -0
- data/app/models/concerns/blacklight/document/dublin_core.rb +2 -1
- data/app/models/concerns/blacklight/document/email.rb +1 -0
- data/app/models/concerns/blacklight/document/export.rb +2 -1
- data/app/models/concerns/blacklight/document/extensions.rb +1 -0
- data/app/models/concerns/blacklight/document/schema_org.rb +1 -0
- data/app/models/concerns/blacklight/document/semantic_fields.rb +2 -1
- data/app/models/concerns/blacklight/document/sms.rb +1 -0
- data/app/models/concerns/blacklight/suggest/response.rb +1 -0
- data/app/models/concerns/blacklight/user.rb +17 -8
- data/app/models/record_mailer.rb +13 -12
- data/app/models/search.rb +1 -7
- data/app/models/solr_document.rb +1 -0
- data/app/presenters/blacklight/clause_presenter.rb +1 -1
- data/app/presenters/blacklight/document_presenter.rb +23 -50
- data/app/presenters/blacklight/facet_field_presenter.rb +39 -14
- data/app/presenters/blacklight/facet_grouped_item_presenter.rb +1 -5
- data/app/presenters/blacklight/facet_item_pivot_presenter.rb +60 -0
- data/app/presenters/blacklight/facet_item_presenter.rb +3 -9
- data/app/presenters/blacklight/field_presenter.rb +1 -0
- data/app/presenters/blacklight/index_presenter.rb +2 -40
- data/app/presenters/blacklight/json_presenter.rb +7 -5
- data/app/presenters/blacklight/rendering/link_to_facet.rb +2 -5
- data/app/presenters/blacklight/show_presenter.rb +1 -9
- data/app/presenters/blacklight/thumbnail_presenter.rb +1 -1
- data/app/services/blacklight/bookmarks_search_builder.rb +22 -0
- data/app/services/blacklight/field_retriever.rb +12 -21
- data/app/services/blacklight/search_service.rb +10 -17
- data/app/values/blacklight/types.rb +0 -18
- data/app/views/bookmarks/_clear_bookmarks_widget.html.erb +8 -1
- data/app/views/bookmarks/_tools.html.erb +7 -12
- data/app/views/catalog/_advanced_search_form.html.erb +0 -1
- data/app/views/catalog/_bookmark_control.html.erb +1 -1
- data/app/views/catalog/_citation.html.erb +1 -1
- data/app/views/catalog/_constraints.html.erb +1 -14
- data/app/views/catalog/_document.atom.builder +12 -14
- data/app/views/catalog/_document.html.erb +5 -3
- data/app/views/catalog/_document.rss.builder +2 -4
- data/app/views/catalog/_facet_layout.html.erb +2 -2
- data/app/views/catalog/_facets.html.erb +5 -4
- data/app/views/catalog/_home_text.html.erb +2 -14
- data/app/views/catalog/_per_page_widget.html.erb +10 -1
- data/app/views/catalog/_search_form.html.erb +2 -2
- data/app/views/catalog/_search_header.html.erb +1 -2
- data/app/views/catalog/_search_results.html.erb +2 -2
- data/app/views/catalog/_search_sidebar.html.erb +5 -1
- data/app/views/catalog/_show_main_content.html.erb +11 -16
- data/app/views/catalog/_show_sidebar.html.erb +2 -2
- data/app/views/catalog/_show_tools.html.erb +8 -14
- data/app/views/catalog/_view_type_group.html.erb +1 -1
- data/app/views/catalog/email.html.erb +2 -2
- data/app/views/catalog/email_success.html.erb +5 -6
- data/app/views/catalog/facet.html.erb +7 -5
- data/app/views/catalog/index.atom.builder +12 -14
- data/app/views/catalog/index.html.erb +4 -1
- data/app/views/catalog/index.json.jbuilder +19 -19
- data/app/views/catalog/index.rss.builder +1 -1
- data/app/views/catalog/opensearch.xml.builder +1 -1
- data/app/views/catalog/sms.html.erb +2 -2
- data/app/views/catalog/sms_success.html.erb +5 -6
- data/app/views/catalog/suggest.html.erb +3 -0
- data/app/views/kaminari/blacklight/_page.html.erb +2 -1
- data/app/views/layouts/blacklight/base.html.erb +13 -2
- data/app/views/search_history/index.html.erb +6 -2
- data/app/views/shared/_flash_messages.html.erb +1 -1
- data/app/views/shared/_modal.html.erb +3 -3
- data/blacklight.gemspec +7 -11
- data/config/importmap.rb +3 -0
- data/config/locales/blacklight.ar.yml +0 -1
- data/config/locales/blacklight.ca.yml +0 -1
- data/config/locales/blacklight.de.yml +0 -1
- data/config/locales/blacklight.en.yml +0 -2
- data/config/locales/blacklight.es.yml +0 -1
- data/config/locales/blacklight.fr.yml +0 -1
- data/config/locales/blacklight.hu.yml +0 -1
- data/config/locales/blacklight.it.yml +0 -1
- data/config/locales/blacklight.nl.yml +0 -1
- data/config/locales/blacklight.pt-BR.yml +0 -1
- data/config/locales/blacklight.sq.yml +0 -1
- data/config/locales/blacklight.zh.yml +0 -1
- data/config/routes.rb +3 -2
- data/db/migrate/20140202020201_create_searches.rb +1 -0
- data/db/migrate/20140202020202_create_bookmarks.rb +1 -0
- data/db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb +1 -0
- data/docker-compose.yml +3 -2
- data/lib/blacklight/abstract_repository.rb +1 -6
- data/lib/blacklight/component.rb +47 -10
- data/lib/blacklight/configuration/context.rb +4 -4
- data/lib/blacklight/configuration/display_field.rb +7 -9
- data/lib/blacklight/configuration/facet_field.rb +17 -11
- data/lib/blacklight/configuration/field.rb +1 -0
- data/lib/blacklight/configuration/fields.rb +12 -15
- data/lib/blacklight/configuration/index_field.rb +1 -0
- data/lib/blacklight/configuration/null_display_field.rb +17 -0
- data/lib/blacklight/configuration/search_field.rb +1 -0
- data/lib/blacklight/configuration/show_field.rb +1 -0
- data/lib/blacklight/configuration/sort_field.rb +1 -0
- data/lib/blacklight/configuration/tool_config.rb +1 -0
- data/lib/blacklight/configuration/view_config.rb +14 -10
- data/lib/blacklight/configuration.rb +310 -365
- data/lib/blacklight/engine.rb +8 -24
- data/lib/blacklight/exceptions.rb +2 -2
- data/lib/blacklight/nested_open_struct_with_hash_access.rb +6 -12
- data/lib/blacklight/open_struct_with_hash_access.rb +23 -6
- data/lib/blacklight/parameters.rb +7 -21
- data/lib/blacklight/routes/exportable.rb +1 -0
- data/lib/blacklight/routes/searchable.rb +2 -1
- data/lib/blacklight/routes.rb +1 -0
- data/lib/blacklight/search_builder.rb +10 -10
- data/lib/blacklight/search_state/filter_field.rb +8 -25
- data/lib/blacklight/search_state/pivot_filter_field.rb +144 -0
- data/lib/blacklight/search_state.rb +23 -79
- data/lib/blacklight/solr/document.rb +1 -0
- data/lib/blacklight/solr/facet_paginator.rb +1 -0
- data/lib/blacklight/solr/repository.rb +4 -24
- data/lib/blacklight/solr/request.rb +1 -0
- data/lib/blacklight/solr/response/facets.rb +21 -5
- data/lib/blacklight/solr/response/group.rb +1 -0
- data/lib/blacklight/solr/response/group_response.rb +1 -0
- data/lib/blacklight/solr/response/more_like_this.rb +1 -0
- data/lib/blacklight/solr/response/pagination_methods.rb +4 -3
- data/lib/blacklight/solr/response/params.rb +5 -4
- data/lib/blacklight/solr/response/response.rb +1 -0
- data/lib/blacklight/solr/response/spelling.rb +1 -0
- data/lib/blacklight/solr/response.rb +16 -3
- data/lib/blacklight/solr/search_builder_behavior.rb +16 -35
- data/lib/blacklight/solr.rb +7 -0
- data/lib/blacklight/version.rb +1 -0
- data/lib/blacklight.rb +26 -14
- data/lib/generators/blacklight/assets/importmap_generator.rb +55 -0
- data/lib/generators/blacklight/assets/propshaft_generator.rb +25 -0
- data/lib/generators/blacklight/assets/sprockets_generator.rb +66 -0
- data/lib/generators/blacklight/assets_generator.rb +13 -86
- data/lib/generators/blacklight/controller_generator.rb +3 -2
- data/lib/generators/blacklight/document_generator.rb +1 -0
- data/lib/generators/blacklight/install_generator.rb +4 -3
- data/lib/generators/blacklight/models_generator.rb +1 -0
- data/lib/generators/blacklight/search_builder_generator.rb +1 -0
- data/lib/generators/blacklight/solr_generator.rb +1 -1
- data/lib/generators/blacklight/templates/catalog_controller.rb +34 -8
- data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml +0 -69
- data/lib/generators/blacklight/test_support_generator.rb +4 -2
- data/lib/generators/blacklight/user_generator.rb +7 -9
- data/lib/railties/blacklight.rake +6 -7
- data/package.json +10 -13
- data/rollup.config.js +27 -0
- data/spec/components/blacklight/constraints_component_spec.rb +17 -13
- data/spec/components/blacklight/document/action_component_spec.rb +6 -1
- data/spec/components/blacklight/document_component_spec.rb +22 -131
- data/spec/components/blacklight/facet_component_spec.rb +3 -18
- data/spec/components/blacklight/facet_field_checkboxes_component_spec.rb +1 -2
- data/spec/components/blacklight/facet_field_list_component_spec.rb +7 -6
- data/spec/components/blacklight/facet_item_pivot_component_spec.rb +10 -9
- data/spec/components/blacklight/response/view_type_component_spec.rb +66 -0
- data/spec/components/blacklight/search_bar_component_spec.rb +1 -1
- data/spec/components/blacklight/search_context_component_spec.rb +40 -0
- data/spec/controllers/blacklight/catalog/component_configuration_spec.rb +1 -6
- data/spec/controllers/blacklight/{base_spec.rb → catalog_spec.rb} +2 -2
- data/spec/controllers/bookmarks_controller_spec.rb +2 -3
- data/spec/controllers/catalog_controller_spec.rb +13 -135
- data/spec/features/advanced_search_spec.rb +0 -56
- data/spec/features/autocomplete_spec.rb +1 -1
- data/spec/features/axe_spec.rb +1 -6
- data/spec/features/bookmarks_spec.rb +1 -1
- data/spec/features/facets_spec.rb +1 -1
- data/spec/features/search_context_spec.rb +4 -10
- data/spec/features/search_results_spec.rb +0 -33
- data/spec/features/sitelinks_search_box.rb +13 -0
- data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb +2 -138
- data/spec/helpers/blacklight/facets_helper_behavior_spec.rb +0 -387
- data/spec/helpers/blacklight/icon_helper_behavior_spec.rb +8 -0
- data/spec/helpers/blacklight/layout_helper_behavior_spec.rb +3 -20
- data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb +5 -7
- data/spec/helpers/blacklight/url_helper_behavior_spec.rb +9 -131
- data/spec/helpers/blacklight_helper_spec.rb +8 -252
- data/spec/helpers/catalog_helper_spec.rb +7 -118
- data/spec/i18n_spec.rb +1 -0
- data/spec/integration/generators/blacklight/solr_generator_spec.rb +1 -1
- data/spec/lib/blacklight/component_spec.rb +27 -32
- data/spec/lib/blacklight/configuration/facet_field_spec.rb +27 -16
- data/spec/lib/blacklight/configuration/field_spec.rb +1 -1
- data/spec/lib/blacklight/configuration/view_config_spec.rb +1 -1
- data/spec/lib/blacklight/open_struct_with_hash_access_spec.rb +2 -2
- data/spec/lib/blacklight/parameters_spec.rb +1 -4
- data/spec/lib/blacklight/search_state/filter_field_spec.rb +4 -4
- data/spec/lib/blacklight/search_state/pivot_filter_field_spec.rb +117 -0
- data/spec/lib/blacklight/search_state_spec.rb +80 -198
- data/spec/lib/tasks/blacklight_task_spec.rb +1 -0
- data/spec/models/blacklight/configuration_spec.rb +17 -51
- data/spec/models/blacklight/document/active_model_shim_spec.rb +2 -2
- data/spec/models/blacklight/icon_spec.rb +31 -15
- data/spec/models/blacklight/search_builder_spec.rb +9 -9
- data/spec/models/blacklight/solr/document_spec.rb +3 -3
- data/spec/models/blacklight/solr/repository_spec.rb +0 -45
- data/spec/models/blacklight/solr/response/facets_spec.rb +27 -27
- data/spec/models/blacklight/solr/response/group_response_spec.rb +1 -0
- data/spec/models/blacklight/solr/response/group_spec.rb +1 -0
- data/spec/models/blacklight/solr/response_spec.rb +9 -2
- data/spec/models/blacklight/solr/search_builder_spec.rb +24 -44
- data/spec/models/blacklight/user_spec.rb +22 -0
- data/spec/models/solr_document_spec.rb +2 -6
- data/spec/presenters/blacklight/clause_presenter_spec.rb +1 -0
- data/spec/presenters/blacklight/document_presenter_spec.rb +2 -3
- data/spec/presenters/blacklight/facet_field_presenter_spec.rb +85 -12
- data/spec/presenters/blacklight/facet_grouped_item_presenter_spec.rb +1 -0
- data/spec/presenters/blacklight/facet_item_presenter_spec.rb +14 -13
- data/spec/presenters/blacklight/field_presenter_spec.rb +0 -14
- data/spec/presenters/blacklight/index_presenter_spec.rb +2 -5
- data/spec/presenters/blacklight/json_presenter_spec.rb +1 -0
- data/spec/presenters/blacklight/link_alternate_presenter_spec.rb +3 -2
- data/spec/presenters/blacklight/show_presenter_spec.rb +20 -30
- data/spec/presenters/thumbnail_presenter_spec.rb +1 -1
- data/spec/requests/load_suggestions_spec.rb +16 -0
- data/spec/routing/catalog_routing_spec.rb +2 -1
- data/spec/services/blacklight/search_service_spec.rb +39 -76
- data/spec/spec_helper.rb +6 -4
- data/spec/support/controller_level_helpers.rb +1 -2
- data/spec/support/features/search_helpers.rb +39 -0
- data/spec/support/features/session_helpers.rb +1 -0
- data/spec/support/features.rb +3 -0
- data/spec/support/view_component_capybara_test_helpers.rb +8 -0
- data/spec/test_app_templates/Gemfile.extra +1 -0
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +9 -2
- data/spec/views/catalog/_document.html.erb_spec.rb +3 -34
- data/spec/views/catalog/_facet_index_navigation.html.erb_spec.rb +1 -1
- data/spec/views/catalog/_paginate_compact.html.erb_spec.rb +0 -2
- data/spec/views/catalog/_search_header.erb_spec.rb +1 -0
- data/spec/views/catalog/_show_sidebar.erb_spec.rb +1 -0
- data/spec/views/catalog/_show_tools.html.erb_spec.rb +5 -66
- data/spec/views/catalog/_view_type_group.html.erb_spec.rb +17 -9
- data/spec/views/catalog/email_success.html.erb_spec.rb +2 -2
- data/spec/views/catalog/facet.html.erb_spec.rb +6 -3
- data/spec/views/catalog/index.atom.builder_spec.rb +17 -11
- data/spec/views/catalog/index.html.erb_spec.rb +5 -6
- data/spec/views/catalog/index.json.jbuilder_spec.rb +2 -2
- data/spec/views/catalog/show.html.erb_spec.rb +3 -25
- data/spec/views/catalog/sms_success.html.erb_spec.rb +2 -2
- data/tasks/blacklight.rake +11 -9
- data/template.demo.rb +7 -7
- metadata +78 -180
- data/.babelrc +0 -11
- data/app/assets/images/blacklight/list.svg +0 -1
- data/app/assets/images/blacklight/search.svg +0 -1
- data/app/assets/stylesheets/blacklight/_twitter_typeahead.scss +0 -37
- data/app/components/blacklight/content_areas_shim.rb +0 -13
- data/app/components/blacklight/search/per_page_component.html.erb +0 -2
- data/app/components/blacklight/search/per_page_component.rb +0 -50
- data/app/components/blacklight/system/dropdown_button_component.rb +0 -18
- data/app/controllers/concerns/blacklight/base.rb +0 -12
- data/app/controllers/concerns/blacklight/default_component_configuration.rb +0 -64
- data/app/controllers/concerns/blacklight/facet.rb +0 -69
- data/app/controllers/concerns/blacklight/search_fields.rb +0 -46
- data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +0 -27
- data/app/helpers/blacklight/render_constraints_helper_behavior.rb +0 -188
- data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb +0 -97
- data/app/helpers/blacklight/suggest_helper_behavior.rb +0 -13
- data/app/javascript/blacklight/autocomplete.js +0 -36
- data/app/javascript/blacklight/facet_load.js +0 -22
- data/app/presenters/blacklight/search_bar_presenter.rb +0 -47
- data/app/views/catalog/_constraints_element.html.erb +0 -14
- data/app/views/catalog/_document_action.html.erb +0 -5
- data/app/views/catalog/_facet_group.html.erb +0 -5
- data/app/views/catalog/_facet_limit.html.erb +0 -3
- data/app/views/catalog/_index.html.erb +0 -1
- data/app/views/catalog/_index_header.html.erb +0 -22
- data/app/views/catalog/_previous_next_doc.html.erb +0 -2
- data/app/views/catalog/_show.html.erb +0 -6
- data/app/views/catalog/_show_header.html.erb +0 -2
- data/app/views/catalog/_thumbnail.html.erb +0 -1
- data/lib/blacklight/deprecations/engine_configuration.rb +0 -66
- data/lib/blacklight/deprecations/search_state_normalization.rb +0 -52
- data/spec/components/blacklight/header_component_spec.rb +0 -20
- data/spec/components/blacklight/icons/icon_component_spec.rb +0 -42
- data/spec/components/blacklight/response/pagination_component_spec.rb +0 -53
- data/spec/controllers/blacklight/facet_spec.rb +0 -33
- data/spec/controllers/blacklight/search_fields_spec.rb +0 -62
- data/spec/features/citation_spec.rb +0 -10
- data/spec/features/sitelinks_search_box_spec.rb +0 -13
- data/spec/features/sms_spec.rb +0 -12
- data/spec/helpers/blacklight/hash_as_hidden_fields_behavior_spec.rb +0 -26
- data/spec/helpers/blacklight/render_constraints_helper_behavior_spec.rb +0 -92
- data/spec/helpers/blacklight/search_history_constraints_helper_behavior_spec.rb +0 -101
- data/spec/helpers/blacklight/suggest_helper_behavior_spec.rb +0 -48
- data/spec/lib/blacklight/engine_spec.rb +0 -41
- data/spec/presenters/blacklight/search_bar_presenter_spec.rb +0 -94
- data/spec/services/blacklight/field_retriever_spec.rb +0 -17
- data/spec/support/view_component_test_helpers.rb +0 -35
- data/spec/views/catalog/_constraints.html.erb_spec.rb +0 -33
- data/spec/views/catalog/_facet_group.html.erb_spec.rb +0 -84
- data/spec/views/catalog/_facets.html.erb_spec.rb +0 -15
- data/spec/views/catalog/_index.html.erb_spec.rb +0 -62
- data/spec/views/catalog/_index_header.html.erb_spec.rb +0 -35
- data/spec/views/catalog/_previous_next_doc.html.erb_spec.rb +0 -22
- data/spec/views/catalog/_show.html.erb_spec.rb +0 -62
- data/spec/views/catalog/_thumbnail.html.erb_spec.rb +0 -38
@@ -1,92 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
RSpec.describe Blacklight::RenderConstraintsHelperBehavior do
|
4
|
-
around { |test| Deprecation.silence(described_class) { test.call } }
|
5
|
-
|
6
|
-
let(:config) do
|
7
|
-
Blacklight::Configuration.new do |config|
|
8
|
-
config.add_facet_field 'type'
|
9
|
-
config.add_search_field 'title'
|
10
|
-
end
|
11
|
-
end
|
12
|
-
|
13
|
-
before do
|
14
|
-
# the helper methods below infer paths from the current route
|
15
|
-
controller.request.path_parameters[:controller] = 'catalog'
|
16
|
-
allow(helper).to receive(:search_action_path) do |*args|
|
17
|
-
search_catalog_path *args
|
18
|
-
end
|
19
|
-
|
20
|
-
allow(helper).to receive(:blacklight_config).and_return(config)
|
21
|
-
allow(controller).to receive(:search_state_class).and_return(Blacklight::SearchState)
|
22
|
-
end
|
23
|
-
|
24
|
-
describe '#render_constraints_query' do
|
25
|
-
subject { helper.render_constraints_query(params) }
|
26
|
-
|
27
|
-
let(:my_engine) { double("Engine") }
|
28
|
-
let(:params) { ActionController::Parameters.new(q: 'foobar', f: { type: 'journal' }) }
|
29
|
-
|
30
|
-
it "has a link relative to the current url" do
|
31
|
-
expect(subject).to have_link 'Remove constraint', href: '/catalog?f%5Btype%5D%5B%5D=journal'
|
32
|
-
end
|
33
|
-
end
|
34
|
-
|
35
|
-
describe '#render_constraints_clauses' do
|
36
|
-
subject { helper.render_constraints_clauses(params) }
|
37
|
-
|
38
|
-
let(:my_engine) { double("Engine") }
|
39
|
-
let(:params) { ActionController::Parameters.new(clause: { "0": { field: 'title', query: 'nature' } }, f: { type: 'journal' }) }
|
40
|
-
|
41
|
-
it 'renders the clause constraint' do
|
42
|
-
expect(subject).to have_selector '.constraint-value', text: /Title\s+nature/
|
43
|
-
end
|
44
|
-
|
45
|
-
it "has a link relative to the current url" do
|
46
|
-
expect(subject).to have_link 'Remove constraint Title: nature', href: '/catalog?f%5Btype%5D%5B%5D=journal'
|
47
|
-
end
|
48
|
-
end
|
49
|
-
|
50
|
-
describe '#render_filter_element' do
|
51
|
-
subject { helper.render_filter_element('type', ['journal'], path) }
|
52
|
-
|
53
|
-
before do
|
54
|
-
allow(helper).to receive(:blacklight_config).and_return(config)
|
55
|
-
expect(helper).to receive(:facet_field_label).with('type').and_return("Item Type")
|
56
|
-
end
|
57
|
-
|
58
|
-
let(:params) { ActionController::Parameters.new q: 'biz' }
|
59
|
-
let(:path) { Blacklight::SearchState.new(params, config, controller) }
|
60
|
-
|
61
|
-
it "has a link relative to the current url" do
|
62
|
-
expect(subject).to have_link "Remove constraint Item Type: journal", href: "/catalog?q=biz"
|
63
|
-
expect(subject).to have_selector ".filter-name", text: 'Item Type'
|
64
|
-
end
|
65
|
-
|
66
|
-
context 'with string values' do
|
67
|
-
subject { helper.render_filter_element('type', 'journal', path) }
|
68
|
-
|
69
|
-
it "handles string values gracefully" do
|
70
|
-
expect(subject).to have_link "Remove constraint Item Type: journal", href: "/catalog?q=biz"
|
71
|
-
end
|
72
|
-
end
|
73
|
-
|
74
|
-
context 'with multivalued facets' do
|
75
|
-
subject { helper.render_filter_element('type', [%w[journal book]], path) }
|
76
|
-
|
77
|
-
it "handles such values gracefully" do
|
78
|
-
expect(subject).to have_link "Remove constraint Item Type: journal OR book", href: "/catalog?q=biz"
|
79
|
-
end
|
80
|
-
end
|
81
|
-
end
|
82
|
-
|
83
|
-
describe "#render_constraints_filters" do
|
84
|
-
subject { helper.render_constraints_filters(params) }
|
85
|
-
|
86
|
-
let(:params) { ActionController::Parameters.new f: { 'type' => [''] } }
|
87
|
-
|
88
|
-
it "renders nothing for empty facet limit param" do
|
89
|
-
expect(subject).to be_blank
|
90
|
-
end
|
91
|
-
end
|
92
|
-
end
|
@@ -1,101 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
RSpec.describe Blacklight::SearchHistoryConstraintsHelperBehavior do
|
4
|
-
around { |test| Deprecation.silence(described_class) { test.call } }
|
5
|
-
|
6
|
-
before(:all) do
|
7
|
-
@config = Blacklight::Configuration.new do |config|
|
8
|
-
config.add_search_field 'default_search_field', label: 'Default'
|
9
|
-
|
10
|
-
config.add_facet_field 'some_facet', label: 'Some'
|
11
|
-
config.add_facet_field 'other_facet', label: 'Other'
|
12
|
-
config.add_facet_field 'i18n_facet'
|
13
|
-
|
14
|
-
I18n.backend.store_translations(:en, blacklight: { search: { fields: { facet: { i18n_facet: 'English facet label' } } } })
|
15
|
-
I18n.backend.store_translations(:de, blacklight: { search: { fields: { facet: { i18n_facet: 'German facet label' } } } })
|
16
|
-
end
|
17
|
-
end
|
18
|
-
|
19
|
-
before do
|
20
|
-
allow(helper).to receive(:blacklight_config).and_return(@config)
|
21
|
-
end
|
22
|
-
|
23
|
-
describe "render_search_to_s_*" do
|
24
|
-
describe "render_search_to_s_element" do
|
25
|
-
it "renders basic element" do
|
26
|
-
response = helper.render_search_to_s_element("key", "value")
|
27
|
-
expect(response).to have_selector("span.constraint") do |span|
|
28
|
-
expect(span).to have_selector("span.filter-name", text: "key:")
|
29
|
-
expect(span).to have_selector("span.filter-values", text: "value")
|
30
|
-
end
|
31
|
-
expect(response).to be_html_safe
|
32
|
-
end
|
33
|
-
|
34
|
-
it "escapes them that need escaping" do
|
35
|
-
response = helper.render_search_to_s_element("key>", "value>")
|
36
|
-
expect(response).to have_selector("span.constraint") do |span|
|
37
|
-
expect(span).to have_selector("span.filter-name", text: 'key>:')
|
38
|
-
expect(span).to have_selector("span.filter-values", text: 'value>')
|
39
|
-
end
|
40
|
-
expect(response).to be_html_safe
|
41
|
-
end
|
42
|
-
|
43
|
-
xit "does not escape with options set thus" do
|
44
|
-
response = helper.render_search_to_s_element("<key>", "value>", escape_key: false, escape_value: false)
|
45
|
-
expect(response).to have_selector("span.constraint") do |span|
|
46
|
-
expect(span).to have_selector("span.filter-name", text: "key>:")
|
47
|
-
expect(span).to have_selector("span.filter-values", text: "value>")
|
48
|
-
end
|
49
|
-
expect(response).to be_html_safe
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
describe "render_search_to_s" do
|
54
|
-
before do
|
55
|
-
@params = { q: "history", f: { "some_facet" => %w[value1 value1], "other_facet" => ["other1"] } }
|
56
|
-
end
|
57
|
-
|
58
|
-
it "calls lesser methods" do
|
59
|
-
allow(helper).to receive(:blacklight_config).and_return(@config)
|
60
|
-
allow(helper).to receive(:default_search_field).and_return(Blacklight::Configuration::SearchField.new(key: 'default_search_field', display_label: 'Default'))
|
61
|
-
allow(helper).to receive(:label_for_search_field).with(nil).and_return('')
|
62
|
-
# API hooks expect this to be so
|
63
|
-
response = helper.render_search_to_s(@params)
|
64
|
-
|
65
|
-
expect(response).to include(helper.render_search_to_s_q(@params))
|
66
|
-
expect(response).to include(helper.render_search_to_s_filters(@params))
|
67
|
-
expect(response).to be_html_safe
|
68
|
-
end
|
69
|
-
end
|
70
|
-
|
71
|
-
describe "render_search_to_s_filters" do
|
72
|
-
it "renders a constraint for a selected facet in the config" do
|
73
|
-
response = helper.render_search_to_s_filters(f: { "some_facet" => %w[value1 value2] })
|
74
|
-
expect(response).to eq("<span class=\"constraint\"><span class=\"filter-name\">Some:</span><span class=\"filter-values\"><span class=\"filter-value\">value1</span><span class=\"filter-separator\"> and </span><span class=\"filter-value\">value2</span></span></span>")
|
75
|
-
end
|
76
|
-
|
77
|
-
it "renders a constraint for a selected facet not in the config" do
|
78
|
-
response = helper.render_search_to_s_filters(f: { "undefined_facet" => %w[value1 value2] })
|
79
|
-
expect(response).to eq("<span class=\"constraint\"><span class=\"filter-name\">#{'undefined_facet'.titleize}:</span><span class=\"filter-values\"><span class=\"filter-value\">value1</span><span class=\"filter-separator\"> and </span><span class=\"filter-value\">value2</span></span></span>")
|
80
|
-
end
|
81
|
-
|
82
|
-
context 'with I18n translations for selected facet' do
|
83
|
-
before do
|
84
|
-
@orig_locale = I18n.locale
|
85
|
-
end
|
86
|
-
|
87
|
-
after do
|
88
|
-
I18n.locale = @orig_locale
|
89
|
-
end
|
90
|
-
|
91
|
-
it 'renders the correct I18n label for a selected facet with I18n translations' do
|
92
|
-
{ en: 'English facet label', de: 'German facet label' }.each do |locale, label|
|
93
|
-
I18n.locale = locale
|
94
|
-
response = helper.render_search_to_s_filters(f: { 'i18n_facet' => %w[value1 value2] })
|
95
|
-
expect(response).to include(label)
|
96
|
-
end
|
97
|
-
end
|
98
|
-
end
|
99
|
-
end
|
100
|
-
end
|
101
|
-
end
|
@@ -1,48 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
RSpec.describe Blacklight::SuggestHelperBehavior do
|
4
|
-
before do
|
5
|
-
allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
|
6
|
-
expect(Deprecation).to receive(:warn)
|
7
|
-
end
|
8
|
-
|
9
|
-
describe '#autocomplete_enabled?' do
|
10
|
-
describe 'with autocomplete config' do
|
11
|
-
let(:blacklight_config) do
|
12
|
-
Blacklight::Configuration.new.configure do |config|
|
13
|
-
config.autocomplete_enabled = true
|
14
|
-
config.autocomplete_path = 'suggest'
|
15
|
-
end
|
16
|
-
end
|
17
|
-
|
18
|
-
it 'is enabled' do
|
19
|
-
expect(helper.autocomplete_enabled?).to be true
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
describe 'without disabled config' do
|
24
|
-
let(:blacklight_config) do
|
25
|
-
Blacklight::Configuration.new.configure do |config|
|
26
|
-
config.autocomplete_enabled = false
|
27
|
-
config.autocomplete_path = 'suggest'
|
28
|
-
end
|
29
|
-
end
|
30
|
-
|
31
|
-
it 'is disabled' do
|
32
|
-
expect(helper.autocomplete_enabled?).to be false
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|
36
|
-
describe 'without path config' do
|
37
|
-
let(:blacklight_config) do
|
38
|
-
Blacklight::Configuration.new.configure do |config|
|
39
|
-
config.autocomplete_enabled = true
|
40
|
-
end
|
41
|
-
end
|
42
|
-
|
43
|
-
it 'is disabled' do
|
44
|
-
expect(helper.autocomplete_enabled?).to be false
|
45
|
-
end
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
@@ -1,41 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
RSpec.describe Blacklight::Engine do
|
4
|
-
[:bookmarks_http_method, :email_regexp, :facet_missing_param, :sms_mappings].each do |dep_key|
|
5
|
-
describe "config.#{dep_key}" do
|
6
|
-
subject { described_class.config }
|
7
|
-
|
8
|
-
let(:unlikely_value) { 'unlikely value' }
|
9
|
-
|
10
|
-
it 'is deprecated' do
|
11
|
-
allow(Deprecation).to receive(:warn)
|
12
|
-
subject.send(dep_key)
|
13
|
-
expect(Deprecation).to have_received(:warn)
|
14
|
-
end
|
15
|
-
|
16
|
-
it 'delegates to config.blacklight' do
|
17
|
-
allow(subject.blacklight).to receive(dep_key).and_return(unlikely_value)
|
18
|
-
expect(subject.send(dep_key)).to eql(unlikely_value)
|
19
|
-
end
|
20
|
-
end
|
21
|
-
|
22
|
-
describe "config.#{dep_key}=" do
|
23
|
-
subject { described_class.config }
|
24
|
-
|
25
|
-
let(:unlikely_value) { 'unlikely value' }
|
26
|
-
|
27
|
-
it 'is deprecated' do
|
28
|
-
allow(Deprecation).to receive(:warn)
|
29
|
-
allow(subject.blacklight).to receive(:"#{dep_key}=").with(unlikely_value)
|
30
|
-
subject.send(:"#{dep_key}=", unlikely_value)
|
31
|
-
expect(Deprecation).to have_received(:warn)
|
32
|
-
end
|
33
|
-
|
34
|
-
it 'delegates to config.blacklight' do
|
35
|
-
allow(subject.blacklight).to receive(:"#{dep_key}=").with(unlikely_value)
|
36
|
-
subject.send(:"#{dep_key}=", unlikely_value)
|
37
|
-
expect(subject.blacklight).to have_received(:"#{dep_key}=").with(unlikely_value)
|
38
|
-
end
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
@@ -1,94 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
require 'spec_helper'
|
3
|
-
|
4
|
-
RSpec.describe Blacklight::SearchBarPresenter do
|
5
|
-
let(:controller) { CatalogController.new }
|
6
|
-
let(:presenter) { described_class.new(controller, blacklight_config) }
|
7
|
-
let(:blacklight_config) { Blacklight::Configuration.new }
|
8
|
-
|
9
|
-
describe '#autocomplete_enabled?' do
|
10
|
-
subject { presenter.autocomplete_enabled? }
|
11
|
-
|
12
|
-
describe 'with autocomplete config' do
|
13
|
-
let(:blacklight_config) do
|
14
|
-
Blacklight::Configuration.new.configure do |config|
|
15
|
-
config.autocomplete_enabled = true
|
16
|
-
config.autocomplete_path = 'suggest'
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
it { is_expected.to be true }
|
21
|
-
end
|
22
|
-
|
23
|
-
describe 'without disabled config' do
|
24
|
-
let(:blacklight_config) do
|
25
|
-
Blacklight::Configuration.new.configure do |config|
|
26
|
-
config.autocomplete_enabled = false
|
27
|
-
config.autocomplete_path = 'suggest'
|
28
|
-
end
|
29
|
-
end
|
30
|
-
|
31
|
-
it { is_expected.to be false }
|
32
|
-
end
|
33
|
-
|
34
|
-
describe 'without path config' do
|
35
|
-
let(:blacklight_config) do
|
36
|
-
Blacklight::Configuration.new.configure do |config|
|
37
|
-
config.autocomplete_enabled = true
|
38
|
-
end
|
39
|
-
end
|
40
|
-
|
41
|
-
it { is_expected.to be false }
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
45
|
-
describe "#autofocus?" do
|
46
|
-
subject { presenter.autofocus? }
|
47
|
-
|
48
|
-
context "on a catalog-like index page without query or facet parameters" do
|
49
|
-
let(:blacklight_config) do
|
50
|
-
Blacklight::Configuration.new.configure do |config|
|
51
|
-
config.enable_search_bar_autofocus = true
|
52
|
-
end
|
53
|
-
end
|
54
|
-
|
55
|
-
before do
|
56
|
-
allow(controller).to receive(:action_name).and_return('index')
|
57
|
-
allow(controller).to receive(:has_search_parameters?).and_return(false)
|
58
|
-
end
|
59
|
-
|
60
|
-
it { is_expected.to be true }
|
61
|
-
end
|
62
|
-
|
63
|
-
context "when disabled in config" do
|
64
|
-
before do
|
65
|
-
allow(controller).to receive(:action_name).and_return('index')
|
66
|
-
allow(controller).to receive(:has_search_parameters?).and_return(false)
|
67
|
-
end
|
68
|
-
|
69
|
-
it { is_expected.to be false }
|
70
|
-
end
|
71
|
-
|
72
|
-
context "when not the catalog controller" do
|
73
|
-
let(:controller) { ApplicationController.new }
|
74
|
-
|
75
|
-
it { is_expected.to be false }
|
76
|
-
end
|
77
|
-
|
78
|
-
context "when on the catalog controller show page" do
|
79
|
-
before do
|
80
|
-
allow(controller).to receive(:action_name).and_return('show')
|
81
|
-
end
|
82
|
-
|
83
|
-
it { is_expected.to be false }
|
84
|
-
end
|
85
|
-
|
86
|
-
context "when search parameters are provided" do
|
87
|
-
before do
|
88
|
-
allow(controller).to receive(:has_search_parameters?).and_return(true)
|
89
|
-
end
|
90
|
-
|
91
|
-
it { is_expected.to be false }
|
92
|
-
end
|
93
|
-
end
|
94
|
-
end
|
@@ -1,17 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
RSpec.describe Blacklight::FieldRetriever, api: true do
|
4
|
-
let(:service) { described_class.new(document, blacklight_field_config) }
|
5
|
-
|
6
|
-
let(:blacklight_field_config) { Blacklight::Configuration::Field.new(field: 'author_field', highlight: true) }
|
7
|
-
let(:document) { SolrDocument.new({ 'id' => 'doc1', 'title_field' => 'doc1 title', 'author_field' => 'author_someone' }, 'highlighting' => { 'doc1' => { 'title_tsimext' => ['doc <em>1</em>'] } }) }
|
8
|
-
let(:view_context) { {} }
|
9
|
-
|
10
|
-
context "highlighting" do
|
11
|
-
describe '#fetch' do
|
12
|
-
it "retrieves an author even if it's not highlighted" do
|
13
|
-
expect(service.fetch).to eq(['author_someone'])
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
@@ -1,35 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module ViewComponentTestHelpers
|
4
|
-
# Work around for https://github.com/teamcapybara/capybara/issues/2466
|
5
|
-
def render_inline_to_capybara_node(component)
|
6
|
-
Capybara::Node::Simple.new(render_inline(component).to_s)
|
7
|
-
end
|
8
|
-
|
9
|
-
# Work-around for https://github.com/ViewComponent/view_component/pull/1661
|
10
|
-
# which made the component test's controller method (more) private. This makes
|
11
|
-
# it available so we can set up controller-level state for our tests.
|
12
|
-
def controller
|
13
|
-
# ViewComponent 2.x
|
14
|
-
return super if defined?(super)
|
15
|
-
|
16
|
-
# ViewComponent 3.x
|
17
|
-
return vc_test_controller if defined?(vc_test_controller)
|
18
|
-
|
19
|
-
ApplicationController.new.extend(Rails.application.routes.url_helpers)
|
20
|
-
end
|
21
|
-
|
22
|
-
# Nokogiri 1.15.0 upgrades the vendored libxml2 from v2.10.4 to v2.11.3
|
23
|
-
# libxml2 v2.11.0 introduces a change to parsing HTML href attributes
|
24
|
-
# in nokogiri < 1.15, brackets in href attributes are escaped:
|
25
|
-
# - <a class="facet-select" rel="nofollow" href="/catalog?f%5Bz%5D%5B%5D=x:1">x:1</a>
|
26
|
-
# in nokogiri >= 1.15, brackets in href attributes are not escaped:
|
27
|
-
# - <a class="facet-select" rel="nofollow" href="/catalog?f[z][]=x:1">x:1</a>
|
28
|
-
# until we can spec a minimum nokogiri version of 1.15.0, we need to see how
|
29
|
-
# the installed version parsed the html
|
30
|
-
def nokogiri_mediated_href(href)
|
31
|
-
start = "<a href=\"".length
|
32
|
-
stop = -"\"></a>".length
|
33
|
-
Nokogiri::HTML.fragment("<a href=\"#{href}\"></a>").to_s[start...stop]
|
34
|
-
end
|
35
|
-
end
|
@@ -1,33 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
RSpec.describe "catalog/constraints" do
|
4
|
-
let :blacklight_config do
|
5
|
-
Blacklight::Configuration.new do |config|
|
6
|
-
config.view.xyz({})
|
7
|
-
end
|
8
|
-
end
|
9
|
-
|
10
|
-
it "renders nothing if no constraints are set" do
|
11
|
-
allow(view).to receive_messages(query_has_constraints?: false)
|
12
|
-
allow(view).to receive(:blacklight_config).and_return(blacklight_config)
|
13
|
-
render partial: "catalog/constraints"
|
14
|
-
expect(rendered.strip).to be_empty
|
15
|
-
end
|
16
|
-
|
17
|
-
it "renders a start over link" do
|
18
|
-
allow(view).to receive(:search_action_path).with({}).and_return('http://xyz')
|
19
|
-
allow(view).to receive_messages(query_has_constraints?: true)
|
20
|
-
allow(view).to receive(:blacklight_config).and_return(blacklight_config)
|
21
|
-
render partial: "catalog/constraints"
|
22
|
-
expect(rendered).to have_link("Start Over", href: 'http://xyz')
|
23
|
-
end
|
24
|
-
|
25
|
-
it "renders a start over link with the current view type" do
|
26
|
-
allow(view).to receive(:search_action_path).with({ view: :xyz }).and_return('http://xyz?view=xyz')
|
27
|
-
allow(view).to receive_messages(query_has_constraints?: true)
|
28
|
-
params[:view] = 'xyz'
|
29
|
-
allow(view).to receive(:blacklight_config).and_return(blacklight_config)
|
30
|
-
render partial: "catalog/constraints"
|
31
|
-
expect(rendered).to have_link("Start Over", href: 'http://xyz?view=xyz')
|
32
|
-
end
|
33
|
-
end
|
@@ -1,84 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
RSpec.describe "catalog/_facet_group" do
|
4
|
-
let(:blacklight_config) { Blacklight::Configuration.new }
|
5
|
-
|
6
|
-
before do
|
7
|
-
allow(view).to receive_messages(blacklight_config: blacklight_config)
|
8
|
-
allow(view).to receive(:search_action_path).and_return('/catalog')
|
9
|
-
allow(view).to receive(:search_facet_path).and_return('/catalog')
|
10
|
-
end
|
11
|
-
|
12
|
-
context "without any facet fields" do
|
13
|
-
before do
|
14
|
-
allow(view).to receive_messages(groupname: nil, render_facet_partials: '')
|
15
|
-
render
|
16
|
-
end
|
17
|
-
|
18
|
-
it "does not have a header if no facets are displayed" do
|
19
|
-
expect(rendered).not_to have_selector('h4')
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
context "with facet groups" do
|
24
|
-
let :facet_field do
|
25
|
-
Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label', group: nil).normalize!
|
26
|
-
end
|
27
|
-
|
28
|
-
let(:mock_display_facet1) do
|
29
|
-
double(name: 'facet_field_1', sort: nil, offset: nil, prefix: nil, items: [Blacklight::Solr::Response::Facets::FacetItem.new(value: 'Value', hits: 1234)])
|
30
|
-
end
|
31
|
-
|
32
|
-
let(:response) do
|
33
|
-
instance_double(Blacklight::Solr::Response, aggregations: { "facet_field_1" => mock_display_facet1 })
|
34
|
-
end
|
35
|
-
|
36
|
-
before do
|
37
|
-
blacklight_config.facet_fields['facet_field_1'] = facet_field
|
38
|
-
allow(view).to receive_messages(groupname: nil, facet_field_names: [:facet_field_1], facet_limit_for: 10)
|
39
|
-
@response = response
|
40
|
-
end
|
41
|
-
|
42
|
-
context "with the default facet group" do
|
43
|
-
it "has a header" do
|
44
|
-
allow(view).to receive_messages(render_facet_partials: '')
|
45
|
-
render
|
46
|
-
expect(rendered).to have_selector('.facets-heading')
|
47
|
-
end
|
48
|
-
end
|
49
|
-
|
50
|
-
context "with a named facet group" do
|
51
|
-
let :facet_field do
|
52
|
-
Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label', group: 'group_1').normalize!
|
53
|
-
end
|
54
|
-
|
55
|
-
before do
|
56
|
-
blacklight_config.facet_fields['facet_field_1'] = facet_field
|
57
|
-
allow(view).to receive_messages(groupname: 'group_1', facet_field_names: [:facet_field_1], facet_limit_for: 10)
|
58
|
-
end
|
59
|
-
|
60
|
-
it "has a header" do
|
61
|
-
allow(view).to receive_messages(render_facet_partials: '')
|
62
|
-
render
|
63
|
-
expect(rendered).to have_selector('.facets-heading')
|
64
|
-
expect(rendered).to have_selector('#facets-group_1')
|
65
|
-
end
|
66
|
-
end
|
67
|
-
|
68
|
-
describe "facet display" do
|
69
|
-
it "has a(n accessible) header" do
|
70
|
-
render
|
71
|
-
expect(rendered).to have_selector('.facet-field-heading')
|
72
|
-
end
|
73
|
-
|
74
|
-
it "lists values" do
|
75
|
-
render
|
76
|
-
# The .facet-content class is used by blacklight_range_limit js, and
|
77
|
-
# should be applied to the .panel-collapse div that contains the collapsible
|
78
|
-
# facet content. Please make sure it remains if possible.
|
79
|
-
expect(rendered).to have_selector('.facet-content a.facet-select')
|
80
|
-
expect(rendered).to have_selector('.facet-content .facet-count')
|
81
|
-
end
|
82
|
-
end
|
83
|
-
end
|
84
|
-
end
|
@@ -1,15 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
RSpec.describe "catalog/_facets" do
|
4
|
-
context "with facet groups" do
|
5
|
-
before do
|
6
|
-
stub_template('catalog/_facet_group.html.erb' => 'text')
|
7
|
-
allow(view).to receive_messages(facet_group_names: [nil, nil])
|
8
|
-
render
|
9
|
-
end
|
10
|
-
|
11
|
-
it "Calls facet_group for each name" do
|
12
|
-
expect(rendered).to match(/^ text\n text\n$/)
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
@@ -1,62 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
# spec for default partial to display solr document fields in catalog INDEX view
|
4
|
-
|
5
|
-
RSpec.describe "catalog/_index" do
|
6
|
-
include BlacklightHelper
|
7
|
-
include CatalogHelper
|
8
|
-
|
9
|
-
before do
|
10
|
-
allow(view).to receive(:action_name).and_return('index')
|
11
|
-
@config = Blacklight::Configuration.new do |config|
|
12
|
-
config.show.display_type_field = 'asdf'
|
13
|
-
config.add_index_field 'one_field', label: 'One:'
|
14
|
-
config.add_index_field 'empty_field', label: 'Three:'
|
15
|
-
config.add_index_field 'four_field', label: 'Four:'
|
16
|
-
end
|
17
|
-
|
18
|
-
@fname_1 = "one_field"
|
19
|
-
@fname_2 = "solr_field_not_in_config"
|
20
|
-
@fname_3 = "empty_field"
|
21
|
-
@fname_4 = "four_field"
|
22
|
-
|
23
|
-
@document = SolrDocument.new(id: 1, @fname_1 => "val_1", @fname_2 => "val2", @fname_4 => "val_4")
|
24
|
-
|
25
|
-
@flabel_1 = "One:"
|
26
|
-
@flabel_3 = "Three:"
|
27
|
-
@flabel_4 = "Four:"
|
28
|
-
|
29
|
-
allow(view).to receive(:blacklight_config).and_return(@config)
|
30
|
-
assigns[:document] = @document
|
31
|
-
@rendered = view.render_document_partial @document, :index
|
32
|
-
end
|
33
|
-
|
34
|
-
it "only displays fields listed in the initializer" do
|
35
|
-
expect(@rendered).not_to include("val_2")
|
36
|
-
expect(@rendered).not_to include(@fname_2)
|
37
|
-
end
|
38
|
-
|
39
|
-
it "skips over fields listed in initializer that are not in solr response" do
|
40
|
-
expect(@rendered).not_to include(@fname_3)
|
41
|
-
end
|
42
|
-
|
43
|
-
it "displays field labels from initializer and raw solr field names in the class" do
|
44
|
-
# labels
|
45
|
-
expect(@rendered).to include(@flabel_1)
|
46
|
-
expect(@rendered).to include(@flabel_4)
|
47
|
-
# classes
|
48
|
-
expect(@rendered).to include("blacklight-#{@fname_1}")
|
49
|
-
expect(@rendered).to include("blacklight-#{@fname_4}")
|
50
|
-
end
|
51
|
-
|
52
|
-
# this test probably belongs in a Cucumber feature
|
53
|
-
# it "should display fields in the order listed in the initializer" do
|
54
|
-
# pending
|
55
|
-
# end
|
56
|
-
|
57
|
-
it "has values for displayed fields" do
|
58
|
-
expect(@rendered).to include("val_1")
|
59
|
-
expect(@rendered).to include("val_4")
|
60
|
-
expect(@rendered).not_to include("val_2")
|
61
|
-
end
|
62
|
-
end
|
@@ -1,35 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
RSpec.describe "catalog/_index_header" do
|
4
|
-
let :document do
|
5
|
-
SolrDocument.new id: 'xyz', format: 'a'
|
6
|
-
end
|
7
|
-
|
8
|
-
let(:blacklight_config) { Blacklight::Configuration.new }
|
9
|
-
|
10
|
-
before do
|
11
|
-
assign :response, instance_double(Blacklight::Solr::Response, start: 0)
|
12
|
-
allow(view).to receive(:render_grouped_response?).and_return false
|
13
|
-
allow(view).to receive(:blacklight_config).and_return(blacklight_config)
|
14
|
-
allow(view).to receive(:session_tracking_params).and_return({})
|
15
|
-
end
|
16
|
-
|
17
|
-
it "renders the document header" do
|
18
|
-
allow(view).to receive(:render_index_doc_actions)
|
19
|
-
render partial: "catalog/index_header", locals: { document: document, document_counter: 1 }
|
20
|
-
expect(rendered).to have_selector('.document-counter', text: "2")
|
21
|
-
end
|
22
|
-
|
23
|
-
it "allows the title to take the whole space if no document tools are rendered" do
|
24
|
-
allow(view).to receive(:render_index_doc_actions)
|
25
|
-
render partial: "catalog/index_header", locals: { document: document, document_counter: 1 }
|
26
|
-
expect(rendered).to have_selector '.index_title.col-md-12'
|
27
|
-
end
|
28
|
-
|
29
|
-
it "gives the document actions space if present" do
|
30
|
-
allow(view).to receive(:render_index_doc_actions).and_return("DOCUMENT ACTIONS")
|
31
|
-
render partial: "catalog/index_header", locals: { document: document, document_counter: 1 }
|
32
|
-
expect(rendered).to have_selector '.index_title.col-sm-9'
|
33
|
-
expect(rendered).to have_content "DOCUMENT ACTIONS"
|
34
|
-
end
|
35
|
-
end
|