blacklight 7.33.0 → 8.0.0.beta2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.env +3 -2
- data/.github/workflows/ruby.yml +38 -107
- data/.rubocop.yml +243 -2
- data/.rubocop_todo.yml +214 -270
- data/Gemfile +11 -6
- data/README.md +11 -3
- data/VERSION +1 -1
- data/app/assets/javascripts/blacklight/blacklight.esm.js +389 -0
- data/app/assets/javascripts/blacklight/blacklight.esm.js.map +1 -0
- data/app/assets/javascripts/blacklight/blacklight.js +356 -496
- 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/_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 +1 -1
- data/app/components/blacklight/advanced_search_form_component.rb +7 -9
- data/app/components/blacklight/constraints_component.rb +27 -37
- data/app/components/blacklight/document/action_component.html.erb +2 -9
- data/app/components/blacklight/document/action_component.rb +26 -8
- 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 +4 -0
- data/app/components/blacklight/document_component.rb +7 -23
- data/app/components/blacklight/document_metadata_component.rb +5 -6
- data/app/components/blacklight/document_title_component.rb +4 -1
- data/app/components/blacklight/facet_component.rb +1 -1
- data/app/components/blacklight/facet_field_checkboxes_component.html.erb +3 -3
- data/app/components/blacklight/facet_field_checkboxes_component.rb +1 -1
- data/app/components/blacklight/facet_field_component.html.erb +5 -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.html.erb +2 -0
- data/app/components/blacklight/header_component.rb +26 -0
- data/app/components/blacklight/hidden_search_state_component.rb +1 -2
- 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 +0 -18
- 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/sort_component.rb +1 -1
- data/app/components/blacklight/response/spellcheck_component.rb +17 -6
- data/app/components/blacklight/response/view_type_button_component.rb +2 -6
- data/app/components/blacklight/response/view_type_component.rb +3 -5
- 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/search_navbar_component.html.erb +5 -0
- data/app/components/blacklight/search_navbar_component.rb +34 -0
- data/app/components/blacklight/start_over_button_component.rb +5 -3
- data/app/components/blacklight/system/dropdown_component.rb +2 -2
- data/app/components/blacklight/system/flash_message_component.html.erb +3 -1
- data/app/components/blacklight/system/flash_message_component.rb +11 -2
- data/app/components/blacklight/system/modal_component.html.erb +1 -1
- data/app/components/blacklight/system/modal_component.rb +0 -2
- data/app/components/blacklight/top_navbar_component.html.erb +12 -0
- data/app/components/blacklight/top_navbar_component.rb +13 -0
- data/app/controllers/bookmarks_controller.rb +1 -0
- data/app/controllers/catalog_controller.rb +1 -0
- data/app/controllers/concerns/blacklight/bookmarks.rb +10 -5
- data/app/controllers/concerns/blacklight/catalog.rb +21 -72
- data/app/controllers/concerns/blacklight/controller.rb +6 -43
- 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 +1 -0
- data/app/controllers/search_history_controller.rb +1 -0
- data/app/helpers/blacklight/blacklight_helper_behavior.rb +10 -308
- data/app/helpers/blacklight/catalog_helper_behavior.rb +22 -137
- data/app/helpers/blacklight/component_helper_behavior.rb +2 -53
- data/app/helpers/blacklight/configuration_helper_behavior.rb +2 -117
- data/app/helpers/blacklight/facets_helper_behavior.rb +4 -321
- data/app/helpers/blacklight/icon_helper_behavior.rb +5 -4
- data/app/helpers/blacklight/layout_helper_behavior.rb +1 -0
- data/app/helpers/blacklight/render_partials_helper_behavior.rb +11 -30
- data/app/helpers/blacklight/url_helper_behavior.rb +13 -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 -122
- data/app/javascript/blacklight/core.js +6 -5
- data/app/javascript/blacklight/index.js +13 -0
- data/app/javascript/blacklight/modal.js +104 -164
- data/app/javascript/blacklight/modalForm.js +60 -0
- data/app/javascript/blacklight/search_context.js +45 -55
- 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 -0
- data/app/models/concerns/blacklight/document/attributes.rb +50 -0
- 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 +1 -0
- data/app/models/concerns/blacklight/document/sms.rb +1 -0
- data/app/models/concerns/blacklight/document.rb +12 -20
- 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 +0 -1
- data/app/models/solr_document.rb +1 -0
- data/app/presenters/blacklight/clause_presenter.rb +1 -1
- data/app/presenters/blacklight/document_presenter.rb +13 -21
- 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/join.rb +1 -1
- 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 +1 -8
- data/app/services/blacklight/search_service.rb +8 -7
- data/app/values/blacklight/types.rb +95 -11
- 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/_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/_search_form.html.erb +3 -3
- 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 +7 -12
- data/app/views/catalog/_view_type_group.html.erb +1 -1
- 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_success.html.erb +5 -6
- data/app/views/catalog/suggest.html.erb +3 -0
- data/app/views/layouts/blacklight/base.html.erb +20 -9
- data/app/views/search_history/index.html.erb +6 -2
- data/app/views/shared/_header_navbar.html.erb +1 -22
- data/app/views/shared/_modal.html.erb +3 -3
- data/blacklight.gemspec +7 -9
- 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 -1
- 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 +1 -0
- data/lib/blacklight/abstract_repository.rb +1 -0
- 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 +16 -6
- data/lib/blacklight/configuration.rb +318 -341
- data/lib/blacklight/engine.rb +10 -11
- 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 +19 -17
- 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 +1 -0
- data/lib/blacklight/solr/request.rb +3 -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 +4 -3
- data/lib/blacklight/solr/search_builder_behavior.rb +16 -32
- data/lib/blacklight/solr.rb +1 -0
- data/lib/blacklight/version.rb +1 -0
- data/lib/blacklight.rb +8 -11
- 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 -89
- 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 +5 -4
- 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 +37 -7
- data/lib/generators/blacklight/templates/solr_document.rb +1 -1
- data/lib/generators/blacklight/test_support_generator.rb +4 -2
- data/lib/generators/blacklight/user_generator.rb +7 -9
- data/lib/railties/blacklight.rake +2 -3
- data/package.json +9 -12
- data/rollup.config.js +27 -0
- data/spec/components/blacklight/constraints_component_spec.rb +17 -13
- data/spec/components/blacklight/document_component_spec.rb +15 -25
- data/spec/components/blacklight/facet_component_spec.rb +2 -7
- 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 +9 -7
- 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 -127
- data/spec/features/autocomplete_spec.rb +1 -1
- data/spec/features/axe_spec.rb +1 -1
- 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/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/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 +3 -242
- 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/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 +39 -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/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 +32 -23
- data/spec/models/blacklight/user_spec.rb +22 -0
- data/spec/models/solr_document_spec.rb +21 -3
- data/spec/presenters/blacklight/clause_presenter_spec.rb +1 -0
- data/spec/presenters/blacklight/document_presenter_spec.rb +2 -2
- 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 -4
- 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 +10 -25
- 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 +31 -68
- data/spec/spec_helper.rb +3 -2
- 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/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/_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 +7 -54
- 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 +18 -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 +6 -4
- metadata +73 -113
- 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/controllers/concerns/blacklight/base.rb +0 -7
- 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/controllers/blacklight/facet_spec.rb +0 -33
- data/spec/controllers/blacklight/search_fields_spec.rb +0 -62
- 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 -108
- 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/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
@@ -15,12 +15,7 @@ RSpec.describe Blacklight::FacetComponent, type: :component do
|
|
15
15
|
instance_double(Blacklight::Solr::Response::Facets::FacetField, name: 'field', items: items, limit: nil, sort: :index, offset: 0, prefix: nil)
|
16
16
|
end
|
17
17
|
|
18
|
-
let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'field'
|
19
|
-
|
20
|
-
before do
|
21
|
-
allow(controller).to receive(:view_context).and_return(controller.view_context)
|
22
|
-
allow(controller.view_context).to receive(:facet_limit_for).and_return(20)
|
23
|
-
end
|
18
|
+
let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'field').normalize! }
|
24
19
|
|
25
20
|
it 'delegates to the configured component to render something' do
|
26
21
|
expect(rendered).to have_selector 'ul.facet-values'
|
@@ -75,7 +70,7 @@ RSpec.describe Blacklight::FacetComponent, type: :component do
|
|
75
70
|
end
|
76
71
|
|
77
72
|
context 'when the field is not in the response' do
|
78
|
-
let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'some_other_field'
|
73
|
+
let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'some_other_field').normalize! }
|
79
74
|
|
80
75
|
it 'uses a null field to pass through the response information anyway' do
|
81
76
|
allow(facet_config.component).to receive(:new).and_call_original
|
@@ -10,14 +10,13 @@ RSpec.describe Blacklight::FacetFieldCheckboxesComponent, type: :component do
|
|
10
10
|
let(:facet_field) do
|
11
11
|
instance_double(
|
12
12
|
Blacklight::FacetFieldPresenter,
|
13
|
-
facet_field: Blacklight::Configuration::NullField.new(key: 'field'),
|
13
|
+
facet_field: Blacklight::Configuration::NullField.new(key: 'field', item_component: Blacklight::FacetItemComponent, item_presenter: Blacklight::FacetItemPresenter),
|
14
14
|
paginator: paginator,
|
15
15
|
key: 'field',
|
16
16
|
label: 'Field',
|
17
17
|
active?: false,
|
18
18
|
collapsed?: false,
|
19
19
|
modal_path: nil,
|
20
|
-
html_id: 'facet-field',
|
21
20
|
search_state: search_state
|
22
21
|
)
|
23
22
|
end
|
@@ -11,16 +11,18 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
|
|
11
11
|
instance_double(
|
12
12
|
Blacklight::FacetFieldPresenter,
|
13
13
|
paginator: paginator,
|
14
|
+
facet_field: facet_config,
|
14
15
|
key: 'field',
|
15
16
|
label: 'Field',
|
16
17
|
active?: false,
|
17
18
|
collapsed?: false,
|
18
19
|
modal_path: nil,
|
19
|
-
html_id: 'facet-field',
|
20
20
|
values: []
|
21
21
|
)
|
22
22
|
end
|
23
23
|
|
24
|
+
let(:facet_config) { Blacklight::Configuration::NullField.new(key: 'field', item_component: Blacklight::FacetItemComponent, item_presenter: Blacklight::FacetItemPresenter) }
|
25
|
+
|
24
26
|
let(:paginator) do
|
25
27
|
instance_double(Blacklight::FacetPaginator, items: [
|
26
28
|
double(label: 'x', hits: 10),
|
@@ -45,12 +47,12 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
|
|
45
47
|
instance_double(
|
46
48
|
Blacklight::FacetFieldPresenter,
|
47
49
|
paginator: paginator,
|
50
|
+
facet_field: facet_config,
|
48
51
|
key: 'field',
|
49
52
|
label: 'Field',
|
50
53
|
active?: true,
|
51
54
|
collapsed?: false,
|
52
55
|
modal_path: nil,
|
53
|
-
html_id: 'facet-field',
|
54
56
|
values: []
|
55
57
|
)
|
56
58
|
end
|
@@ -65,12 +67,12 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
|
|
65
67
|
instance_double(
|
66
68
|
Blacklight::FacetFieldPresenter,
|
67
69
|
paginator: paginator,
|
70
|
+
facet_field: facet_config,
|
68
71
|
key: 'field',
|
69
72
|
label: 'Field',
|
70
73
|
active?: false,
|
71
74
|
collapsed?: true,
|
72
75
|
modal_path: nil,
|
73
|
-
html_id: 'facet-field',
|
74
76
|
values: []
|
75
77
|
)
|
76
78
|
end
|
@@ -91,12 +93,12 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
|
|
91
93
|
instance_double(
|
92
94
|
Blacklight::FacetFieldPresenter,
|
93
95
|
paginator: paginator,
|
96
|
+
facet_field: facet_config,
|
94
97
|
key: 'field',
|
95
98
|
label: 'Field',
|
96
99
|
active?: false,
|
97
100
|
collapsed?: false,
|
98
101
|
modal_path: '/catalog/facet/modal',
|
99
|
-
html_id: 'facet-field',
|
100
102
|
values: []
|
101
103
|
)
|
102
104
|
end
|
@@ -111,13 +113,12 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
|
|
111
113
|
instance_double(
|
112
114
|
Blacklight::FacetFieldPresenter,
|
113
115
|
paginator: paginator,
|
114
|
-
facet_field:
|
116
|
+
facet_field: facet_config,
|
115
117
|
key: 'field',
|
116
118
|
label: 'Field',
|
117
119
|
active?: false,
|
118
120
|
collapsed?: false,
|
119
121
|
modal_path: nil,
|
120
|
-
html_id: 'facet-field',
|
121
122
|
values: [%w[a b c]],
|
122
123
|
search_state: search_state
|
123
124
|
)
|
@@ -19,18 +19,20 @@ RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
|
|
19
19
|
|
20
20
|
let(:facet_item) do
|
21
21
|
instance_double(
|
22
|
-
Blacklight::
|
23
|
-
facet_config:
|
22
|
+
Blacklight::FacetItemPivotPresenter,
|
23
|
+
facet_config: facet_config,
|
24
24
|
facet_field: 'z',
|
25
25
|
label: 'x',
|
26
26
|
hits: 10,
|
27
27
|
href: '/catalog?f[z]=x',
|
28
28
|
selected?: false,
|
29
29
|
search_state: search_state,
|
30
|
-
|
30
|
+
facet_item_presenters: [OpenStruct.new(label: 'x:1', hits: 5, href: '/catalog?f[z][]=x:1', facet_config: facet_config)]
|
31
31
|
)
|
32
32
|
end
|
33
33
|
|
34
|
+
let(:facet_config) { Blacklight::Configuration::NullField.new(key: 'z', item_component: Blacklight::FacetItemComponent, item_presenter: Blacklight::FacetItemPivotPresenter) }
|
35
|
+
|
34
36
|
it 'links to the facet and shows the number of hits' do
|
35
37
|
expect(rendered).to have_selector 'li'
|
36
38
|
expect(rendered).to have_link 'x', href: '/catalog?f%5Bz%5D=x'
|
@@ -39,21 +41,21 @@ RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
|
|
39
41
|
|
40
42
|
it 'has the facet hierarchy' do
|
41
43
|
expect(rendered).to have_selector 'li ul.pivot-facet'
|
42
|
-
expect(rendered).to have_link 'x:1', href: /f%5Bz%5D%5B%5D=x
|
44
|
+
expect(rendered).to have_link 'x:1', href: /f%5Bz%5D%5B%5D=x:1/
|
43
45
|
end
|
44
46
|
|
45
47
|
context 'with a selected facet' do
|
46
48
|
let(:facet_item) do
|
47
49
|
instance_double(
|
48
|
-
Blacklight::
|
49
|
-
facet_config:
|
50
|
+
Blacklight::FacetItemPivotPresenter,
|
51
|
+
facet_config: facet_config,
|
50
52
|
facet_field: 'z',
|
51
53
|
label: 'x',
|
52
54
|
hits: 10,
|
53
55
|
href: '/catalog',
|
54
56
|
selected?: true,
|
55
57
|
search_state: search_state,
|
56
|
-
|
58
|
+
facet_item_presenters: []
|
57
59
|
)
|
58
60
|
end
|
59
61
|
|
@@ -0,0 +1,66 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'spec_helper'
|
4
|
+
|
5
|
+
RSpec.describe Blacklight::Response::ViewTypeComponent, type: :component do
|
6
|
+
subject(:render) do
|
7
|
+
render_inline(described_class.new(response: response, views: views, search_state: search_state))
|
8
|
+
end
|
9
|
+
|
10
|
+
let(:response) { instance_double(Blacklight::Solr::Response, empty?: false) }
|
11
|
+
let(:search_state) { instance_double(Blacklight::SearchState, to_h: { controller: 'catalog', action: 'index' }) }
|
12
|
+
let(:view_config) { Blacklight::Configuration::ViewConfig.new }
|
13
|
+
|
14
|
+
describe "when some views exist" do
|
15
|
+
let(:views) do
|
16
|
+
{
|
17
|
+
abc: view_config,
|
18
|
+
def: view_config
|
19
|
+
}
|
20
|
+
end
|
21
|
+
|
22
|
+
it "draws the group" do
|
23
|
+
expect(render.css('.view-type-group')).to be_present
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
context 'with a icon component class' do
|
28
|
+
let(:views) do
|
29
|
+
{ abc: Blacklight::Configuration::ViewConfig.new(icon: Blacklight::Icons::ListComponent), def: view_config }
|
30
|
+
end
|
31
|
+
|
32
|
+
it 'draws the icon' do
|
33
|
+
expect(render.css('.view-type-abc svg')).to be_present
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
context 'with a icon component instance' do
|
38
|
+
let(:views) do
|
39
|
+
{ abc: Blacklight::Configuration::ViewConfig.new(icon: Blacklight::Icons::ListComponent.new), def: view_config }
|
40
|
+
end
|
41
|
+
|
42
|
+
it 'draws the icon' do
|
43
|
+
expect(render.css('.view-type-abc svg')).to be_present
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
context 'with a icon with the svg given in-line' do
|
48
|
+
let(:views) do
|
49
|
+
{ abc: Blacklight::Configuration::ViewConfig.new(icon: Blacklight::Icons::IconComponent.new(svg: 'blah')), def: view_config }
|
50
|
+
end
|
51
|
+
|
52
|
+
it 'draws the icon' do
|
53
|
+
expect(render.css('.view-type-abc').text).to include 'blah'
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
57
|
+
describe "when no views exist" do
|
58
|
+
let(:views) do
|
59
|
+
{}
|
60
|
+
end
|
61
|
+
|
62
|
+
it "draws nothing" do
|
63
|
+
expect(render.to_html).to be_blank
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
@@ -29,7 +29,7 @@ RSpec.describe Blacklight::SearchBarComponent, type: :component do
|
|
29
29
|
context 'when a button is passed in' do
|
30
30
|
subject(:render) do
|
31
31
|
render_inline(instance) do |c|
|
32
|
-
c.
|
32
|
+
c.with_search_button do
|
33
33
|
controller.view_context.tag.button "hello", id: 'custom_search'
|
34
34
|
end
|
35
35
|
end
|
@@ -0,0 +1,40 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'spec_helper'
|
4
|
+
|
5
|
+
RSpec.describe Blacklight::SearchContextComponent, type: :component do
|
6
|
+
subject(:render) { render_inline(instance) }
|
7
|
+
|
8
|
+
let(:search_session) { {} }
|
9
|
+
let(:instance) { described_class.new(search_context: search_context, search_session: search_session) }
|
10
|
+
|
11
|
+
before do
|
12
|
+
allow(controller).to receive(:current_search_session).and_return(double(id: 9))
|
13
|
+
end
|
14
|
+
|
15
|
+
context 'when there is no next or previous' do
|
16
|
+
let(:search_context) { {} }
|
17
|
+
|
18
|
+
it "does not render content" do
|
19
|
+
expect(render.to_html).to be_blank
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
context 'when there is next and previous' do
|
24
|
+
let(:search_context) { { next: next_doc, prev: prev_doc } }
|
25
|
+
let(:prev_doc) { SolrDocument.new(id: '777') }
|
26
|
+
let(:next_doc) { SolrDocument.new(id: '888') }
|
27
|
+
|
28
|
+
before do
|
29
|
+
# allow(controller).to receive(:controller_tracking_method).and_return('track_catalog_path')
|
30
|
+
allow(controller).to receive(:controller_name).and_return('catalog')
|
31
|
+
|
32
|
+
allow(controller).to receive(:link_to_previous_document).and_return('')
|
33
|
+
allow(controller).to receive(:link_to_next_document).and_return('')
|
34
|
+
end
|
35
|
+
|
36
|
+
it "renders content" do
|
37
|
+
expect(render.css('.pagination-search-widgets').to_html).not_to be_blank
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
@@ -1,10 +1,9 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
RSpec.describe
|
3
|
+
RSpec.describe CatalogController do
|
4
4
|
subject do
|
5
5
|
Class.new do
|
6
6
|
include Blacklight::Configurable
|
7
|
-
include Blacklight::DefaultComponentConfiguration
|
8
7
|
|
9
8
|
def some_existing_action
|
10
9
|
1
|
@@ -12,10 +11,6 @@ RSpec.describe Blacklight::DefaultComponentConfiguration do
|
|
12
11
|
end
|
13
12
|
end
|
14
13
|
|
15
|
-
before do
|
16
|
-
allow(Deprecation).to receive(:warn)
|
17
|
-
end
|
18
|
-
|
19
14
|
describe ".add_show_tools_partial" do
|
20
15
|
it "defines an action method" do
|
21
16
|
subject.blacklight_config.add_show_tools_partial :xyz
|
@@ -1,9 +1,9 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
RSpec.describe Blacklight::
|
3
|
+
RSpec.describe Blacklight::Catalog do
|
4
4
|
subject { controller }
|
5
5
|
|
6
|
-
let(:controller) { (Class.new(ApplicationController) { include Blacklight::
|
6
|
+
let(:controller) { (Class.new(ApplicationController) { include Blacklight::Catalog }).new }
|
7
7
|
|
8
8
|
describe "#search_state" do
|
9
9
|
subject { controller.send(:search_state) }
|
@@ -7,11 +7,10 @@ RSpec.describe BookmarksController do
|
|
7
7
|
end
|
8
8
|
|
9
9
|
it 'opts out of search session tracking' do
|
10
|
-
expect(@controller.blacklight_config.track_search_session).to
|
10
|
+
expect(@controller.blacklight_config.track_search_session).to be false
|
11
11
|
end
|
12
12
|
end
|
13
13
|
|
14
|
-
# jquery 1.9 ajax does error callback if 200 returns empty body. so use 204 instead.
|
15
14
|
describe "update" do
|
16
15
|
it "has a 200 status code when creating a new one" do
|
17
16
|
put :update, xhr: true, params: { id: '2007020969', format: :js }
|
@@ -105,7 +104,7 @@ RSpec.describe BookmarksController do
|
|
105
104
|
end
|
106
105
|
|
107
106
|
context 'created over an hour ago' do
|
108
|
-
let(:current_time) {
|
107
|
+
let(:current_time) { 2.hours.ago }
|
109
108
|
|
110
109
|
it 'is expired' do
|
111
110
|
get :index, params: { encrypted_user_id: token }
|
@@ -1,10 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
RSpec.describe CatalogController, api: true do
|
4
|
-
around { |test| Deprecation.silence(Blacklight::Catalog) { test.call } }
|
5
|
-
|
6
4
|
let(:doc_id) { '2007020969' }
|
7
|
-
let(:mock_response) { instance_double(Blacklight::Solr::Response) }
|
8
5
|
let(:mock_document) { instance_double(SolrDocument, export_formats: {}) }
|
9
6
|
let(:search_service) { instance_double(Blacklight::SearchService) }
|
10
7
|
|
@@ -63,17 +60,17 @@ RSpec.describe CatalogController, api: true do
|
|
63
60
|
end
|
64
61
|
|
65
62
|
it "shows 0 results when the user asks for an invalid value to a custom facet query", integration: true do
|
66
|
-
get :index, params: { f: { example_query_facet_field: 'bogus' } } # bogus custom facet value
|
63
|
+
get :index, params: { f: { example_query_facet_field: ['bogus'] } } # bogus custom facet value
|
67
64
|
expect(assigns(:response).docs).to be_empty
|
68
65
|
end
|
69
66
|
|
70
67
|
it "returns results (possibly 0) when the user asks for a valid value to a custom facet query", integration: true do
|
71
|
-
get :index, params: { f: { example_query_facet_field: 'years_25' } } # valid custom facet value with some results
|
68
|
+
get :index, params: { f: { example_query_facet_field: ['years_25'] } } # valid custom facet value with some results
|
72
69
|
expect(assigns(:response).docs).not_to be_empty
|
73
70
|
end
|
74
71
|
|
75
72
|
it "returns no results when the users asks for a value that doesn't match any" do
|
76
|
-
get :index, params: { f: { example_query_facet_field: 'years_5' } } # valid custom facet value with NO results
|
73
|
+
get :index, params: { f: { example_query_facet_field: ['years_5'] } } # valid custom facet value with NO results
|
77
74
|
expect(assigns(:response).docs).to be_empty
|
78
75
|
end
|
79
76
|
|
@@ -161,20 +158,20 @@ RSpec.describe CatalogController, api: true do
|
|
161
158
|
|
162
159
|
format = facets.find { |x| x['id'] == 'format' }
|
163
160
|
|
164
|
-
expect(format['attributes']['items'].
|
161
|
+
expect(format['attributes']['items'].pluck('attributes')).to match_array([{ "value" => "Book", "hits" => 30, "label" => "Book" }])
|
165
162
|
expect(format['links']['self']).to eq facet_catalog_url(format: :json, id: 'format')
|
166
163
|
expect(format['attributes']['items'].first['links']['self']).to eq search_catalog_url(format: :json, f: { format: ['Book'] })
|
167
164
|
end
|
168
165
|
|
169
166
|
it "gets the search fields" do
|
170
167
|
expect(search_fields).to have(4).fields
|
171
|
-
expect(search_fields.
|
168
|
+
expect(search_fields.pluck('id')).to match_array %w[all_fields author subject title]
|
172
169
|
expect(search_fields.first['links']['self']).to eq search_catalog_url(format: :json, search_field: 'all_fields')
|
173
170
|
end
|
174
171
|
|
175
172
|
describe "facets" do
|
176
173
|
let(:query_facet) { facets.find { |x| x['id'] == 'example_query_facet_field' } }
|
177
|
-
let(:query_facet_items) { query_facet['attributes']['items'].
|
174
|
+
let(:query_facet_items) { query_facet['attributes']['items'].pluck('attributes') }
|
178
175
|
|
179
176
|
it "has items with labels and values" do
|
180
177
|
expect(query_facet_items.first['label']).to eq 'within 25 Years'
|
@@ -339,7 +336,7 @@ RSpec.describe CatalogController, api: true do
|
|
339
336
|
before do
|
340
337
|
allow(mock_document).to receive_messages(export_formats: {})
|
341
338
|
allow(controller).to receive(:search_service).and_return(search_service)
|
342
|
-
expect(search_service).to receive(:fetch).and_return(
|
339
|
+
expect(search_service).to receive(:fetch).and_return(mock_document)
|
343
340
|
allow(controller).to receive(:current_search_session).and_return(current_search)
|
344
341
|
end
|
345
342
|
|
@@ -399,7 +396,7 @@ RSpec.describe CatalogController, api: true do
|
|
399
396
|
|
400
397
|
it "renders show.html.erb" do
|
401
398
|
allow(controller).to receive(:search_service).and_return(search_service)
|
402
|
-
expect(search_service).to receive(:fetch).and_return(
|
399
|
+
expect(search_service).to receive(:fetch).and_return(mock_document)
|
403
400
|
|
404
401
|
get :show, params: { id: doc_id }
|
405
402
|
expect(response).to render_template(:show)
|
@@ -408,7 +405,7 @@ RSpec.describe CatalogController, api: true do
|
|
408
405
|
describe '@document' do
|
409
406
|
before do
|
410
407
|
allow(controller).to receive(:search_service).and_return(search_service)
|
411
|
-
expect(search_service).to receive(:fetch).and_return(
|
408
|
+
expect(search_service).to receive(:fetch).and_return(mock_document)
|
412
409
|
|
413
410
|
get :show, params: { id: doc_id }
|
414
411
|
end
|
@@ -434,7 +431,7 @@ RSpec.describe CatalogController, api: true do
|
|
434
431
|
Mime::Type.register "application/mock", :mock
|
435
432
|
SolrDocument.use_extension(FakeExtension)
|
436
433
|
allow(controller).to receive(:search_service).and_return(search_service)
|
437
|
-
expect(search_service).to receive(:fetch).and_return(
|
434
|
+
expect(search_service).to receive(:fetch).and_return(SolrDocument.new(id: 'my_fake_doc'))
|
438
435
|
end
|
439
436
|
|
440
437
|
after do
|
@@ -470,23 +467,7 @@ RSpec.describe CatalogController, api: true do
|
|
470
467
|
end
|
471
468
|
end
|
472
469
|
|
473
|
-
describe 'GET suggest' do
|
474
|
-
it 'returns JSON' do
|
475
|
-
get :suggest, params: { format: 'json' }
|
476
|
-
expect(response.body).to eq [].to_json
|
477
|
-
end
|
478
|
-
|
479
|
-
it 'returns suggestions' do
|
480
|
-
get :suggest, params: { format: 'json', q: 'new' }
|
481
|
-
json = JSON.parse(response.body)
|
482
|
-
expect(json.count).to eq 5
|
483
|
-
expect(json.first['term']).to eq 'new jersey'
|
484
|
-
end
|
485
|
-
end
|
486
|
-
|
487
470
|
describe "email/sms" do
|
488
|
-
let(:mock_response) { instance_double(Blacklight::Solr::Response, documents: [SolrDocument.new(id: 'my_fake_doc'), SolrDocument.new(id: 'my_other_doc')]) }
|
489
|
-
|
490
471
|
before do
|
491
472
|
mock_document.extend(Blacklight::Document::Sms)
|
492
473
|
mock_document.extend(Blacklight::Document::Email)
|
@@ -494,7 +475,7 @@ RSpec.describe CatalogController, api: true do
|
|
494
475
|
allow(mock_document).to receive(:to_model).and_return(SolrDocument.new(id: 'my_fake_doc'))
|
495
476
|
|
496
477
|
allow(controller).to receive(:search_service).and_return(search_service)
|
497
|
-
expect(search_service).to receive(:fetch).and_return([
|
478
|
+
expect(search_service).to receive(:fetch).and_return([mock_document])
|
498
479
|
request.env["HTTP_REFERER"] = "/catalog/#{doc_id}"
|
499
480
|
SolrDocument.use_extension(Blacklight::Document::Email)
|
500
481
|
SolrDocument.use_extension(Blacklight::Document::Sms)
|
@@ -581,7 +562,7 @@ RSpec.describe CatalogController, api: true do
|
|
581
562
|
|
582
563
|
it "redirects back to the record upon success" do
|
583
564
|
post :sms, params: { id: doc_id, to: '5555555555', carrier: 'txt.att.net' }
|
584
|
-
expect(request.flash[:error]).to
|
565
|
+
expect(request.flash[:error]).to be_nil
|
585
566
|
expect(request).to redirect_to(solr_document_path(doc_id))
|
586
567
|
end
|
587
568
|
|
@@ -607,31 +588,6 @@ RSpec.describe CatalogController, api: true do
|
|
607
588
|
get :citation, params: { id: "bad-record-identifer" }
|
608
589
|
end.to raise_error Blacklight::Exceptions::RecordNotFound
|
609
590
|
end
|
610
|
-
|
611
|
-
context "when there is an invalid search", api: false do
|
612
|
-
let(:service) { instance_double(Blacklight::SearchService) }
|
613
|
-
let(:fake_error) { Blacklight::Exceptions::InvalidRequest.new }
|
614
|
-
|
615
|
-
before do
|
616
|
-
allow(controller).to receive(:search_service).and_return(service)
|
617
|
-
allow(service).to receive(:search_results) { |*_args| raise fake_error }
|
618
|
-
allow(Rails.env).to receive_messages(test?: false)
|
619
|
-
end
|
620
|
-
|
621
|
-
it "redirects the user to the root url for a bad search" do
|
622
|
-
expect(controller.logger).to receive(:error).with(fake_error)
|
623
|
-
get :index, params: { q: '+' }
|
624
|
-
expect(response.redirect_url).to eq root_url
|
625
|
-
expect(request.flash[:notice]).to eq "Sorry, I don't understand your search."
|
626
|
-
expect(response).not_to be_successful
|
627
|
-
expect(response.status).to eq 302
|
628
|
-
end
|
629
|
-
|
630
|
-
it "returns status 500 if the catalog path is raising an exception" do
|
631
|
-
allow(controller).to receive(:flash).and_return(notice: I18n.t('blacklight.search.errors.request_error'))
|
632
|
-
expect { get :index, params: { q: '+' } }.to raise_error Blacklight::Exceptions::InvalidRequest
|
633
|
-
end
|
634
|
-
end
|
635
591
|
end
|
636
592
|
|
637
593
|
context "without a user authentication provider" do
|
@@ -779,7 +735,7 @@ RSpec.describe CatalogController, api: true do
|
|
779
735
|
end
|
780
736
|
|
781
737
|
describe "with a facet" do
|
782
|
-
before { allow(controller).to receive_messages(params: { f: { "
|
738
|
+
before { allow(controller).to receive_messages(params: { f: { "format" => ["value"] } }) }
|
783
739
|
|
784
740
|
it { is_expected.to be true }
|
785
741
|
end
|
@@ -841,76 +797,6 @@ RSpec.describe CatalogController, api: true do
|
|
841
797
|
expect(controller.send(:search_facet_path, id: "some_facet", page: 5)).to eq facet_catalog_path(id: "some_facet")
|
842
798
|
end
|
843
799
|
end
|
844
|
-
|
845
|
-
describe "facet_limit_for" do
|
846
|
-
let(:blacklight_config) { controller.blacklight_config }
|
847
|
-
|
848
|
-
it "returns specified value for facet_field specified" do
|
849
|
-
expect(controller.facet_limit_for("subject_ssim")).to eq blacklight_config.facet_fields["subject_ssim"].limit
|
850
|
-
end
|
851
|
-
|
852
|
-
it "facet_limit_hash should return hash with key being facet_field and value being configured limit" do
|
853
|
-
# facet_limit_hash has been removed from solrhelper in refactor. should it go back?
|
854
|
-
skip "facet_limit_hash has been removed from solrhelper in refactor. should it go back?"
|
855
|
-
expect(controller.facet_limit_hash).to eq blacklight_config[:facet][:limits]
|
856
|
-
end
|
857
|
-
|
858
|
-
it "handles no facet_limits in config" do
|
859
|
-
blacklight_config.facet_fields = {}
|
860
|
-
expect(controller.facet_limit_for("subject_ssim")).to be_nil
|
861
|
-
end
|
862
|
-
|
863
|
-
describe "for 'true' configured values" do
|
864
|
-
before do
|
865
|
-
allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
|
866
|
-
end
|
867
|
-
|
868
|
-
let(:blacklight_config) do
|
869
|
-
Blacklight::Configuration.new do |config|
|
870
|
-
config.add_facet_field "language_facet", limit: true
|
871
|
-
end
|
872
|
-
end
|
873
|
-
|
874
|
-
it "returns nil if no @response available" do
|
875
|
-
expect(controller.facet_limit_for("some_unknown_field")).to be_nil
|
876
|
-
end
|
877
|
-
|
878
|
-
it "gets from @response facet.limit if available" do
|
879
|
-
response = instance_double(Blacklight::Solr::Response, aggregations: { "language_facet" => double(limit: nil) })
|
880
|
-
controller.instance_variable_set(:@response, response)
|
881
|
-
blacklight_config.facet_fields['language_facet'].limit = 10
|
882
|
-
expect(controller.facet_limit_for("language_facet")).to eq 10
|
883
|
-
end
|
884
|
-
|
885
|
-
it "gets the limit from the facet field in @response" do
|
886
|
-
response = instance_double(Blacklight::Solr::Response, aggregations: { "language_facet" => double(limit: 16) })
|
887
|
-
controller.instance_variable_set(:@response, response)
|
888
|
-
expect(controller.facet_limit_for("language_facet")).to eq 15
|
889
|
-
end
|
890
|
-
|
891
|
-
it "defaults to 10" do
|
892
|
-
expect(controller.facet_limit_for("language_facet")).to eq 10
|
893
|
-
end
|
894
|
-
end
|
895
|
-
|
896
|
-
context 'for facet fields with a key that is different from the field name' do
|
897
|
-
before do
|
898
|
-
allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
|
899
|
-
end
|
900
|
-
|
901
|
-
let(:blacklight_config) do
|
902
|
-
Blacklight::Configuration.new do |config|
|
903
|
-
config.add_facet_field 'some_key', field: 'x', limit: true
|
904
|
-
end
|
905
|
-
end
|
906
|
-
|
907
|
-
it 'gets the limit from the facet field in the @response' do
|
908
|
-
response = instance_double(Blacklight::Solr::Response, aggregations: { 'x' => double(limit: 16) })
|
909
|
-
controller.instance_variable_set(:@response, response)
|
910
|
-
expect(controller.facet_limit_for('some_key')).to eq 15
|
911
|
-
end
|
912
|
-
end
|
913
|
-
end
|
914
800
|
end
|
915
801
|
|
916
802
|
# there must be at least one facet, and each facet must have at least one value
|
data/spec/features/axe_spec.rb
CHANGED
@@ -28,6 +28,6 @@ RSpec.describe 'Accessibility testing', api: false, js: true do
|
|
28
28
|
|
29
29
|
def be_accessible(skipping: [])
|
30
30
|
# typeahead does funny things with the search bar
|
31
|
-
be_axe_clean.excluding('.tt-hint').skipping(skipping + [('color-contrast' if Bootstrap::VERSION < '5')].compact)
|
31
|
+
be_axe_clean.excluding('.tt-hint').skipping(skipping + [('color-contrast' if defined?(Bootstrap) && Bootstrap::VERSION < '5')].compact)
|
32
32
|
end
|
33
33
|
end
|
@@ -69,7 +69,7 @@ RSpec.describe "Facets" do
|
|
69
69
|
page.find('h3.facet-field-heading button', text: 'Pivot Field').click
|
70
70
|
|
71
71
|
within '#facet-example_pivot_field' do
|
72
|
-
expect(page).to have_css('.facet-leaf-node', text: "Book 30")
|
72
|
+
expect(page).to have_css('.facet-leaf-node', text: "Book 30", normalize_ws: true)
|
73
73
|
expect(page).not_to have_css('.facet-select', text: 'Tibetan')
|
74
74
|
page.find('.facet-toggle-handle').click
|
75
75
|
click_link 'Tibetan'
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
RSpec.describe "Search Results context"
|
4
|
-
it "passes the current search id through" do
|
3
|
+
RSpec.describe "Search Results context" do
|
4
|
+
it "passes the current search id through", js: true do
|
5
5
|
search_for ''
|
6
6
|
click_on 'Pluvial nectar of blessings'
|
7
7
|
search_id = Search.last.id.to_s
|
@@ -16,7 +16,7 @@ RSpec.describe "Search Results context", js: true do
|
|
16
16
|
expect(prev['data-context-href']).to eq "/catalog/2004310986/track?counter=8&document_id=2004310986&search_id=#{search_id}"
|
17
17
|
end
|
18
18
|
|
19
|
-
it "redirects context urls to the original url" do
|
19
|
+
it "redirects context urls to the original url", js: true do
|
20
20
|
search_for ''
|
21
21
|
first('.index_title a').click
|
22
22
|
expect(page).to have_content "« Previous | 1 of 30 | Next »"
|
@@ -43,7 +43,7 @@ RSpec.describe "Search Results context", js: true do
|
|
43
43
|
end
|
44
44
|
|
45
45
|
context "navigating between search results using context pagination" do
|
46
|
-
it "updates the back to search link with the current search pagination context" do
|
46
|
+
it "updates the back to search link with the current search pagination context", js: true do
|
47
47
|
search_for ''
|
48
48
|
expect(page).to have_content "1 - 10"
|
49
49
|
find_all('.index_title a').last.click
|
@@ -55,9 +55,3 @@ RSpec.describe "Search Results context", js: true do
|
|
55
55
|
end
|
56
56
|
end
|
57
57
|
end
|
58
|
-
|
59
|
-
def search_for q
|
60
|
-
visit root_path
|
61
|
-
fill_in "q", with: q
|
62
|
-
click_button 'search'
|
63
|
-
end
|