blacklight 7.34.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 +32 -127
- data/.rubocop.yml +241 -2
- data/.rubocop_todo.yml +214 -270
- data/Gemfile +7 -10
- 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 -489
- 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 +2 -2
- 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 +4 -0
- data/app/components/blacklight/document_component.rb +14 -53
- 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/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.rb +1 -1
- 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 +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 +1 -5
- 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/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 +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 -5
- data/app/controllers/concerns/blacklight/catalog.rb +21 -75
- 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 +1 -0
- 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 -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 -31
- 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 +99 -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/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/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/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 +0 -4
- 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 +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_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 +13 -2
- data/app/views/search_history/index.html.erb +6 -2
- data/app/views/shared/_modal.html.erb +3 -3
- data/blacklight.gemspec +8 -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 -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 +0 -1
- 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 +294 -358
- data/lib/blacklight/engine.rb +8 -13
- 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 +3 -14
- 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 +4 -3
- data/lib/blacklight/solr/search_builder_behavior.rb +17 -34
- data/lib/blacklight/solr.rb +1 -0
- data/lib/blacklight/version.rb +1 -0
- data/lib/blacklight.rb +7 -10
- 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 +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_component_spec.rb +23 -82
- 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 +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/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 +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 -27
- 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 -31
- data/spec/models/blacklight/user_spec.rb +22 -0
- 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 +20 -29
- 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 +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/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 +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 +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 +79 -126
- 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 -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/controllers/blacklight/facet_spec.rb +0 -33
- data/spec/controllers/blacklight/search_fields_spec.rb +0 -62
- data/spec/features/sitelinks_search_box_spec.rb +0 -13
- 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/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
@@ -36,7 +36,6 @@ RSpec.describe Blacklight::FieldPresenter, api: true do
|
|
36
36
|
config.add_index_field 'solr_doc_accessor', accessor: true
|
37
37
|
config.add_index_field 'explicit_accessor', accessor: :solr_doc_accessor
|
38
38
|
config.add_index_field 'explicit_array_accessor', accessor: [:solr_doc_accessor, :some_method]
|
39
|
-
config.add_index_field 'explicit_values', values: ->(_config, _doc) { ['some-value'] }
|
40
39
|
config.add_index_field 'explicit_values_with_context', values: ->(_config, _doc, view_context) { [view_context.params[:x]] }
|
41
40
|
config.add_index_field 'alias', field: 'qwer'
|
42
41
|
config.add_index_field 'with_default', default: 'value'
|
@@ -162,15 +161,6 @@ RSpec.describe Blacklight::FieldPresenter, api: true do
|
|
162
161
|
end
|
163
162
|
end
|
164
163
|
|
165
|
-
context 'when the values lambda is provided' do
|
166
|
-
let(:field_name) { 'explicit_values' }
|
167
|
-
|
168
|
-
it 'calls the accessors on the return of the preceeding' do
|
169
|
-
allow(Deprecation).to receive(:warn)
|
170
|
-
expect(subject).to eq 'some-value'
|
171
|
-
end
|
172
|
-
end
|
173
|
-
|
174
164
|
context 'when the values lambda is provided and accepts the view contexts' do
|
175
165
|
let(:field_name) { 'explicit_values_with_context' }
|
176
166
|
|
@@ -241,10 +231,6 @@ RSpec.describe Blacklight::FieldPresenter, api: true do
|
|
241
231
|
|
242
232
|
let(:field_config) { double('field config', if: true, unless: false, except_operations: nil) }
|
243
233
|
|
244
|
-
before do
|
245
|
-
allow(presenter).to receive_messages(document_has_value?: true)
|
246
|
-
end
|
247
|
-
|
248
234
|
it { is_expected.to be true }
|
249
235
|
|
250
236
|
context 'when the view context says not to render the field' do
|
@@ -25,14 +25,12 @@ RSpec.describe Blacklight::IndexPresenter, api: true do
|
|
25
25
|
end
|
26
26
|
|
27
27
|
describe '#fields' do
|
28
|
-
let(:field) { instance_double(Blacklight::Configuration::Field) }
|
29
|
-
|
30
28
|
before do
|
31
|
-
|
29
|
+
config.add_index_field 'title'
|
32
30
|
end
|
33
31
|
|
34
32
|
it 'returns the list from the configs' do
|
35
|
-
expect(subject.send(:fields)).to eq
|
33
|
+
expect(subject.send(:fields).keys).to eq ['title']
|
36
34
|
end
|
37
35
|
end
|
38
36
|
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require 'spec_helper'
|
3
4
|
|
4
5
|
RSpec.describe Blacklight::LinkAlternatePresenter do
|
@@ -25,8 +26,8 @@ RSpec.describe Blacklight::LinkAlternatePresenter do
|
|
25
26
|
|
26
27
|
let(:expected_html) do
|
27
28
|
'<link rel="alternate" title="xml" type="application/xml" href="http://test.host/catalog/9999.xml" />' \
|
28
|
-
|
29
|
-
|
29
|
+
'<link rel="alternate" title="dc_xml" type="text/xml" href="http://test.host/catalog/9999.dc_xml" />' \
|
30
|
+
'<link rel="alternate" title="oai_dc_xml" type="text/xml" href="http://test.host/catalog/9999.oai_dc_xml" />'
|
30
31
|
end
|
31
32
|
|
32
33
|
it { is_expected.to be_equivalent_to expected_html }
|
@@ -14,10 +14,7 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
|
|
14
14
|
let(:search_state) { Blacklight::SearchState.new(params, config, controller) }
|
15
15
|
|
16
16
|
let(:document) do
|
17
|
-
SolrDocument.new(id:
|
18
|
-
'link_to_facet_true' => 'x',
|
19
|
-
'link_to_facet_named' => 'x',
|
20
|
-
'qwer' => 'document qwer value')
|
17
|
+
SolrDocument.new(id: 'xyz', some_field: 'value')
|
21
18
|
end
|
22
19
|
|
23
20
|
before do
|
@@ -52,6 +49,10 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
|
|
52
49
|
|
53
50
|
MockDocument.use_extension(MockExtension)
|
54
51
|
|
52
|
+
def mock_document_app_helper_url *args
|
53
|
+
solr_document_url(*args)
|
54
|
+
end
|
55
|
+
|
55
56
|
allow(request_context).to receive(:polymorphic_url) do |_, opts|
|
56
57
|
"url.#{opts[:format]}"
|
57
58
|
end
|
@@ -66,10 +67,12 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
|
|
66
67
|
tmp_value = Capybara.ignore_hidden_elements
|
67
68
|
Capybara.ignore_hidden_elements = false
|
68
69
|
document.export_formats.each_pair do |format, _spec|
|
69
|
-
expect(subject).to have_selector("link[href$='.#{format}']"
|
70
|
-
expect(
|
71
|
-
|
72
|
-
expect(tag["
|
70
|
+
expect(subject).to have_selector("link[href$='.#{format}']") do |matches|
|
71
|
+
expect(matches).to have(1).match
|
72
|
+
tag = matches[0]
|
73
|
+
expect(tag.attributes["rel"].value).to eq "alternate"
|
74
|
+
expect(tag.attributes["title"].value).to eq format.to_s
|
75
|
+
expect(tag.attributes["href"].value).to eq mock_document_app_helper_url(document, format: format)
|
73
76
|
end
|
74
77
|
end
|
75
78
|
Capybara.ignore_hidden_elements = tmp_value
|
@@ -102,43 +105,36 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
|
|
102
105
|
end
|
103
106
|
|
104
107
|
describe '#fields' do
|
105
|
-
let(:field) { instance_double(Blacklight::Configuration::Field) }
|
106
|
-
|
107
108
|
before do
|
108
|
-
|
109
|
+
config.add_show_field 'title'
|
109
110
|
end
|
110
111
|
|
111
112
|
it 'returns the list from the configs' do
|
112
|
-
expect(subject.send(:fields)).to eq
|
113
|
+
expect(subject.send(:fields).keys).to eq ['title']
|
113
114
|
end
|
114
115
|
end
|
115
116
|
|
116
117
|
describe "#heading" do
|
117
118
|
it "falls back to an id" do
|
118
|
-
allow(document).to receive(:[]).with('id').and_return "xyz"
|
119
119
|
expect(subject.heading).to eq document.id
|
120
120
|
end
|
121
121
|
|
122
122
|
it "returns the value of the field" do
|
123
|
-
config.show.title_field =
|
124
|
-
allow(document).to receive(:has?).with(:x).and_return(true)
|
125
|
-
allow(document).to receive(:fetch).with(:x, nil).and_return("value")
|
123
|
+
config.show.title_field = 'some_field'
|
126
124
|
expect(subject.heading).to eq "value"
|
127
125
|
end
|
128
126
|
|
129
127
|
it "returns the first present value" do
|
130
|
-
config.show.title_field = [
|
131
|
-
allow(document).to receive(:fetch).with(:x, nil).and_return(nil)
|
132
|
-
allow(document).to receive(:fetch).with(:y, nil).and_return("value")
|
128
|
+
config.show.title_field = %w[a_field_that_doesnt_exist some_field]
|
133
129
|
expect(subject.heading).to eq "value"
|
134
130
|
end
|
135
131
|
|
136
132
|
it "can use explicit field configuration" do
|
137
|
-
config.show.title_field = Blacklight::Configuration::
|
133
|
+
config.show.title_field = Blacklight::Configuration::DisplayField.new(field: 'x', values: ->(*_) { 'hardcoded' })
|
138
134
|
expect(subject.heading).to eq 'hardcoded'
|
139
135
|
end
|
140
136
|
|
141
|
-
context "
|
137
|
+
context "with an empty document" do
|
142
138
|
let(:document) { SolrDocument.new({}) }
|
143
139
|
|
144
140
|
it "returns an empty string as the heading" do
|
@@ -149,26 +145,21 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
|
|
149
145
|
|
150
146
|
describe "#html_title" do
|
151
147
|
it "falls back to an id" do
|
152
|
-
allow(document).to receive(:[]).with('id').and_return "xyz"
|
153
148
|
expect(subject.html_title).to eq document.id
|
154
149
|
end
|
155
150
|
|
156
151
|
it "returns the value of the field" do
|
157
|
-
config.show.html_title_field =
|
158
|
-
allow(document).to receive(:has?).with(:x).and_return(true)
|
159
|
-
allow(document).to receive(:fetch).with(:x, nil).and_return("value")
|
152
|
+
config.show.html_title_field = 'some_field'
|
160
153
|
expect(subject.html_title).to eq "value"
|
161
154
|
end
|
162
155
|
|
163
156
|
it "returns the first present value" do
|
164
|
-
config.show.html_title_field = [
|
165
|
-
allow(document).to receive(:fetch).with(:x, nil).and_return(nil)
|
166
|
-
allow(document).to receive(:fetch).with(:y, nil).and_return("value")
|
157
|
+
config.show.html_title_field = %w[a_field_that_doesnt_exist some_field]
|
167
158
|
expect(subject.html_title).to eq "value"
|
168
159
|
end
|
169
160
|
|
170
161
|
it "can use explicit field configuration" do
|
171
|
-
config.show.html_title_field = Blacklight::Configuration::
|
162
|
+
config.show.html_title_field = Blacklight::Configuration::DisplayField.new(field: 'x', values: ->(*_) { 'hardcoded' })
|
172
163
|
expect(subject.html_title).to eq 'hardcoded'
|
173
164
|
end
|
174
165
|
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'spec_helper'
|
4
|
+
|
5
|
+
RSpec.describe 'GET /catalog/suggest' do
|
6
|
+
it 'returns suggestions' do
|
7
|
+
get '/catalog/suggest?q=new'
|
8
|
+
expect(response.body).to eq <<-RESULT
|
9
|
+
<li role="option"><span>new jersey</span></li>
|
10
|
+
<li role="option"><span>new jersey bridgeton biography</span></li>
|
11
|
+
<li role="option"><span>new jersey bridgeton history</span></li>
|
12
|
+
<li role="option"><span>new york</span></li>
|
13
|
+
<li role="option"><span>nuwākshūṭ</span></li>
|
14
|
+
RESULT
|
15
|
+
end
|
16
|
+
end
|
@@ -55,10 +55,6 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
55
55
|
describe 'for a sample query returning results' do
|
56
56
|
let(:user_params) { { q: all_docs_query } }
|
57
57
|
|
58
|
-
before do
|
59
|
-
(@solr_response, @document_list) = service.search_results
|
60
|
-
end
|
61
|
-
|
62
58
|
it "uses the configured request handler" do
|
63
59
|
allow(blacklight_config).to receive(:default_solr_params).and_return(qt: 'custom_request_handler')
|
64
60
|
allow(blacklight_solr).to receive(:send_and_receive) do |path, params|
|
@@ -69,23 +65,6 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
69
65
|
end.and_return('response' => { 'docs' => [] })
|
70
66
|
service.search_results
|
71
67
|
end
|
72
|
-
|
73
|
-
it 'has a @response.docs list of the same size as @document_list' do
|
74
|
-
expect(@solr_response.docs).to have(@document_list.length).docs
|
75
|
-
end
|
76
|
-
|
77
|
-
it 'has @response.docs list representing same documents as SolrDocuments in @document_list' do
|
78
|
-
@solr_response.docs.each_index do |index|
|
79
|
-
mash = @solr_response.docs[index]
|
80
|
-
solr_document = @document_list[index]
|
81
|
-
|
82
|
-
expect(Set.new(mash.keys)).to eq Set.new(solr_document.keys)
|
83
|
-
|
84
|
-
mash.keys.each do |key|
|
85
|
-
expect(mash[key]).to eq solr_document[key]
|
86
|
-
end
|
87
|
-
end
|
88
|
-
end
|
89
68
|
end
|
90
69
|
|
91
70
|
describe "for a query returning a grouped response" do
|
@@ -95,12 +74,10 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
95
74
|
before do
|
96
75
|
blacklight_config.default_solr_params[:group] = true
|
97
76
|
blacklight_config.default_solr_params[:'group.field'] = 'pub_date_si'
|
98
|
-
(@solr_response, @document_list) = service.search_results
|
99
77
|
end
|
100
78
|
|
101
79
|
it "returns a grouped response" do
|
102
|
-
expect(
|
103
|
-
expect(@solr_response).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
|
80
|
+
expect(service.search_results).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
|
104
81
|
end
|
105
82
|
end
|
106
83
|
|
@@ -112,13 +89,12 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
112
89
|
allow(subject).to receive_messages grouped_key_for_results: 'title_si'
|
113
90
|
blacklight_config.default_solr_params[:group] = true
|
114
91
|
blacklight_config.default_solr_params[:'group.field'] = %w[pub_date_si title_si]
|
115
|
-
(@solr_response, @document_list) = service.search_results
|
116
92
|
end
|
117
93
|
|
118
94
|
it "returns a grouped response" do
|
119
|
-
|
120
|
-
expect(
|
121
|
-
expect(
|
95
|
+
solr_response = service.search_results
|
96
|
+
expect(solr_response).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
|
97
|
+
expect(solr_response.group_field).to eq "title_si"
|
122
98
|
end
|
123
99
|
end
|
124
100
|
|
@@ -126,8 +102,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
126
102
|
let(:user_params) { { q: all_docs_query, f: single_facet } }
|
127
103
|
|
128
104
|
it 'has results' do
|
129
|
-
|
130
|
-
expect(solr_response.docs).to have(document_list.size).results
|
105
|
+
solr_response = service.search_results
|
131
106
|
expect(solr_response.docs).to have_at_least(1).result
|
132
107
|
end
|
133
108
|
# TODO: check that number of these results < number of results for all docs query
|
@@ -138,8 +113,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
138
113
|
let(:user_params) { { q: no_docs_query } }
|
139
114
|
|
140
115
|
it 'has no results and not raise error' do
|
141
|
-
|
142
|
-
expect(document_list).to have(0).results
|
116
|
+
solr_response = service.search_results
|
143
117
|
expect(solr_response.docs).to have(0).results
|
144
118
|
end
|
145
119
|
end
|
@@ -148,19 +122,17 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
148
122
|
let(:user_params) { { q: no_docs_query, f: single_facet } }
|
149
123
|
|
150
124
|
it 'has no results and not raise error' do
|
151
|
-
|
152
|
-
expect(document_list).to have(0).results
|
125
|
+
solr_response = service.search_results
|
153
126
|
expect(solr_response.docs).to have(0).results
|
154
127
|
end
|
155
128
|
end
|
156
129
|
|
157
130
|
describe "for All Docs Query and Bad Facet" do
|
158
|
-
let(:bad_facet) { { format: '666' } }
|
131
|
+
let(:bad_facet) { { format: ['666'] } }
|
159
132
|
let(:user_params) { { q: all_docs_query, f: bad_facet } }
|
160
133
|
|
161
134
|
it 'has no results and not raise error' do
|
162
|
-
|
163
|
-
expect(document_list).to have(0).results
|
135
|
+
solr_response = service.search_results
|
164
136
|
expect(solr_response.docs).to have(0).results
|
165
137
|
end
|
166
138
|
end
|
@@ -182,7 +154,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
182
154
|
|
183
155
|
it 'has all facets specified in initializer' do
|
184
156
|
expect(@facets.keys).to include *blacklight_config.facet_fields.keys
|
185
|
-
expect(@facets.none? { |_k, v| v.nil? }).to
|
157
|
+
expect(@facets.none? { |_k, v| v.nil? }).to be true
|
186
158
|
end
|
187
159
|
|
188
160
|
it 'has at least one value for each facet' do
|
@@ -199,13 +171,13 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
199
171
|
break
|
200
172
|
end
|
201
173
|
end
|
202
|
-
expect(has_mult_values).to
|
174
|
+
expect(has_mult_values).to be true
|
203
175
|
end
|
204
176
|
|
205
177
|
it 'has all value counts > 0' do
|
206
178
|
@facets.each do |_key, facet|
|
207
179
|
facet.items.each do |facet_vals|
|
208
|
-
expect(facet_vals.hits).to
|
180
|
+
expect(facet_vals.hits).to be_positive
|
209
181
|
end
|
210
182
|
end
|
211
183
|
end
|
@@ -222,9 +194,8 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
222
194
|
end
|
223
195
|
|
224
196
|
it 'has number of results (per page) set in initializer, by default' do
|
225
|
-
|
197
|
+
solr_response = service.search_results
|
226
198
|
expect(solr_response.docs).to have(blacklight_config[:default_solr_params][:rows]).items
|
227
|
-
expect(document_list).to have(blacklight_config[:default_solr_params][:rows]).items
|
228
199
|
end
|
229
200
|
|
230
201
|
context "with per page requested" do
|
@@ -232,8 +203,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
232
203
|
let(:num_results) { 3 } # non-default value
|
233
204
|
|
234
205
|
it 'gets number of results per page requested' do
|
235
|
-
|
236
|
-
expect(document_list1).to have(num_results).docs
|
206
|
+
solr_response1 = service.search_results
|
237
207
|
expect(solr_response1.docs).to have(num_results).docs
|
238
208
|
end
|
239
209
|
end
|
@@ -243,8 +213,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
243
213
|
let(:num_results) { 4 } # non-default value
|
244
214
|
|
245
215
|
it 'gets number of rows requested' do
|
246
|
-
|
247
|
-
expect(document_list1).to have(num_results).docs
|
216
|
+
solr_response1 = service.search_results
|
248
217
|
expect(solr_response1.docs).to have(num_results).docs
|
249
218
|
end
|
250
219
|
end
|
@@ -277,8 +246,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
277
246
|
let(:user_params) { { q: all_docs_query, page: page, rows: rows } }
|
278
247
|
|
279
248
|
it 'has no results when prompted for page after last result' do
|
280
|
-
|
281
|
-
expect(document_list3).to have(0).docs
|
249
|
+
solr_response3 = service.search_results
|
282
250
|
expect(solr_response3.docs).to have(0).docs
|
283
251
|
end
|
284
252
|
end
|
@@ -301,8 +269,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
301
269
|
let(:user_params) { { q: all_docs_query, page: page, rows: rows } }
|
302
270
|
|
303
271
|
it 'has results available when asked for more than are in response' do
|
304
|
-
|
305
|
-
expect(solr_response5.docs).to have(document_list5.length).docs
|
272
|
+
solr_response5 = service.search_results
|
306
273
|
expect(solr_response5.docs).to have_at_least(1).doc
|
307
274
|
end
|
308
275
|
end
|
@@ -314,7 +281,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
314
281
|
let(:bad_id) { 'redrum' }
|
315
282
|
|
316
283
|
before do
|
317
|
-
@
|
284
|
+
@document = service.fetch(doc_id)
|
318
285
|
end
|
319
286
|
|
320
287
|
it "raises Blacklight::RecordNotFound for an unknown id" do
|
@@ -327,10 +294,6 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
327
294
|
expect(@document).not_to be_nil
|
328
295
|
end
|
329
296
|
|
330
|
-
it "has a single document in the response for a known id" do
|
331
|
-
expect(@response2.docs.size).to eq 1
|
332
|
-
end
|
333
|
-
|
334
297
|
it 'has the expected value in the id field' do
|
335
298
|
expect(@document.id).to eq doc_id
|
336
299
|
end
|
@@ -339,18 +302,18 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
339
302
|
describe 'Get multiple documents By Id', integration: true do
|
340
303
|
let(:doc_id) { '2007020969' }
|
341
304
|
let(:bad_id) { 'redrum' }
|
342
|
-
let(:response) { service.fetch([doc_id])
|
305
|
+
let(:response) { service.fetch([doc_id]) }
|
343
306
|
|
344
307
|
before do
|
345
308
|
blacklight_config.fetch_many_document_params[:fl] = 'id,format'
|
346
309
|
end
|
347
310
|
|
348
311
|
it 'has the expected value in the id field' do
|
349
|
-
expect(response.
|
312
|
+
expect(response.first.id).to eq doc_id
|
350
313
|
end
|
351
314
|
|
352
315
|
it 'returns all the requested fields' do
|
353
|
-
expect(response.
|
316
|
+
expect(response.first['format']).to eq ['Book']
|
354
317
|
end
|
355
318
|
end
|
356
319
|
|
@@ -382,7 +345,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
382
345
|
end
|
383
346
|
|
384
347
|
context "for title search" do
|
385
|
-
let(:user_params) { { q: 'yehudiyam',
|
348
|
+
let(:user_params) { { q: 'yehudiyam', 'spellcheck.dictionary': "title" } }
|
386
349
|
|
387
350
|
it 'has spelling suggestions' do
|
388
351
|
(solr_response,) = service.search_results
|
@@ -391,7 +354,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
391
354
|
end
|
392
355
|
|
393
356
|
context "for author search" do
|
394
|
-
let(:user_params) { { q: 'shirma',
|
357
|
+
let(:user_params) { { q: 'shirma', 'spellcheck.dictionary': "author" } }
|
395
358
|
|
396
359
|
it 'has spelling suggestions' do
|
397
360
|
(solr_response,) = service.search_results
|
@@ -400,7 +363,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
400
363
|
end
|
401
364
|
|
402
365
|
context "for subject search" do
|
403
|
-
let(:user_params) { { q: 'wome',
|
366
|
+
let(:user_params) { { q: 'wome', 'spellcheck.dictionary': "subject" } }
|
404
367
|
|
405
368
|
it 'has spelling suggestions' do
|
406
369
|
(solr_response,) = service.search_results
|
@@ -433,26 +396,26 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
433
396
|
let(:user_params) { { q: '', per_page: 100 } }
|
434
397
|
|
435
398
|
before do
|
436
|
-
@full_response
|
399
|
+
@full_response = service.search_results
|
437
400
|
end
|
438
401
|
|
439
402
|
it "returns the previous and next documents for a search" do
|
440
403
|
_response, docs = service.previous_and_next_documents_for_search(4, q: '')
|
441
404
|
|
442
|
-
expect(docs.first.id).to eq @
|
443
|
-
expect(docs.last.id).to eq @
|
405
|
+
expect(docs.first.id).to eq @full_response.documents[3].id
|
406
|
+
expect(docs.last.id).to eq @full_response.documents[5].id
|
444
407
|
end
|
445
408
|
|
446
409
|
it "returns only the next document if the counter is 0" do
|
447
410
|
_response, docs = service.previous_and_next_documents_for_search(0, q: '')
|
448
411
|
|
449
412
|
expect(docs.first).to be_nil
|
450
|
-
expect(docs.last.id).to eq @
|
413
|
+
expect(docs.last.id).to eq @full_response.documents[1].id
|
451
414
|
end
|
452
415
|
|
453
416
|
it "returns only the previous document if the counter is the total number of documents" do
|
454
417
|
_response, docs = service.previous_and_next_documents_for_search(@full_response.total - 1, q: '')
|
455
|
-
expect(docs.first.id).to eq @
|
418
|
+
expect(docs.first.id).to eq @full_response.documents.slice(-2).id
|
456
419
|
expect(docs.last).to be_nil
|
457
420
|
end
|
458
421
|
|
@@ -464,7 +427,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
464
427
|
|
465
428
|
it 'returns only the unique key by default' do
|
466
429
|
_response, docs = service.previous_and_next_documents_for_search(0, q: '')
|
467
|
-
expect(docs.last.to_h).to eq 'id' => @
|
430
|
+
expect(docs.last.to_h).to eq 'id' => @full_response.documents[1].id
|
468
431
|
end
|
469
432
|
|
470
433
|
it 'allows the query parameters to be customized using configuration' do
|
@@ -472,7 +435,7 @@ RSpec.describe Blacklight::SearchService, api: true do
|
|
472
435
|
|
473
436
|
_response, docs = service.previous_and_next_documents_for_search(0, q: '')
|
474
437
|
|
475
|
-
expect(docs.last.to_h).to eq @
|
438
|
+
expect(docs.last.to_h).to eq @full_response.documents[1].to_h.slice('id', 'format')
|
476
439
|
end
|
477
440
|
end
|
478
441
|
|
data/spec/spec_helper.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
# This file is copied to spec/ when you run 'rails generate rspec:install'
|
3
4
|
# Has been customized by Blacklight to work when application is in one place,
|
4
5
|
# and actual spec/ stuff is in another (the blacklight gem checkout).
|
@@ -16,6 +17,7 @@ EngineCart.load_application!
|
|
16
17
|
require 'rspec/rails'
|
17
18
|
require 'rspec/collection_matchers'
|
18
19
|
require 'capybara/rails'
|
20
|
+
require 'webdrivers'
|
19
21
|
require 'selenium-webdriver'
|
20
22
|
require 'equivalent-xml'
|
21
23
|
require 'axe-rspec'
|
@@ -27,13 +29,13 @@ Capybara.javascript_driver = :headless_chrome
|
|
27
29
|
|
28
30
|
Capybara.register_driver :headless_chrome do |app|
|
29
31
|
Capybara::Selenium::Driver.load_selenium
|
30
|
-
|
32
|
+
capabilities = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
|
31
33
|
opts.args << '--headless'
|
32
34
|
opts.args << '--disable-gpu'
|
33
35
|
opts.args << '--no-sandbox'
|
34
36
|
opts.args << '--window-size=1280,1696'
|
35
37
|
end
|
36
|
-
Capybara::Selenium::Driver.new(app, browser: :chrome,
|
38
|
+
Capybara::Selenium::Driver.new(app, browser: :chrome, capabilities: capabilities)
|
37
39
|
end
|
38
40
|
|
39
41
|
# Requires supporting ruby files with custom matchers and macros, etc,
|
@@ -46,7 +48,7 @@ RSpec.configure do |config|
|
|
46
48
|
config.disable_monkey_patching!
|
47
49
|
|
48
50
|
# When we're testing the API, only run the api tests
|
49
|
-
config.filter_run api: true if ENV['BLACKLIGHT_API_TEST']
|
51
|
+
config.filter_run api: true if ENV['BLACKLIGHT_API_TEST'].present?
|
50
52
|
|
51
53
|
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
|
52
54
|
config.fixture_path = Rails.root.join("spec/fixtures")
|
@@ -66,7 +68,7 @@ RSpec.configure do |config|
|
|
66
68
|
config.infer_spec_type_from_file_location!
|
67
69
|
config.include PresenterTestHelpers, type: :presenter
|
68
70
|
config.include ViewComponent::TestHelpers, type: :component
|
69
|
-
config.include
|
71
|
+
config.include ViewComponentCapybaraTestHelpers, type: :component
|
70
72
|
|
71
73
|
config.include(ControllerLevelHelpers, type: :helper)
|
72
74
|
config.before(:each, type: :helper) { initialize_controller_helpers(helper) }
|
@@ -0,0 +1,39 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# spec/support/features/search_helpers.rb
|
4
|
+
module Features
|
5
|
+
module SearchHelpers
|
6
|
+
def search_for q
|
7
|
+
visit root_path
|
8
|
+
fill_in "q", with: q
|
9
|
+
click_button 'search'
|
10
|
+
end
|
11
|
+
|
12
|
+
def position_in_result_page(page, id)
|
13
|
+
i = -1
|
14
|
+
page.all(".index_title a").each_with_index do |link, idx|
|
15
|
+
i = (idx + 1) if link['href'] =~ Regexp.new("#{Regexp.escape(id)}$")
|
16
|
+
end
|
17
|
+
i.to_i
|
18
|
+
end
|
19
|
+
|
20
|
+
def number_of_results_for_query(query)
|
21
|
+
visit root_path
|
22
|
+
fill_in "q", with: query
|
23
|
+
click_button "search"
|
24
|
+
get_number_of_results_from_page(page)
|
25
|
+
end
|
26
|
+
|
27
|
+
def number_of_results_from_page(page)
|
28
|
+
tmp_value = Capybara.ignore_hidden_elements
|
29
|
+
Capybara.ignore_hidden_elements = false
|
30
|
+
val = begin
|
31
|
+
page.find("meta[name=totalResults]")['content'].to_i
|
32
|
+
rescue StandardError
|
33
|
+
0
|
34
|
+
end
|
35
|
+
Capybara.ignore_hidden_elements = tmp_value
|
36
|
+
val
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
data/spec/support/features.rb
CHANGED
@@ -1,8 +1,11 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
# spec/support/features.rb
|
3
4
|
|
5
|
+
require File.expand_path('features/search_helpers.rb', __dir__)
|
4
6
|
require File.expand_path('features/session_helpers.rb', __dir__)
|
5
7
|
|
6
8
|
RSpec.configure do |config|
|
9
|
+
config.include Features::SearchHelpers, type: :feature
|
7
10
|
config.include Features::SessionHelpers, type: :feature
|
8
11
|
end
|
@@ -0,0 +1,8 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module ViewComponentCapybaraTestHelpers
|
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
|
+
end
|