blacklight-spotlight 0.4.1 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +22 -8
- data/Rakefile +40 -39
- data/app/assets/javascripts/spotlight/blacklight_configuration.js +16 -0
- data/app/assets/javascripts/spotlight/blocks/resources_block.js +3 -1
- data/app/assets/stylesheets/spotlight/_blacklight_configuration.scss +2 -2
- data/app/assets/stylesheets/spotlight/_blacklight_overrides.scss +24 -0
- data/app/assets/stylesheets/spotlight/_header.scss +150 -47
- data/app/assets/stylesheets/spotlight/_pages.scss +62 -11
- data/app/assets/stylesheets/spotlight/_report_a_problem.scss +1 -0
- data/app/assets/stylesheets/spotlight/_spotlight.scss +1 -0
- data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb +28 -21
- data/app/controllers/spotlight/about_pages_controller.rb +25 -14
- data/app/controllers/spotlight/appearances_controller.rb +34 -30
- data/app/controllers/spotlight/application_controller.rb +2 -1
- data/app/controllers/spotlight/attachments_controller.rb +9 -7
- data/app/controllers/spotlight/browse_controller.rb +13 -9
- data/app/controllers/spotlight/catalog_controller.rb +179 -161
- data/app/controllers/spotlight/concerns/application_controller.rb +22 -20
- data/app/controllers/spotlight/concerns/catalog_search_context.rb +44 -0
- data/app/controllers/spotlight/confirmations_controller.rb +5 -2
- data/app/controllers/spotlight/contact_forms_controller.rb +13 -7
- data/app/controllers/spotlight/contacts_controller.rb +13 -4
- data/app/controllers/spotlight/custom_fields_controller.rb +48 -40
- data/app/controllers/spotlight/dashboards_controller.rb +17 -8
- data/app/controllers/spotlight/default_controller.rb +3 -1
- data/app/controllers/spotlight/exhibits_controller.rb +69 -62
- data/app/controllers/spotlight/feature_pages_controller.rb +21 -11
- data/app/controllers/spotlight/home_pages_controller.rb +6 -5
- data/app/controllers/spotlight/lock_controller.rb +3 -1
- data/app/controllers/spotlight/metadata_configurations_controller.rb +49 -0
- data/app/controllers/spotlight/pages_controller.rb +28 -18
- data/app/controllers/spotlight/resources/upload_controller.rb +53 -46
- data/app/controllers/spotlight/resources_controller.rb +9 -5
- data/app/controllers/spotlight/roles_controller.rb +26 -22
- data/app/controllers/spotlight/search_configurations_controller.rb +66 -0
- data/app/controllers/spotlight/searches_controller.rb +91 -82
- data/app/controllers/spotlight/solr_controller.rb +20 -13
- data/app/controllers/spotlight/tags_controller.rb +5 -3
- data/app/controllers/spotlight/versions_controller.rb +15 -12
- data/app/controllers/spotlight/view_configurations_controller.rb +17 -0
- data/app/helpers/spotlight/application_helper.rb +44 -32
- data/app/helpers/spotlight/browse_helper.rb +13 -1
- data/app/helpers/spotlight/crud_link_helpers.rb +22 -14
- data/app/helpers/spotlight/jcrop_helper.rb +4 -2
- data/app/helpers/spotlight/main_app_helpers.rb +45 -41
- data/app/helpers/spotlight/navbar_helper.rb +6 -0
- data/app/helpers/spotlight/pages_helper.rb +23 -15
- data/app/helpers/spotlight/roles_helper.rb +10 -4
- data/app/helpers/spotlight/search_configurations_helper.rb +22 -0
- data/app/helpers/spotlight/title_helper.rb +16 -13
- data/app/jobs/spotlight/add_uploads_from_csv.rb +13 -9
- data/app/jobs/spotlight/reindex_job.rb +9 -9
- data/app/jobs/spotlight/rename_sidecar_field_job.rb +3 -0
- data/app/mailers/spotlight/confirmation_mailer.rb +2 -0
- data/app/mailers/spotlight/indexing_complete_mailer.rb +4 -2
- data/app/models/ability.rb +3 -0
- data/app/models/concerns/spotlight/ar_light.rb +49 -25
- data/app/models/concerns/spotlight/blacklight_configuration_defaults.rb +25 -10
- data/app/models/concerns/spotlight/exhibit_analytics.rb +28 -0
- data/app/models/concerns/spotlight/image_derivatives.rb +25 -26
- data/app/models/concerns/spotlight/resources/open_graph.rb +23 -19
- data/app/models/concerns/spotlight/resources/web.rb +25 -24
- data/app/models/concerns/spotlight/solr_document.rb +40 -34
- data/app/models/concerns/spotlight/solr_document/active_model_concern.rb +29 -40
- data/app/models/concerns/spotlight/solr_document/atomic_updates.rb +22 -18
- data/app/models/concerns/spotlight/solr_document/finder.rb +23 -18
- data/app/models/concerns/spotlight/solr_document/spotlight_images.rb +43 -39
- data/app/models/concerns/spotlight/solr_document/uploaded_resource.rb +41 -29
- data/app/models/concerns/spotlight/user.rb +25 -19
- data/app/models/sir_trevor_rails/blocks/browse_block.rb +36 -30
- data/app/models/sir_trevor_rails/blocks/featured_pages_block.rb +24 -18
- data/app/models/sir_trevor_rails/blocks/oembed_block.rb +8 -4
- data/app/models/sir_trevor_rails/blocks/search_results_block.rb +29 -23
- data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb +43 -42
- data/app/models/sir_trevor_rails/blocks/solr_documents_carousel_block.rb +16 -12
- data/app/models/sir_trevor_rails/blocks/solr_documents_embed_block.rb +7 -3
- data/app/models/sir_trevor_rails/blocks/solr_documents_features_block.rb +7 -3
- data/app/models/sir_trevor_rails/blocks/solr_documents_grid_block.rb +7 -3
- data/app/models/sir_trevor_rails/blocks/textable.rb +18 -18
- data/app/models/spotlight/ability.rb +32 -33
- data/app/models/spotlight/about_page.rb +3 -1
- data/app/models/spotlight/analytics/ga.rb +46 -27
- data/app/models/spotlight/attachment.rb +3 -1
- data/app/models/spotlight/blacklight_configuration.rb +146 -68
- data/app/models/spotlight/contact.rb +35 -30
- data/app/models/spotlight/contact_email.rb +6 -3
- data/app/models/spotlight/contact_form.rb +4 -3
- data/app/models/spotlight/custom_field.rb +41 -33
- data/app/models/spotlight/exhibit.rb +104 -130
- data/app/models/spotlight/feature_page.rb +9 -7
- data/app/models/spotlight/featured_image.rb +10 -10
- data/app/models/spotlight/field_metadata.rb +46 -0
- data/app/models/spotlight/home_page.rb +8 -5
- data/app/models/spotlight/lock.rb +4 -3
- data/app/models/spotlight/main_navigation.rb +9 -3
- data/app/models/spotlight/masthead.rb +17 -16
- data/app/models/spotlight/page.rb +16 -16
- data/app/models/spotlight/resource.rb +69 -22
- data/app/models/spotlight/resources/csv_upload.rb +8 -4
- data/app/models/spotlight/resources/upload.rb +68 -57
- data/app/models/spotlight/role.rb +30 -34
- data/app/models/spotlight/search.rb +74 -63
- data/app/models/spotlight/solr_document_sidecar.rb +17 -15
- data/app/serializers/spotlight/exhibit_export_serializer.rb +65 -29
- data/app/serializers/spotlight/page_representer.rb +10 -6
- data/app/uploaders/spotlight/attachment_uploader.rb +4 -6
- data/app/uploaders/spotlight/avatar_uploader.rb +4 -3
- data/app/uploaders/spotlight/featured_image_uploader.rb +15 -14
- data/app/uploaders/spotlight/item_uploader.rb +3 -1
- data/app/uploaders/spotlight/masthead_uploader.rb +4 -2
- data/app/views/catalog/_search_form.html.erb +24 -0
- data/app/views/shared/_browse_navbar.html.erb +1 -1
- data/app/views/shared/_exhibit_navbar.html.erb +1 -1
- data/app/views/spotlight/appearances/edit.html.erb +13 -45
- data/app/views/spotlight/catalog/_edit_default.html.erb +1 -1
- data/app/views/spotlight/custom_fields/_form.html.erb +1 -1
- data/app/views/spotlight/exhibits/edit.html.erb +4 -4
- data/app/views/spotlight/home_pages/_empty.html.erb +1 -3
- data/app/views/spotlight/home_pages/_page_options.html.erb +1 -1
- data/app/views/spotlight/{blacklight_configurations → metadata_configurations}/_metadata_field.html.erb +0 -0
- data/app/views/spotlight/{blacklight_configurations/edit_metadata_fields.html.erb → metadata_configurations/edit.html.erb} +1 -1
- data/app/views/spotlight/pages/show.html.erb +2 -2
- data/app/views/spotlight/search_configurations/_default_per_page.html.erb +5 -0
- data/app/views/spotlight/search_configurations/_document_index_view_types.html.erb +7 -0
- data/app/views/spotlight/search_configurations/_facets.html.erb +38 -0
- data/app/views/spotlight/search_configurations/_search_fields.html.erb +58 -0
- data/app/views/spotlight/search_configurations/_sort.html.erb +53 -0
- data/app/views/spotlight/search_configurations/edit.html.erb +46 -0
- data/app/views/spotlight/searches/_search.html.erb +1 -1
- data/app/views/spotlight/shared/_admin_sidebar.html.erb +0 -2
- data/app/views/spotlight/shared/_curation_sidebar.html.erb +2 -3
- data/app/views/spotlight/shared/_report_a_problem.html.erb +2 -2
- data/app/views/spotlight/sir_trevor/blocks/_oembed_block.html.erb +5 -1
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb +7 -5
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb +2 -2
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb +7 -5
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb +2 -2
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb +14 -9
- data/config/locales/spotlight.en.yml +94 -49
- data/config/routes.rb +11 -20
- data/db/migrate/20150410180014_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +15 -0
- data/db/migrate/20150410180015_add_missing_taggable_index.acts_as_taggable_on_engine.rb +10 -0
- data/db/migrate/20150410180016_change_collation_for_tag_names.acts_as_taggable_on_engine.rb +10 -0
- data/db/migrate/20150713160101_change_spotlight_searches_to_published.rb +5 -0
- data/db/migrate/20151016092343_remove_searchable_from_exhibit.rb +20 -0
- data/lib/blacklight/spotlight.rb +1 -1
- data/lib/generators/spotlight/install_generator.rb +27 -25
- data/lib/generators/spotlight/templates/catalog_controller.rb +7 -5
- data/lib/generators/spotlight/templates/jetty.rake +8 -2
- data/lib/generators/spotlight/templates/spotlight_helper.rb +3 -1
- data/lib/spotlight.rb +4 -2
- data/lib/spotlight/base.rb +21 -14
- data/lib/spotlight/catalog.rb +10 -9
- data/lib/spotlight/catalog/access_controls_enforcement.rb +30 -15
- data/lib/spotlight/config.rb +4 -2
- data/lib/spotlight/controller.rb +12 -11
- data/lib/spotlight/engine.rb +30 -22
- data/lib/spotlight/rails/routes.rb +7 -4
- data/lib/spotlight/version.rb +2 -1
- data/lib/tasks/spotlight_tasks.rake +56 -50
- data/spec/controllers/application_controller_spec.rb +13 -13
- data/spec/controllers/spotlight/about_pages_controller_spec.rb +63 -59
- data/spec/controllers/spotlight/appearances_controller_spec.rb +29 -24
- data/spec/controllers/spotlight/application_controller_spec.rb +3 -3
- data/spec/controllers/spotlight/attachments_controller_spec.rb +10 -10
- data/spec/controllers/spotlight/browse_controller_spec.rb +23 -25
- data/spec/controllers/spotlight/catalog_controller_spec.rb +82 -87
- data/spec/controllers/spotlight/confirmations_controller_spec.rb +13 -11
- data/spec/controllers/spotlight/contact_forms_controller_spec.rb +17 -12
- data/spec/controllers/spotlight/contacts_controller_spec.rb +36 -36
- data/spec/controllers/spotlight/custom_fields_controller_spec.rb +26 -26
- data/spec/controllers/spotlight/dashboards_controller_spec.rb +14 -14
- data/spec/controllers/spotlight/exhibits_controller_spec.rb +59 -54
- data/spec/controllers/spotlight/feature_pages_controller_spec.rb +59 -59
- data/spec/controllers/spotlight/home_pages_controller_spec.rb +28 -29
- data/spec/controllers/spotlight/metadata_configurations_controller_spec.rb +84 -0
- data/spec/controllers/spotlight/resources/upload_controller_spec.rb +42 -33
- data/spec/controllers/spotlight/resources_controller_spec.rb +25 -29
- data/spec/controllers/spotlight/roles_controller_spec.rb +37 -19
- data/spec/controllers/spotlight/search_configurations_controller_spec.rb +125 -0
- data/spec/controllers/spotlight/searches_controller_spec.rb +84 -63
- data/spec/controllers/spotlight/solr_controller_spec.rb +13 -14
- data/spec/controllers/spotlight/tags_controller_spec.rb +16 -16
- data/spec/controllers/spotlight/versions_controller_spec.rb +15 -18
- data/spec/controllers/spotlight/view_configurations_controller_spec.rb +31 -0
- data/spec/factories/contacts.rb +1 -3
- data/spec/factories/custom_fields.rb +2 -4
- data/spec/factories/exhibits.rb +4 -2
- data/spec/factories/pages.rb +8 -11
- data/spec/factories/resources.rb +4 -4
- data/spec/factories/searches.rb +10 -13
- data/spec/factories/tags.rb +0 -3
- data/spec/factories/users.rb +2 -4
- data/spec/features/about_page_spec.rb +19 -19
- data/spec/features/add_contacts_spec.rb +34 -34
- data/spec/features/add_custom_field_metadata_spec.rb +24 -26
- data/spec/features/add_item_bookmarklet_spec.rb +12 -12
- data/spec/features/browse_category_admin_spec.rb +39 -39
- data/spec/features/catalog_spec.rb +9 -10
- data/spec/features/confirm_email_spec.rb +10 -10
- data/spec/features/create_exhibit_spec.rb +18 -15
- data/spec/features/create_page_spec.rb +8 -8
- data/spec/features/curator_items.rb +3 -3
- data/spec/features/dashboard_spec.rb +15 -16
- data/spec/features/edit_contact_spec.rb +8 -10
- data/spec/features/edit_search_fields_spec.rb +79 -0
- data/spec/features/exhibits/add_tags_spec.rb +15 -16
- data/spec/features/exhibits/administration_spec.rb +25 -25
- data/spec/features/exhibits/custom_metadata_fields_spec.rb +41 -43
- data/spec/features/exhibits/edit_metadata_fields_spec.rb +19 -19
- data/spec/features/feature_page_spec.rb +49 -48
- data/spec/features/home_page_spec.rb +38 -38
- data/spec/features/import_exhibit_spec.rb +23 -20
- data/spec/features/item_admin_spec.rb +28 -29
- data/spec/features/javascript/about_page_admin_spec.rb +9 -9
- data/spec/features/javascript/block_controls_spec.rb +16 -18
- data/spec/features/javascript/blocks/featured_browse_categories_block_spec.rb +11 -12
- data/spec/features/javascript/blocks/featured_pages_block_spec.rb +12 -13
- data/spec/features/javascript/blocks/search_result_block_spec.rb +17 -17
- data/spec/features/javascript/blocks/solr_documents_block_spec.rb +67 -65
- data/spec/features/javascript/edit_in_place_spec.rb +30 -56
- data/spec/features/javascript/feature_page_admin_spec.rb +73 -59
- data/spec/features/javascript/home_page_edit_spec.rb +6 -6
- data/spec/features/javascript/metadata_admin_spec.rb +15 -15
- data/spec/features/javascript/multi_image_select_spec.rb +17 -18
- data/spec/features/javascript/preview_block_spec.rb +11 -12
- data/spec/features/javascript/rule_block_spec.rb +7 -7
- data/spec/features/javascript/search_config_admin_spec.rb +144 -0
- data/spec/features/javascript/search_context_spec.rb +41 -42
- data/spec/features/main_navigation_spec.rb +22 -22
- data/spec/features/metadata_admin_spec.rb +8 -8
- data/spec/features/multiple_exhibits_spec.rb +15 -17
- data/spec/features/report_a_problem_spec.rb +23 -17
- data/spec/features/site_masthead_spec.rb +46 -46
- data/spec/features/slideshow_spec.rb +8 -9
- data/spec/features/tags_admin_spec.rb +11 -11
- data/spec/features/upload_non_repository_item_spec.rb +32 -32
- data/spec/features/user_admin_spec.rb +7 -7
- data/spec/helpers/spotlight/application_helper_spec.rb +63 -56
- data/spec/helpers/spotlight/browse_helper_spec.rb +6 -6
- data/spec/helpers/spotlight/crud_link_helpers_spec.rb +58 -52
- data/spec/helpers/spotlight/main_app_helpers_spec.rb +44 -24
- data/spec/helpers/spotlight/navbar_helper_spec.rb +4 -4
- data/spec/helpers/spotlight/pages_helper_spec.rb +56 -37
- data/spec/helpers/spotlight/roles_helper_spec.rb +3 -3
- data/spec/helpers/spotlight/search_configurations_helper_spec.rb +24 -0
- data/spec/helpers/spotlight/title_helper_spec.rb +33 -35
- data/spec/jobs/spotlight/reindex_job_spec.rb +6 -6
- data/spec/jobs/spotlight/rename_sidecar_field_job_spec.rb +7 -7
- data/spec/lib/spotlight/catalog/access_controls_enforcement_spec.rb +41 -26
- data/spec/lib/spotlight/controller_spec.rb +10 -10
- data/spec/lib/spotlight/routes_spec.rb +4 -4
- data/spec/mailers/spotlight/indexing_complete_mailer_spec.rb +13 -13
- data/spec/models/sir_trevor_rails/blocks/solr_documents_block_spec.rb +8 -8
- data/spec/models/{spotlight/sir_trevor_blocks → sir_trevor_rails/blocks}/textable_spec.rb +7 -8
- data/spec/models/solr_document_spec.rb +49 -50
- data/spec/models/spotlight/ability_spec.rb +17 -20
- data/spec/models/spotlight/about_page_spec.rb +6 -6
- data/spec/models/spotlight/analytics/ga_spec.rb +2 -2
- data/spec/models/spotlight/blacklight_configuration_spec.rb +196 -133
- data/spec/models/spotlight/contact_email_spec.rb +28 -24
- data/spec/models/spotlight/contact_spec.rb +6 -7
- data/spec/models/spotlight/custom_field_spec.rb +51 -52
- data/spec/models/spotlight/exhibit_spec.rb +102 -60
- data/spec/models/spotlight/feature_page_spec.rb +32 -32
- data/spec/models/spotlight/featured_image_spec.rb +5 -5
- data/spec/models/spotlight/field_metadata_spec.rb +78 -0
- data/spec/models/spotlight/home_page_spec.rb +11 -20
- data/spec/models/spotlight/{spotlight_image_derivatives_spec.rb → image_derivatives_spec.rb} +2 -2
- data/spec/models/spotlight/main_navigation_spec.rb +7 -9
- data/spec/models/spotlight/masthead_spec.rb +6 -6
- data/spec/models/spotlight/page_spec.rb +26 -29
- data/spec/models/spotlight/resource_spec.rb +56 -26
- data/spec/models/spotlight/resources/open_graph_spec.rb +16 -18
- data/spec/models/spotlight/resources/upload_spec.rb +32 -35
- data/spec/models/spotlight/resources/web_spec.rb +9 -11
- data/spec/models/spotlight/role_spec.rb +20 -20
- data/spec/models/spotlight/search_spec.rb +32 -15
- data/spec/models/spotlight/solr_document/atomic_updates_spec.rb +34 -0
- data/spec/models/spotlight/{solr_document_images_spec.rb → solr_document/spotlight_images_spec.rb} +18 -10
- data/spec/models/spotlight/solr_document/uploaded_resource_spec.rb +52 -0
- data/spec/models/spotlight/solr_document_sidecar_spec.rb +3 -4
- data/spec/routing/spotlight/exhibit_catalog_spec.rb +5 -5
- data/spec/routing/spotlight/pages_routing_spec.rb +24 -25
- data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb +88 -68
- data/spec/spec_helper.rb +13 -22
- data/spec/support/features/test_features_helpers.rb +50 -46
- data/spec/support/views/test_view_helpers.rb +1 -1
- data/spec/test_app_templates/Gemfile.extra +0 -1
- data/spec/test_app_templates/carrierwave.rb +2 -2
- data/spec/test_app_templates/catalog_controller.rb +42 -42
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +20 -11
- data/spec/test_app_templates/spotlight_test.rake +3 -3
- data/spec/uploaders/spotlight/item_uploader_spec.rb +68 -0
- data/spec/views/_user_util_links.html.erb_spec.rb +14 -14
- data/spec/views/shared/_analytics.html.erb_spec.rb +4 -6
- data/spec/views/shared/_exhibit_masthead.html.erb_spec.rb +19 -20
- data/spec/views/shared/_exhibit_navbar.html.erb_spec.rb +129 -131
- data/spec/views/shared/_footer.html.erb_spec.rb +6 -7
- data/spec/views/shared/_header_navbar.html.erb_spec.rb +5 -5
- data/spec/views/spotlight/about_pages/_empty.html.erb_spec.rb +4 -4
- data/spec/views/spotlight/about_pages/_sidebar.html.erb_spec.rb +9 -11
- data/spec/views/spotlight/about_pages/index.html.erb_spec.rb +31 -28
- data/spec/views/spotlight/browse/_search.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/browse/_sort_and_per_page.html.erb_spec.rb +10 -12
- data/spec/views/spotlight/browse/index.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/browse/show.html.erb_spec.rb +19 -20
- data/spec/views/spotlight/catalog/_edit_default.html.erb_spec.rb +7 -7
- data/spec/views/spotlight/catalog/admin.html.erb_spec.rb +7 -7
- data/spec/views/spotlight/catalog/edit.html.erb_spec.rb +3 -6
- data/spec/views/spotlight/catalog/new.html.erb_spec.rb +8 -10
- data/spec/views/spotlight/contacts/edit.html.erb_spec.rb +8 -8
- data/spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb +22 -22
- data/spec/views/spotlight/exhibits/edit.html.erb_spec.rb +7 -8
- data/spec/views/spotlight/feature_pages/_empty.html.erb_spec.rb +5 -5
- data/spec/views/spotlight/feature_pages/_sidebar.html.erb_spec.rb +24 -26
- data/spec/views/spotlight/home_pages/_empty.html.erb_spec.rb +13 -9
- data/spec/views/spotlight/home_pages/_sidebar.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb +26 -0
- data/spec/views/spotlight/metadata_configurations/edit.html.erb_spec.rb +22 -0
- data/spec/views/spotlight/pages/edit.html.erb_spec.rb +16 -16
- data/spec/views/spotlight/pages/index.html.erb_spec.rb +19 -17
- data/spec/views/spotlight/pages/new.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/pages/show.html.erb_spec.rb +27 -28
- data/spec/views/spotlight/roles/index.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/search_configurations/_search_fields.html.erb_spec.rb +54 -0
- data/spec/views/spotlight/search_configurations/_sort.html.erb_spec.rb +28 -0
- data/spec/views/spotlight/searches/_search.html.erb_spec.rb +20 -10
- data/spec/views/spotlight/searches/edit.html.erb_spec.rb +12 -11
- data/spec/views/spotlight/searches/index.html.erb_spec.rb +12 -7
- data/spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb +7 -8
- data/spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb +4 -4
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb +38 -0
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb +7 -8
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb +18 -13
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb +14 -12
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb +11 -12
- data/spec/views/spotlight/tags/index.html.erb_spec.rb +9 -9
- metadata +167 -83
- data/app/controllers/spotlight/blacklight_configurations_controller.rb +0 -101
- data/app/controllers/spotlight/resources/csv_controller.rb +0 -23
- data/app/forms/spotlight/appearance.rb +0 -86
- data/app/helpers/spotlight/attachments_helper.rb +0 -4
- data/app/helpers/spotlight/blacklight_configurations_helper.rb +0 -15
- data/app/jobs/spotlight/set_default_thumbnail_job.rb +0 -16
- data/app/models/spotlight/resources/csv.rb +0 -80
- data/app/uploaders/spotlight/csv_uploader.rb +0 -15
- data/app/views/spotlight/blacklight_configurations/edit_facet_fields.html.erb +0 -47
- data/app/views/spotlight/blacklight_configurations/edit_sort_fields.html.erb +0 -65
- data/app/views/spotlight/resources/csv/_form.html.erb +0 -17
- data/app/views/spotlight/resources/csv/new.html.erb +0 -3
- data/spec/controllers/spotlight/blacklight_configurations_controller_spec.rb +0 -167
- data/spec/features/edit_sort_fields_spec.rb +0 -42
- data/spec/features/exhibits/edit_facet_fields_spec.rb +0 -37
- data/spec/features/javascript/facet_admin_spec.rb +0 -36
- data/spec/features/search_facets_admin_spec.rb +0 -19
- data/spec/features/update_appearance_spec.rb +0 -58
- data/spec/helpers/spotlight/blacklight_configurations_helper_spec.rb +0 -12
- data/spec/models/spotlight/appearance_spec.rb +0 -33
- data/spec/models/spotlight/resources/csv_spec.rb +0 -101
- data/spec/models/spotlight/solr_document_atomic_updates_spec.rb +0 -29
- data/spec/models/spotlight/solr_document_uploaded_resource_spec.rb +0 -45
- data/spec/uploaders/item_uploader_spec.rb +0 -62
- data/spec/views/spotlight/blacklight_configuration/_metadata_field.html.erb_spec.rb +0 -27
- data/spec/views/spotlight/blacklight_configuration/edit_metadata_fields.html.erb_spec.rb +0 -23
- data/spec/views/spotlight/blacklight_configuration/edit_sort_fields.html.erb_spec.rb +0 -19
@@ -1,5 +1,5 @@
|
|
1
1
|
require 'spec_helper'
|
2
|
-
describe Spotlight::FeaturePagesController, :
|
2
|
+
describe Spotlight::FeaturePagesController, type: :controller do
|
3
3
|
routes { Spotlight::Engine.routes }
|
4
4
|
|
5
5
|
it { is_expected.to be_a Spotlight::Catalog::AccessControlsEnforcement }
|
@@ -7,38 +7,38 @@ describe Spotlight::FeaturePagesController, :type => :controller do
|
|
7
7
|
# This should return the minimal set of attributes required to create a valid
|
8
8
|
# Page. As you add validations to Page, be sure to
|
9
9
|
# adjust the attributes here as well.
|
10
|
-
let(:valid_attributes) { {
|
11
|
-
describe
|
10
|
+
let(:valid_attributes) { { 'title' => 'MyString' } }
|
11
|
+
describe 'when signed in as a curator' do
|
12
12
|
let(:exhibit) { FactoryGirl.create(:exhibit) }
|
13
13
|
let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
|
14
|
-
before {sign_in user }
|
14
|
+
before { sign_in user }
|
15
15
|
|
16
|
-
describe
|
16
|
+
describe 'GET index' do
|
17
17
|
let!(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
|
18
|
-
it
|
19
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
20
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
21
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
18
|
+
it 'assigns all feature pages as @pages' do
|
19
|
+
expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
|
20
|
+
expect(controller).to receive(:add_breadcrumb).with('Curation', exhibit_dashboard_path(exhibit))
|
21
|
+
expect(controller).to receive(:add_breadcrumb).with('Feature pages', exhibit_feature_pages_path(exhibit))
|
22
22
|
get :index, exhibit_id: exhibit
|
23
23
|
expect(assigns(:pages)).to include page
|
24
24
|
expect(assigns(:exhibit)).to eq exhibit
|
25
25
|
end
|
26
26
|
end
|
27
27
|
|
28
|
-
describe
|
29
|
-
describe
|
28
|
+
describe 'GET show' do
|
29
|
+
describe 'on a top level page' do
|
30
30
|
let(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
|
31
|
-
it
|
32
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
31
|
+
it 'assigns the requested page as @page' do
|
32
|
+
expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
|
33
33
|
expect(controller).to receive(:add_breadcrumb).with(page.title, [exhibit, page])
|
34
34
|
get :show, exhibit_id: page.exhibit.id, id: page
|
35
35
|
expect(assigns(:page)).to eq(page)
|
36
36
|
end
|
37
37
|
end
|
38
|
-
describe
|
38
|
+
describe 'on a sub-page' do
|
39
39
|
let(:page) { FactoryGirl.create(:feature_subpage, exhibit: exhibit) }
|
40
|
-
it
|
41
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
40
|
+
it 'assigns the requested page as @page' do
|
41
|
+
expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
|
42
42
|
expect(controller).to receive(:add_breadcrumb).with(page.parent_page.title, [exhibit, page.parent_page])
|
43
43
|
expect(controller).to receive(:add_breadcrumb).with(page.title, [exhibit, page])
|
44
44
|
get :show, exhibit_id: page.exhibit, id: page
|
@@ -47,66 +47,66 @@ describe Spotlight::FeaturePagesController, :type => :controller do
|
|
47
47
|
end
|
48
48
|
end
|
49
49
|
|
50
|
-
describe
|
51
|
-
it
|
50
|
+
describe 'GET new' do
|
51
|
+
it 'assigns a new page as @page' do
|
52
52
|
get :new, exhibit_id: exhibit
|
53
53
|
expect(assigns(:page)).to be_a_new(Spotlight::FeaturePage)
|
54
54
|
expect(assigns(:page).exhibit).to eq exhibit
|
55
55
|
end
|
56
56
|
end
|
57
57
|
|
58
|
-
describe
|
58
|
+
describe 'GET edit' do
|
59
59
|
let(:page) { FactoryGirl.create(:feature_subpage, exhibit: exhibit) }
|
60
|
-
it
|
61
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
62
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
60
|
+
it 'assigns the requested page as @page' do
|
61
|
+
expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
|
62
|
+
expect(controller).to receive(:add_breadcrumb).with('Feature pages', exhibit_feature_pages_path(exhibit))
|
63
63
|
expect(controller).to receive(:add_breadcrumb).with(page.parent_page.title, [exhibit, page.parent_page])
|
64
64
|
expect(controller).to receive(:add_breadcrumb).with(page.title, [:edit, exhibit, page])
|
65
|
-
get :edit, exhibit_id: page.exhibit.id,id: page.id
|
65
|
+
get :edit, exhibit_id: page.exhibit.id, id: page.id
|
66
66
|
expect(assigns(:page)).to eq page
|
67
67
|
end
|
68
68
|
end
|
69
69
|
|
70
|
-
describe
|
71
|
-
describe
|
72
|
-
it
|
73
|
-
expect
|
74
|
-
post :create, feature_page: {title:
|
75
|
-
|
70
|
+
describe 'POST create' do
|
71
|
+
describe 'with valid params' do
|
72
|
+
it 'creates a new Page' do
|
73
|
+
expect do
|
74
|
+
post :create, feature_page: { title: 'MyString' }, exhibit_id: exhibit
|
75
|
+
end.to change(Spotlight::FeaturePage, :count).by(1)
|
76
76
|
end
|
77
77
|
|
78
|
-
it
|
79
|
-
post :create, feature_page: {title:
|
78
|
+
it 'assigns a newly created page as @page' do
|
79
|
+
post :create, feature_page: { title: 'MyString' }, exhibit_id: exhibit
|
80
80
|
expect(assigns(:page)).to be_a(Spotlight::FeaturePage)
|
81
81
|
expect(assigns(:page)).to be_persisted
|
82
82
|
end
|
83
|
-
it
|
84
|
-
post :create, feature_page: {title:
|
83
|
+
it 'redirects to the feature page index' do
|
84
|
+
post :create, feature_page: { title: 'MyString' }, exhibit_id: exhibit
|
85
85
|
expect(response).to redirect_to(exhibit_feature_pages_path(Spotlight::FeaturePage.last.exhibit))
|
86
86
|
end
|
87
87
|
end
|
88
88
|
|
89
|
-
describe
|
90
|
-
it
|
89
|
+
describe 'with invalid params' do
|
90
|
+
it 'assigns a newly created but unsaved page as @page' do
|
91
91
|
# Trigger the behavior that occurs when invalid params are submitted
|
92
92
|
allow_any_instance_of(Spotlight::FeaturePage).to receive(:save).and_return(false)
|
93
|
-
post :create, feature_page: {
|
93
|
+
post :create, feature_page: { 'title' => 'invalid value' }, exhibit_id: exhibit
|
94
94
|
expect(assigns(:page)).to be_a_new(Spotlight::FeaturePage)
|
95
95
|
end
|
96
96
|
|
97
97
|
it "re-renders the 'new' template" do
|
98
98
|
# Trigger the behavior that occurs when invalid params are submitted
|
99
99
|
allow_any_instance_of(Spotlight::FeaturePage).to receive(:save).and_return(false)
|
100
|
-
post :create, feature_page: {
|
101
|
-
expect(response).to render_template(
|
100
|
+
post :create, feature_page: { 'title' => 'invalid value' }, exhibit_id: exhibit
|
101
|
+
expect(response).to render_template('new')
|
102
102
|
end
|
103
103
|
end
|
104
104
|
end
|
105
105
|
|
106
|
-
describe
|
106
|
+
describe 'PUT update' do
|
107
107
|
let(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
|
108
|
-
describe
|
109
|
-
it
|
108
|
+
describe 'with valid params' do
|
109
|
+
it 'updates the requested page' do
|
110
110
|
# Assuming there are no other pages in the database, this
|
111
111
|
# specifies that the Page created on the previous line
|
112
112
|
# receives the :update_attributes message with whatever params are
|
@@ -115,60 +115,60 @@ describe Spotlight::FeaturePagesController, :type => :controller do
|
|
115
115
|
put :update, id: page, exhibit_id: page.exhibit.id, feature_page: valid_attributes
|
116
116
|
end
|
117
117
|
|
118
|
-
it
|
118
|
+
it 'assigns the requested page as @page' do
|
119
119
|
put :update, id: page, exhibit_id: page.exhibit.id, feature_page: valid_attributes
|
120
120
|
expect(assigns(:page)).to eq(page)
|
121
121
|
end
|
122
122
|
|
123
|
-
it
|
123
|
+
it 'redirects to the feature page' do
|
124
124
|
put :update, id: page, exhibit_id: page.exhibit.id, feature_page: valid_attributes
|
125
125
|
page.reload
|
126
126
|
expect(response).to redirect_to(exhibit_feature_page_path(page.exhibit, page))
|
127
|
-
expect(flash[:notice]).to have_link
|
127
|
+
expect(flash[:notice]).to have_link 'Undo changes'
|
128
128
|
end
|
129
129
|
end
|
130
130
|
|
131
|
-
describe
|
132
|
-
it
|
131
|
+
describe 'with invalid params' do
|
132
|
+
it 'assigns the page as @page' do
|
133
133
|
# Trigger the behavior that occurs when invalid params are submitted
|
134
134
|
allow_any_instance_of(Spotlight::FeaturePage).to receive(:save).and_return(false)
|
135
|
-
put :update, id: page, exhibit_id: page.exhibit.id, feature_page: {
|
135
|
+
put :update, id: page, exhibit_id: page.exhibit.id, feature_page: { 'title' => 'invalid value' }
|
136
136
|
expect(assigns(:page)).to eq(page)
|
137
137
|
end
|
138
138
|
|
139
139
|
it "re-renders the 'edit' template" do
|
140
140
|
# Trigger the behavior that occurs when invalid params are submitted
|
141
141
|
allow_any_instance_of(Spotlight::FeaturePage).to receive(:save).and_return(false)
|
142
|
-
put :update, id: page, exhibit_id: page.exhibit.id, feature_page: {
|
143
|
-
expect(response).to render_template(
|
142
|
+
put :update, id: page, exhibit_id: page.exhibit.id, feature_page: { 'title' => 'invalid value' }
|
143
|
+
expect(response).to render_template('edit')
|
144
144
|
end
|
145
145
|
end
|
146
146
|
end
|
147
147
|
|
148
|
-
describe
|
148
|
+
describe 'POST update_all' do
|
149
149
|
let!(:page1) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
|
150
150
|
let!(:page2) { FactoryGirl.create(:feature_page, exhibit: page1.exhibit) }
|
151
151
|
let!(:page3) { FactoryGirl.create(:feature_page, exhibit: page1.exhibit, parent_page_id: page1.id) }
|
152
|
-
before { request.env[
|
153
|
-
it
|
154
|
-
post :update_all, exhibit_id: page1.exhibit, exhibit: {feature_pages_attributes: [{id: page2.id, parent_page_id: page1.id}]}
|
152
|
+
before { request.env['HTTP_REFERER'] = 'http://example.com' }
|
153
|
+
it 'updates the parent/child relationship' do
|
154
|
+
post :update_all, exhibit_id: page1.exhibit, exhibit: { feature_pages_attributes: [{ id: page2.id, parent_page_id: page1.id }] }
|
155
155
|
expect(response).to redirect_to 'http://example.com'
|
156
|
-
expect(flash[:notice]).to eq
|
156
|
+
expect(flash[:notice]).to eq 'Feature pages were successfully updated.'
|
157
157
|
expect(page1.parent_page).to be_nil
|
158
158
|
expect(page1.child_pages).to include page2
|
159
159
|
expect(page3.parent_page).to eq page1 # should remain untouched since in wasn't present
|
160
160
|
end
|
161
161
|
end
|
162
162
|
|
163
|
-
describe
|
163
|
+
describe 'DELETE destroy' do
|
164
164
|
let!(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
|
165
|
-
it
|
166
|
-
expect
|
165
|
+
it 'destroys the requested page' do
|
166
|
+
expect do
|
167
167
|
delete :destroy, id: page, exhibit_id: page.exhibit.id
|
168
|
-
|
168
|
+
end.to change(Spotlight::FeaturePage, :count).by(-1)
|
169
169
|
end
|
170
170
|
|
171
|
-
it
|
171
|
+
it 'redirects to the pages list' do
|
172
172
|
delete :destroy, id: page, exhibit_id: page.exhibit.id
|
173
173
|
expect(response).to redirect_to(exhibit_feature_pages_path(page.exhibit))
|
174
174
|
end
|
@@ -1,88 +1,88 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spotlight::HomePagesController, :
|
3
|
+
describe Spotlight::HomePagesController, type: :controller do
|
4
4
|
routes { Spotlight::Engine.routes }
|
5
|
-
let(:valid_attributes) { {
|
5
|
+
let(:valid_attributes) { { 'title' => 'MyString' } }
|
6
6
|
let(:exhibit) { FactoryGirl.create(:exhibit) }
|
7
7
|
let(:page) { exhibit.home_page }
|
8
8
|
|
9
9
|
it { is_expected.to be_a Spotlight::Catalog::AccessControlsEnforcement }
|
10
10
|
|
11
|
-
describe
|
11
|
+
describe 'when signed in as a curator' do
|
12
12
|
let(:user) { FactoryGirl.create(:exhibit_curator) }
|
13
13
|
before do
|
14
14
|
FactoryGirl.create(:role, exhibit: exhibit, user: user)
|
15
15
|
sign_in user
|
16
16
|
end
|
17
17
|
|
18
|
-
describe
|
18
|
+
describe 'GET edit' do
|
19
19
|
describe "when the page title isn't set" do
|
20
20
|
before do
|
21
21
|
page.title = nil
|
22
22
|
end
|
23
23
|
|
24
|
-
it
|
25
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
26
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
27
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
28
|
-
get :edit, id: page, exhibit_id: page.exhibit
|
29
|
-
expect(response).to be_successful
|
24
|
+
it 'shows breadcrumbs' do
|
25
|
+
expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
|
26
|
+
expect(controller).to receive(:add_breadcrumb).with('Feature pages', exhibit_feature_pages_path(exhibit))
|
27
|
+
expect(controller).to receive(:add_breadcrumb).with('Exhibit Home', [:edit, exhibit, page])
|
28
|
+
get :edit, id: page, exhibit_id: page.exhibit
|
29
|
+
expect(response).to be_successful
|
30
30
|
end
|
31
31
|
end
|
32
|
-
it
|
33
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
34
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
32
|
+
it 'shows breadcrumbs' do
|
33
|
+
expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
|
34
|
+
expect(controller).to receive(:add_breadcrumb).with('Feature pages', exhibit_feature_pages_path(exhibit))
|
35
35
|
expect(controller).to receive(:add_breadcrumb).with(page.title, [:edit, exhibit, page])
|
36
36
|
get :edit, id: page, exhibit_id: page.exhibit
|
37
|
-
expect(response).to be_successful
|
37
|
+
expect(response).to be_successful
|
38
38
|
end
|
39
39
|
end
|
40
|
-
describe
|
41
|
-
it
|
40
|
+
describe 'PUT update' do
|
41
|
+
it 'redirects to the feature page index action' do
|
42
42
|
put :update, id: page, exhibit_id: page.exhibit.id, home_page: valid_attributes
|
43
43
|
page.reload
|
44
44
|
expect(response).to redirect_to(exhibit_home_page_path(page.exhibit, page))
|
45
|
-
expect(flash[:notice]).to have_link
|
45
|
+
expect(flash[:notice]).to have_link 'Undo changes'
|
46
46
|
end
|
47
47
|
end
|
48
48
|
end
|
49
49
|
|
50
|
-
describe
|
51
|
-
it
|
52
|
-
allow(controller).to receive_messages(
|
50
|
+
describe 'Rendering home page' do
|
51
|
+
it 'gets search results for display facets' do
|
52
|
+
allow(controller).to receive_messages(search_results: [double, double])
|
53
53
|
get :show, exhibit_id: exhibit
|
54
54
|
expect(assigns[:response]).to_not be_blank
|
55
55
|
expect(assigns[:document_list]).to_not be_blank
|
56
56
|
expect(assigns[:page]).to eq exhibit.home_page
|
57
57
|
end
|
58
|
-
it
|
58
|
+
it 'does not render breadcrumbs' do
|
59
59
|
expect(controller).not_to receive(:add_breadcrumb)
|
60
|
-
allow(controller).to receive_messages(
|
60
|
+
allow(controller).to receive_messages(search_results: [double, double])
|
61
61
|
get :show, exhibit_id: exhibit
|
62
62
|
expect(response).to be_successful
|
63
63
|
end
|
64
|
-
it
|
64
|
+
it 'does not do the search when the sidebar is hidden' do
|
65
65
|
page.display_sidebar = false
|
66
66
|
page.save
|
67
|
-
allow(controller).to receive_messages(
|
67
|
+
allow(controller).to receive_messages(search_results: [double, double])
|
68
68
|
get :show, exhibit_id: exhibit
|
69
69
|
expect(assigns).not_to have_key :response
|
70
70
|
expect(assigns).not_to have_key :document_list
|
71
71
|
end
|
72
72
|
end
|
73
73
|
|
74
|
-
describe
|
74
|
+
describe 'when the exhibit is not published' do
|
75
75
|
before do
|
76
76
|
exhibit.published = false
|
77
77
|
exhibit.save!
|
78
78
|
end
|
79
79
|
|
80
|
-
it
|
80
|
+
it 'redirects an anonymous user to the signin path' do
|
81
81
|
get :show, exhibit_id: exhibit
|
82
82
|
expect(response).to redirect_to(main_app.new_user_session_path)
|
83
83
|
end
|
84
84
|
|
85
|
-
it
|
85
|
+
it 'redirects an unauthorized user to the signin path' do
|
86
86
|
user = FactoryGirl.create(:exhibit_curator)
|
87
87
|
sign_in user
|
88
88
|
expect do
|
@@ -90,7 +90,7 @@ describe Spotlight::HomePagesController, :type => :controller do
|
|
90
90
|
end.to raise_error ActionController::RoutingError
|
91
91
|
end
|
92
92
|
|
93
|
-
it
|
93
|
+
it 'redirects an authorized user to the signin path' do
|
94
94
|
user = FactoryGirl.create(:exhibit_curator)
|
95
95
|
FactoryGirl.create(:role, exhibit: exhibit, user: user)
|
96
96
|
sign_in user
|
@@ -98,5 +98,4 @@ describe Spotlight::HomePagesController, :type => :controller do
|
|
98
98
|
expect(response).to be_successful
|
99
99
|
end
|
100
100
|
end
|
101
|
-
|
102
101
|
end
|
@@ -0,0 +1,84 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
describe Spotlight::MetadataConfigurationsController, type: :controller do
|
3
|
+
routes { Spotlight::Engine.routes }
|
4
|
+
let(:exhibit) { FactoryGirl.create(:exhibit) }
|
5
|
+
|
6
|
+
describe 'when the user is not authorized' do
|
7
|
+
before do
|
8
|
+
sign_in FactoryGirl.create(:exhibit_visitor)
|
9
|
+
end
|
10
|
+
|
11
|
+
it 'denies access' do
|
12
|
+
get :show, exhibit_id: exhibit
|
13
|
+
expect(response).to redirect_to main_app.root_path
|
14
|
+
expect(flash[:alert]).to be_present
|
15
|
+
end
|
16
|
+
|
17
|
+
it 'denies access' do
|
18
|
+
get :edit, exhibit_id: exhibit
|
19
|
+
expect(response).to redirect_to main_app.root_path
|
20
|
+
expect(flash[:alert]).to be_present
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
describe 'when not logged in' do
|
25
|
+
describe '#update' do
|
26
|
+
it 'denies access' do
|
27
|
+
patch :update, exhibit_id: exhibit
|
28
|
+
expect(response).to redirect_to main_app.new_user_session_path
|
29
|
+
end
|
30
|
+
end
|
31
|
+
|
32
|
+
describe '#edit' do
|
33
|
+
it 'denies access' do
|
34
|
+
get :edit, exhibit_id: exhibit
|
35
|
+
expect(response).to redirect_to main_app.new_user_session_path
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
39
|
+
|
40
|
+
describe 'when signed in' do
|
41
|
+
let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
|
42
|
+
before { sign_in user }
|
43
|
+
|
44
|
+
describe '#edit' do
|
45
|
+
it 'is successful' do
|
46
|
+
expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
|
47
|
+
expect(controller).to receive(:add_breadcrumb).with('Curation', exhibit_dashboard_path(exhibit))
|
48
|
+
expect(controller).to receive(:add_breadcrumb).with('Metadata', edit_exhibit_metadata_configuration_path(exhibit))
|
49
|
+
get :edit, exhibit_id: exhibit
|
50
|
+
expect(response).to be_successful
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
describe '#show' do
|
55
|
+
it 'is successful' do
|
56
|
+
get :show, exhibit_id: exhibit, format: 'json'
|
57
|
+
expect(response).to be_successful
|
58
|
+
expect(JSON.parse(response.body).keys).to eq exhibit.blacklight_config.index_fields.keys
|
59
|
+
end
|
60
|
+
end
|
61
|
+
|
62
|
+
describe '#update' do
|
63
|
+
it 'updates metadata fields' do
|
64
|
+
blacklight_config = Blacklight::Configuration.new
|
65
|
+
blacklight_config.add_index_field %w(a b c d e f)
|
66
|
+
allow(::CatalogController).to receive_messages(blacklight_config: blacklight_config)
|
67
|
+
patch :update, exhibit_id: exhibit, blacklight_configuration: {
|
68
|
+
index_fields: {
|
69
|
+
c: { enabled: true, show: true },
|
70
|
+
d: { enabled: true, show: true },
|
71
|
+
e: { enabled: true, list: true },
|
72
|
+
f: { enabled: true, list: true }
|
73
|
+
}
|
74
|
+
}
|
75
|
+
|
76
|
+
expect(flash[:notice]).to eq 'The exhibit was successfully updated.'
|
77
|
+
expect(response).to redirect_to edit_exhibit_metadata_configuration_path(exhibit)
|
78
|
+
assigns[:exhibit].tap do |saved|
|
79
|
+
expect(saved.blacklight_configuration.index_fields).to include 'c', 'd', 'e', 'f'
|
80
|
+
end
|
81
|
+
end
|
82
|
+
end
|
83
|
+
end
|
84
|
+
end
|
@@ -1,30 +1,28 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spotlight::Resources::UploadController, :
|
3
|
+
describe Spotlight::Resources::UploadController, type: :controller do
|
4
4
|
routes { Spotlight::Engine.routes }
|
5
5
|
let(:exhibit) { FactoryGirl.create(:exhibit) }
|
6
6
|
|
7
|
-
describe
|
8
|
-
|
9
|
-
|
10
|
-
it "should not be allowed" do
|
7
|
+
describe 'when not logged in' do
|
8
|
+
describe 'POST create' do
|
9
|
+
it 'does not be allowed' do
|
11
10
|
post :create, exhibit_id: exhibit
|
12
11
|
expect(response).to redirect_to main_app.new_user_session_path
|
13
12
|
end
|
14
13
|
end
|
15
14
|
end
|
16
15
|
|
17
|
-
|
18
|
-
describe "when signed in as a curator" do
|
16
|
+
describe 'when signed in as a curator' do
|
19
17
|
let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
|
20
|
-
before {sign_in user }
|
21
|
-
|
22
|
-
describe
|
23
|
-
it
|
24
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
25
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
26
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
27
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
18
|
+
before { sign_in user }
|
19
|
+
|
20
|
+
describe 'GET new' do
|
21
|
+
it 'is successful' do
|
22
|
+
expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_path(exhibit))
|
23
|
+
expect(controller).to receive(:add_breadcrumb).with('Curation', exhibit_dashboard_path(exhibit))
|
24
|
+
expect(controller).to receive(:add_breadcrumb).with('Items', admin_exhibit_catalog_index_path(exhibit))
|
25
|
+
expect(controller).to receive(:add_breadcrumb).with('Add non-repository items', new_exhibit_resources_upload_path(exhibit))
|
28
26
|
get :new, exhibit_id: exhibit
|
29
27
|
expect(response).to be_successful
|
30
28
|
end
|
@@ -32,32 +30,44 @@ describe Spotlight::Resources::UploadController, :type => :controller do
|
|
32
30
|
|
33
31
|
describe 'POST csv_upload' do
|
34
32
|
let(:csv) { fixture_file_upload(File.expand_path(File.join('..', 'fixtures', 'csv-upload-fixture.csv'), Rails.root), 'text/csv') }
|
35
|
-
let(:serialized_csv)
|
36
|
-
|
37
|
-
|
38
|
-
|
33
|
+
let(:serialized_csv) do
|
34
|
+
[
|
35
|
+
{
|
36
|
+
'url' => 'http://lorempixel.com/800/500/',
|
37
|
+
'full_title_tesim' => 'A random image',
|
38
|
+
'spotlight_upload_description_tesim' => 'A random 800 by 500 image from lorempixel',
|
39
|
+
'spotlight_upload_attribution_tesim' => 'lorempixel.com',
|
40
|
+
'spotlight_upload_date_tesim' => '2015'
|
41
|
+
},
|
42
|
+
{
|
43
|
+
'url' => 'http://lorempixel.com/900/600/',
|
44
|
+
'full_title_tesim' => 'Another random image',
|
45
|
+
'spotlight_upload_description_tesim' => 'A random 900 by 600 image from lorempixel',
|
46
|
+
'spotlight_upload_attribution_tesim' => 'lorempixel.com',
|
47
|
+
'spotlight_upload_date_tesim' => '2014'
|
48
|
+
}
|
49
|
+
]
|
50
|
+
end
|
39
51
|
before do
|
40
|
-
request.env[
|
52
|
+
request.env['HTTP_REFERER'] = 'http://test.host/'
|
41
53
|
end
|
42
|
-
it '
|
54
|
+
it 'starts an AddUploadsFromCSV job with the serialized CSV' do
|
43
55
|
expect(Spotlight::AddUploadsFromCSV).to receive(:perform_later).with(serialized_csv, exhibit, user).and_return(nil)
|
44
56
|
post :csv_upload, exhibit_id: exhibit, resources_csv_upload: { url: csv }
|
45
57
|
end
|
46
|
-
it '
|
58
|
+
it 'sets the flash message' do
|
47
59
|
expect(Spotlight::AddUploadsFromCSV).to receive(:perform_later).and_return(nil)
|
48
60
|
post :csv_upload, exhibit_id: exhibit, resources_csv_upload: { url: csv }
|
49
61
|
expect(flash[:notice]).to eq "'csv-upload-fixture.csv' has been uploaded. An email will be sent to you once indexing is complete."
|
50
62
|
end
|
51
|
-
it '
|
63
|
+
it 'redirects back' do
|
52
64
|
expect(Spotlight::AddUploadsFromCSV).to receive(:perform_later).and_return(nil)
|
53
65
|
post :csv_upload, exhibit_id: exhibit, resources_csv_upload: { url: csv }
|
54
66
|
expect(response).to redirect_to :back
|
55
67
|
end
|
56
|
-
|
57
68
|
end
|
58
69
|
|
59
|
-
describe
|
60
|
-
|
70
|
+
describe 'POST create' do
|
61
71
|
let(:blacklight_solr) { double }
|
62
72
|
|
63
73
|
before do
|
@@ -65,23 +75,22 @@ describe Spotlight::Resources::UploadController, :type => :controller do
|
|
65
75
|
allow_any_instance_of(Spotlight::Resource).to receive(:reindex)
|
66
76
|
allow_any_instance_of(Spotlight::Resource).to receive(:blacklight_solr).and_return blacklight_solr
|
67
77
|
end
|
68
|
-
it
|
78
|
+
it 'create a Spotlight::Resources::Upload resource' do
|
69
79
|
expect(blacklight_solr).to receive(:commit)
|
70
|
-
post :create, exhibit_id: exhibit, resources_upload: { url:
|
80
|
+
post :create, exhibit_id: exhibit, resources_upload: { url: 'url-data' }
|
71
81
|
expect(assigns[:resource]).to be_persisted
|
72
82
|
expect(assigns[:resource]).to be_a(Spotlight::Resources::Upload)
|
73
83
|
end
|
74
|
-
it '
|
75
|
-
post :create, exhibit_id: exhibit, resources_upload: { url:
|
84
|
+
it 'redirects to the item admin page' do
|
85
|
+
post :create, exhibit_id: exhibit, resources_upload: { url: 'url-data' }
|
76
86
|
expect(flash[:notice]).to eq 'Object uploaded successfully.'
|
77
87
|
expect(response).to redirect_to admin_exhibit_catalog_index_path(exhibit, sort: :timestamp)
|
78
88
|
end
|
79
|
-
it '
|
80
|
-
post :create, exhibit_id: exhibit,
|
89
|
+
it 'redirects to the upload form when the add-and-continue parameter is present' do
|
90
|
+
post :create, exhibit_id: exhibit, 'add-and-continue' => 'true', resources_upload: { url: 'url-data' }
|
81
91
|
expect(flash[:notice]).to eq 'Object uploaded successfully.'
|
82
92
|
expect(response).to redirect_to new_exhibit_resources_upload_path(exhibit)
|
83
93
|
end
|
84
94
|
end
|
85
95
|
end
|
86
|
-
|
87
96
|
end
|