diff --git a/app/assets/javascripts/orangelight.js b/app/assets/javascripts/orangelight.js index 978dbb45b..ce95da9e6 100644 --- a/app/assets/javascripts/orangelight.js +++ b/app/assets/javascripts/orangelight.js @@ -11,14 +11,6 @@ $(function () { } ) - //tooltip for everything else - $('#main-container').tooltip({ - selector: "[data-toggle='tooltip']", - placement: 'bottom', - container: 'body', - trigger: 'hover', - }) - // availability toggle journal current issues $('#availability').on('click', '.trigger', function (event) { event.preventDefault() diff --git a/app/assets/stylesheets/components/availability.scss b/app/assets/stylesheets/components/availability.scss index 5492b659f..842e40e09 100644 --- a/app/assets/stylesheets/components/availability.scss +++ b/app/assets/stylesheets/components/availability.scss @@ -365,13 +365,6 @@ display: none; } - .icon-warning { - float: left; - font-size: 24px; - padding-top: 1px; - color: #e87511; - } - .availability-icon { float: left; padding: 6px 5px; diff --git a/app/assets/stylesheets/components/overrides.scss b/app/assets/stylesheets/components/overrides.scss index a67ac9dfb..562080043 100644 --- a/app/assets/stylesheets/components/overrides.scss +++ b/app/assets/stylesheets/components/overrides.scss @@ -150,10 +150,6 @@ address { margin-top: 8px; } -.tooltip > .tooltip-inner { - max-width: 600px !important; -} - [dir="rtl"] { font-family: verdana, arial; text-align: right; diff --git a/app/assets/stylesheets/icons/icons.scss b/app/assets/stylesheets/icons/icons.scss index 124c853d1..7a3dc266d 100755 --- a/app/assets/stylesheets/icons/icons.scss +++ b/app/assets/stylesheets/icons/icons.scss @@ -62,12 +62,6 @@ } } -.icon-warning { - &:before { - content: $icon-warning; - } -} - .icon-refresh { &:before { content: $icon-refresh; diff --git a/app/assets/stylesheets/icons/variables.scss b/app/assets/stylesheets/icons/variables.scss index a344f0046..6040a0826 100755 --- a/app/assets/stylesheets/icons/variables.scss +++ b/app/assets/stylesheets/icons/variables.scss @@ -65,6 +65,5 @@ $icon-toggle-collapsed: "\e608"; $icon-unknown: "\e60f"; $icon-video-projected-medium: "\e606"; $icon-visual-material: "\e607"; -$icon-warning: "\e90e"; $icon-web: "\efbe"; $icon-windows: "\f0fd"; diff --git a/app/components/aeon_request_button_component.rb b/app/components/aeon_request_button_component.rb index 80cd4384d..265b0006d 100644 --- a/app/components/aeon_request_button_component.rb +++ b/app/components/aeon_request_button_component.rb @@ -12,10 +12,6 @@ def label 'Reading Room Request' end - def tooltip - 'Request to view in Reading Room' - end - def url @url_class.new(document: @document, holding: @holding).to_s end diff --git a/app/components/request_button_component.html.erb b/app/components/request_button_component.html.erb index 0b1de545f..0f406b8dd 100644 --- a/app/components/request_button_component.html.erb +++ b/app/components/request_button_component.html.erb @@ -1,5 +1 @@ -<%= link_to label, url, - class: 'request btn btn-xs btn-primary', - title: tooltip, - data: { toggle: 'tooltip' } -%> +<%= link_to label, url, class: 'request btn btn-xs btn-primary' %> diff --git a/app/components/request_button_component.rb b/app/components/request_button_component.rb index b00e889c4..94b80b34b 100644 --- a/app/components/request_button_component.rb +++ b/app/components/request_button_component.rb @@ -14,11 +14,6 @@ def label 'Request' end - def tooltip - return 'Request to view in Reading Room' if aeon? - 'View Options to Request copies from this Location' - end - def url query = { mfhd: @holding_id, aeon: aeon?.to_s }.compact.to_query URI::HTTP.build(path: "/requests/#{@doc_id}", query:).request_uri diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8b283857e..a36e85c82 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -183,12 +183,12 @@ def subjectify(args) full_sub = '' all_subjects[i].each_with_index do |subsubject, j| lnk = lnk_accum + link_to(subsubject, - "/?f[subject_facet][]=#{CGI.escape sub_array[i][j]}", class: 'search-subject', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{sub_array[i][j]}", title: "Search: #{sub_array[i][j]}") + "/?f[subject_facet][]=#{CGI.escape sub_array[i][j]}", class: 'search-subject', 'data-original-title' => "Search: #{sub_array[i][j]}") lnk_accum = lnk + content_tag(:span, SEPARATOR, class: 'subject-level') full_sub = sub_array[i][j] end lnk += ' ' - lnk += link_to('[Browse]', "/browse/subjects?q=#{CGI.escape full_sub}", class: 'browse-subject', 'data-toggle' => 'tooltip', 'data-original-title' => "Browse: #{full_sub}", title: "Browse: #{full_sub}", dir: full_sub.dir.to_s) + lnk += link_to('[Browse]', "/browse/subjects?q=#{CGI.escape full_sub}", class: 'browse-subject', 'data-original-title' => "Browse: #{full_sub}", 'aria-label' => "Browse: #{full_sub}", dir: full_sub.dir.to_s) args[:document][args[:field]][i] = lnk.html_safe end content_tag :ul do @@ -206,7 +206,7 @@ def title_hierarchy(args) title_links = [] title.each_with_index do |part, index| link_accum = StringFunctions.trim_punctuation(title[0..index].join(' ')) - title_links << link_to(part, "/?search_field=left_anchor&q=#{CGI.escape link_accum}", class: 'search-title', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{link_accum}", title: "Search: #{link_accum}") + title_links << link_to(part, "/?search_field=left_anchor&q=#{CGI.escape link_accum}", class: 'search-title', 'data-original-title' => "Search: #{link_accum}", title: "Search: #{link_accum}") end full_title = title.join(' ') dirtags << StringFunctions.trim_punctuation(full_title.dir.to_s) @@ -252,14 +252,14 @@ def name_title_hierarchy(args) link_accum = StringFunctions.trim_punctuation(name_t[0..i].join(' ')) if i.zero? next if args[:field] == 'name_uniform_title_1display' - name_title_links << link_to(part, "/?f[author_s][]=#{CGI.escape link_accum}", class: 'search-name-title', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{link_accum}", title: "Search: #{link_accum}") + name_title_links << link_to(part, "/?f[author_s][]=#{CGI.escape link_accum}", class: 'search-name-title', 'data-original-title' => "Search: #{link_accum}") else - name_title_links << link_to(part, "/?f[name_title_browse_s][]=#{CGI.escape link_accum}", class: 'search-name-title', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{link_accum}", title: "Search: #{link_accum}") + name_title_links << link_to(part, "/?f[name_title_browse_s][]=#{CGI.escape link_accum}", class: 'search-name-title', 'data-original-title' => "Search: #{link_accum}") end end full_name_title = name_t.join(' ') dirtags << StringFunctions.trim_punctuation(full_name_title.dir.to_s) - name_title_links << link_to('[Browse]', "/browse/name_titles?q=#{CGI.escape full_name_title}", class: 'browse-name-title', 'data-toggle' => 'tooltip', 'data-original-title' => "Browse: #{full_name_title}", title: "Browse: #{full_name_title}", dir: full_name_title.dir.to_s) + name_title_links << link_to('[Browse]', "/browse/name_titles?q=#{CGI.escape full_name_title}", class: 'browse-name-title', 'data-original-title' => "Browse: #{full_name_title}", dir: full_name_title.dir.to_s) all_links << name_title_links.join(' ').html_safe end diff --git a/app/helpers/blacklight_helper.rb b/app/helpers/blacklight_helper.rb index 3ab0a5425..582c31819 100644 --- a/app/helpers/blacklight_helper.rb +++ b/app/helpers/blacklight_helper.rb @@ -88,8 +88,8 @@ def cjk_mm_val end def browse_related_name_hash(name) - link_to(name, "/?f[author_s][]=#{CGI.escape name}", class: 'search-related-name', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{name}", title: "Search: #{name}") + ' ' + - link_to('[Browse]', "/browse/names?q=#{CGI.escape name}", class: 'browse-related-name', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{name}", title: "Browse: #{name}") + link_to(name, "/?f[author_s][]=#{CGI.escape name}", class: 'search-related-name', 'data-original-title' => "Search: #{name}") + ' ' + + link_to('[Browse]', "/browse/names?q=#{CGI.escape name}", class: 'browse-related-name', 'data-original-title' => "Search: #{name}") end # render_document_heading from Blacklight v7.23.0.1 diff --git a/app/helpers/holdings_helper.rb b/app/helpers/holdings_helper.rb index 2963d9058..06b3a6c70 100644 --- a/app/helpers/holdings_helper.rb +++ b/app/helpers/holdings_helper.rb @@ -84,9 +84,7 @@ def empty_link_online_holding_block data = content_tag( :span, 'Link Missing', - class: 'availability-icon badge badge-secondary', - title: 'Availability: Online', - data: { 'toggle': 'tooltip' } + class: 'availability-icon badge badge-secondary' ) data << content_tag( :div, @@ -99,9 +97,7 @@ def online_holding_block(links) data = content_tag( :span, 'Online', - class: 'availability-icon badge badge-primary', - title: 'Electronic access', - data: { 'toggle': 'tooltip' } + class: 'availability-icon badge badge-primary' ) data << links.shift end @@ -110,27 +106,12 @@ def onsite_access_span content_tag( :span, 'On-site access', - class: 'availability-icon badge badge-success', - title: 'Availability: On-site by request', - data: { 'toggle': 'tooltip' } + class: 'availability-icon badge badge-success' ) end - def request_only_span - content_tag( - :span, - '', - class: 'icon-warning icon-request-reading-room', - title: 'Items at this location must be requested', - data: { 'toggle': 'tooltip' }, - 'aria-hidden': 'true' - ) - end - - def dspace_or_numismatics_holding_block(location) - data = onsite_access_span - data << request_only_span if aeon_location?(location) - data + def dspace_or_numismatics_holding_block(_location) + onsite_access_span end def scsb_item_block(holding) @@ -138,7 +119,7 @@ def scsb_item_block(holding) end def scsb_supervised_item - onsite_access_span + request_only_span + onsite_access_span end def scsb_unsupervised_item(holding) @@ -146,32 +127,26 @@ def scsb_unsupervised_item(holding) :span, '', class: 'availability-icon badge', - title: '', data: { 'scsb-availability': 'true', - 'toggle': 'tooltip', 'scsb-barcode': holding['items'].first['barcode'].to_s } ) end - def dspace_not_defined_block(location) - data = content_tag( + def dspace_not_defined_block(_location) + content_tag( :span, 'Loading...', class: 'availability-icon badge badge-secondary' ) - data << request_only_span if aeon_location?(location) - data end def under_embargo_block content_tag( :span, 'Unavailable', - class: 'availability-icon badge badge-danger', - title: 'Availability: Material under embargo', - data: { 'toggle': 'tooltip' } + class: 'availability-icon badge badge-danger' ) end @@ -220,9 +195,7 @@ def view_record_for_full_avail_li(document) link_to( 'View Record for Full Availability', solr_document_path(document['id']), - class: 'availability-icon badge badge-secondary more-info', - title: 'Click on the record for full availability info', - data: { 'toggle': 'tooltip' } + class: 'availability-icon badge badge-secondary more-info' ) ) end @@ -233,9 +206,7 @@ def view_record_for_full_avail_li_two(document) link_to( '', solr_document_path(document['id']), - class: 'availability-icon more-info', - title: 'Click on the record for full availability info', - data: { 'toggle': 'tooltip' } + class: 'availability-icon more-info' ), class: 'empty', data: { record_id: document['id'] } diff --git a/app/processors/orangelight/browse_link_processor.rb b/app/processors/orangelight/browse_link_processor.rb index b0eeef1b3..ce91f7b78 100644 --- a/app/processors/orangelight/browse_link_processor.rb +++ b/app/processors/orangelight/browse_link_processor.rb @@ -36,8 +36,8 @@ def browse_class def add_links_to(value) return value unless should_render_links?(value) - link_to(value, "/?f[#{facet_field}][]=#{strip_tags(CGI.escape(strip_tags(value)))}", class: search_class, 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{strip_tags(value)}", title: "") + ' ' + - link_to('[Browse]', "/browse/#{browse_path}?q=#{CGI.escape(strip_tags(value))}", class: browse_class, 'data-toggle' => 'tooltip', 'data-original-title' => "Browse: #{strip_tags(value)}", title: "", dir: value.dir.to_s) + link_to(value, "/?f[#{facet_field}][]=#{strip_tags(CGI.escape(strip_tags(value)))}", class: search_class, 'data-original-title' => "Search: #{strip_tags(value)}") + ' ' + + link_to('[Browse]', "/browse/#{browse_path}?q=#{CGI.escape(strip_tags(value))}", class: browse_class, 'data-original-title' => "Browse: #{strip_tags(value)}", dir: value.dir.to_s) end def should_render_links?(value) diff --git a/app/processors/orangelight/link_to_facet_processor.rb b/app/processors/orangelight/link_to_facet_processor.rb index d84e1aa1d..ab75b03aa 100644 --- a/app/processors/orangelight/link_to_facet_processor.rb +++ b/app/processors/orangelight/link_to_facet_processor.rb @@ -3,7 +3,7 @@ module Orangelight class LinkToFacetProcessor < Blacklight::Rendering::LinkToFacet def link(field, v) - context.link_to(v, search_path(field, v), class: 'search-name', data: { toggle: 'tooltip', original_title: "Search: #{v}" }, title: "Search: #{v}") + context.link_to(v, search_path(field, v), class: 'search-name', 'data-original_title' => "Search: #{v}") end end end diff --git a/app/processors/orangelight/link_to_search_value_processor.rb b/app/processors/orangelight/link_to_search_value_processor.rb index 0948829d2..fd4d83197 100644 --- a/app/processors/orangelight/link_to_search_value_processor.rb +++ b/app/processors/orangelight/link_to_search_value_processor.rb @@ -6,9 +6,8 @@ class LinkToSearchValueProcessor < Blacklight::Rendering::AbstractStep def render return next_step(values) unless config.link_to_search_value - values.map! do |value| - link_to(value, "/?f[#{config.key}][]=#{CGI.escape value}", class: 'search-name', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{value}") + link_to(value, "/?f[#{config.key}][]=#{CGI.escape value}", class: 'search-name', 'data-original-title' => "Search: #{value}") end next_step(values) end diff --git a/app/processors/orangelight/series_link_processor.rb b/app/processors/orangelight/series_link_processor.rb index f81abb827..2bc0ed262 100644 --- a/app/processors/orangelight/series_link_processor.rb +++ b/app/processors/orangelight/series_link_processor.rb @@ -22,8 +22,8 @@ def render def more_in_this_series_link(title) no_parens = authorized_form_of_title(title).gsub(/[()]/, '') link_to('[More in this series]', "/catalog?q1=#{CGI.escape no_parens}&f1=in_series&search_field=advanced", - class: 'more-in-series', 'data-toggle' => 'tooltip', - 'data-original-title' => "More in series: #{title}", title: "", + class: 'more-in-series', + 'data-original-title' => "More in series: #{title}", dir: title.dir.to_s) end diff --git a/app/services/online_holdings_markup_builder.rb b/app/services/online_holdings_markup_builder.rb index 1e2ba6882..e92218a40 100644 --- a/app/services/online_holdings_markup_builder.rb +++ b/app/services/online_holdings_markup_builder.rb @@ -8,9 +8,7 @@ class OnlineHoldingsMarkupBuilder < HoldingRequestsBuilder def self.online_link(bib_id, holding_id) children = content_tag( :span, 'Link Missing', - class: 'availability-icon badge badge-secondary', - title: 'Availability: Online', - 'data-toggle' => 'tooltip' + class: 'availability-icon badge badge-secondary' ) # AJAX requests are made using availability.js here content_tag(:div, children.html_safe, diff --git a/app/services/physical_holdings_markup_builder.rb b/app/services/physical_holdings_markup_builder.rb index 4cab861ce..8709bf0c7 100644 --- a/app/services/physical_holdings_markup_builder.rb +++ b/app/services/physical_holdings_markup_builder.rb @@ -21,8 +21,6 @@ def call_number_link(holding, cn_value) cn_browse_link = link_to(children.html_safe, "/browse/call_numbers?q=#{CGI.escape(cn_value)}", class: 'browse-cn', - title: "Browse: #{cn_value}", - 'data-toggle' => 'tooltip', 'data-original-title' => "Browse: #{cn_value}") cn = "#{holding['call_number']} #{cn_browse_link}" end @@ -32,17 +30,13 @@ def call_number_link(holding, cn_value) def holding_location_repository children = content_tag(:span, 'On-site access', - class: 'availability-icon badge badge-success', - title: 'Availability: On-site by request', - 'data-toggle' => 'tooltip') + class: 'availability-icon badge badge-success') content_tag(:td, children.html_safe) end def holding_location_scsb_span markup = content_tag(:span, '', - title: '', - class: 'availability-icon badge', - data: { toggle: 'tooltip' }) + class: 'availability-icon badge') markup end @@ -80,9 +74,7 @@ def holding_location_default(doc_id, holding_id, location_rules, temp_location_c def holding_location_unavailable children = content_tag(:span, 'Unavailable', - class: 'availability-icon badge badge-danger', - title: 'Availability: Embargoed', - 'data-toggle' => 'tooltip') + class: 'availability-icon badge badge-danger') content_tag(:td, children.html_safe, class: 'holding-status') end @@ -134,23 +126,12 @@ def self.scsb_use_label(restriction) "#{restriction} Only" end - def self.scsb_use_toolip(restriction) - if restriction == 'In Library Use' - I18n.t('blacklight.scsb.in_library_use') - else - I18n.t('blacklight.scsb.supervised_use') - end - end - # Generate the markup for record restrictions # @param holding [Hash] the restrictions for all holdings # @return [String] the markup def self.restrictions_markup(restrictions) restricted_items = restrictions.map do |value| - content_tag(:td, scsb_use_label(value), - class: 'icon-warning icon-request-reading-room', - title: scsb_use_toolip(value), - 'data-toggle' => 'tooltip') + content_tag(:td, scsb_use_label(value)) end if restricted_items.length > 1 list = restricted_items.map { |value| content_tag(:li, value) } @@ -356,7 +337,6 @@ def stackmap_url_markup(location, library, holding, call_number) child = %(#{I18n.t('blacklight.holdings.stackmap')}\ ) link_to(child.html_safe, stackmap_url, - title: I18n.t('blacklight.holdings.stackmap'), class: 'find-it', data: { 'map-location' => location.to_s, diff --git a/app/views/blacklight_advanced_search/_facet_limit.html.erb b/app/views/blacklight_advanced_search/_facet_limit.html.erb index 334ab5ae7..b699735f0 100644 --- a/app/views/blacklight_advanced_search/_facet_limit.html.erb +++ b/app/views/blacklight_advanced_search/_facet_limit.html.erb @@ -7,7 +7,7 @@
  • <%= h(value) %> <%= link_to(remove_advanced_facet_param(facet_field.key, value, params), :class => "remove") do %> - [remove] + [remove] <% end %>
    • <% end %> diff --git a/app/views/catalog/_show_restrictions.html.erb b/app/views/catalog/_show_restrictions.html.erb index 851a44365..2a42b687f 100644 --- a/app/views/catalog/_show_restrictions.html.erb +++ b/app/views/catalog/_show_restrictions.html.erb @@ -1,6 +1,6 @@ <% online, physical = holding_request_block(document) %> <% unless holding_requests_adapter.restrictions.empty? %>
    - <%= PhysicalHoldingsMarkupBuilder.restrictions_markup(holding_requests_adapter.restrictions) %> + <%= PhysicalHoldingsMarkupBuilder.restrictions_markup(holding_requests_adapter.restrictions) %>
    <% end %> diff --git a/app/views/catalog/_show_sidebar.html.erb b/app/views/catalog/_show_sidebar.html.erb index 449bbf5d4..00802d446 100644 --- a/app/views/catalog/_show_sidebar.html.erb +++ b/app/views/catalog/_show_sidebar.html.erb @@ -5,7 +5,7 @@ <% if monograms = @document['issue_monogram_1display'] %>

    Monograms

    <% JSON.parse(monograms).each do |monogram,_v| %> - <%= content_tag(:p, link_to(monogram['title'], "/?f[issue_monogram_title_s][]=#{CGI.escape monogram['title']}", class: 'search-name', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{monogram['title']}", title: "Search: #{monogram['title']}"), data: { 'monogram-id' => monogram['document_id']}) %> + <%= content_tag(:p, link_to(monogram['title'], "/?f[issue_monogram_title_s][]=#{CGI.escape monogram['title']}", class: 'search-name', 'data-original-title' => "Search: #{monogram['title']}", title: "Search: #{monogram['title']}"), data: { 'monogram-id' => monogram['document_id']}) %> <% end %> <% end %> <% unless @document.more_like_this.empty? %> diff --git a/app/views/catalog/_sort_and_per_page.html.erb b/app/views/catalog/_sort_and_per_page.html.erb index 1d3859f79..6b09b9835 100644 --- a/app/views/catalog/_sort_and_per_page.html.erb +++ b/app/views/catalog/_sort_and_per_page.html.erb @@ -4,7 +4,7 @@ <%= render :partial => "paginate_compact", :object => @response if show_pagination? %> <%= link_to(" ", search_catalog_path(params.permit!.merge(format: 'atom', sort: 'cataloged_tdt desc, pub_date_start_sort desc, title_sort asc').except(:controller, :action)), - :class => "icon-rssfeed", :title => "Subscribe to results feed", 'data-toggle' => "tooltip", "aria-label"=>"Subscribe to results feed" ) %> + :class => "icon-rssfeed", :title => "Subscribe to results feed", "aria-label"=>"Subscribe to results feed" ) %>
    diff --git a/spec/components/aeon_request_button_component_spec.rb b/spec/components/aeon_request_button_component_spec.rb index f42393894..816fe8bdd 100644 --- a/spec/components/aeon_request_button_component_spec.rb +++ b/spec/components/aeon_request_button_component_spec.rb @@ -16,9 +16,6 @@ it "renders a link with the appropriate classes" do expect(subject.css('a').attribute('class').to_s).to eq('request btn btn-xs btn-primary') end - it 'renders the typical title tooltip' do - expect(subject.css('a').attribute('title').text).to eq('Request to view in Reading Room') - end it 'renders the typical request text' do expect(subject.css('a').text).to eq('Reading Room Request') end diff --git a/spec/components/request_button_component_spec.rb b/spec/components/request_button_component_spec.rb index 1a02069eb..4a9e8b712 100644 --- a/spec/components/request_button_component_spec.rb +++ b/spec/components/request_button_component_spec.rb @@ -10,8 +10,8 @@ it "renders a link with the appropriate classes" do expect(subject.css('a').attribute('class').to_s).to eq('request btn btn-xs btn-primary') end - it 'renders the typical title tooltip' do - expect(subject.css('a').attribute('title').text).to eq('View Options to Request copies from this Location') + it 'does not render a tooltip' do + expect(subject.css('a').attribute('title')).to be_falsey end it 'renders the typical request text' do expect(subject.css('a').text).to eq('Request') @@ -27,8 +27,8 @@ it 'renders the aeon request text' do expect(subject.css('a').text).to eq('Reading Room Request') end - it 'renders the aeon title tooltip' do - expect(subject.css('a').attribute('title').text).to eq('Request to view in Reading Room') + it 'does not render a tooltip' do + expect(subject.css('a').attribute('title')).to be_falsey end it 'includes aeon=true in the link url' do expect(subject.css('a').attribute('href').text).to eq('/requests/123?aeon=true&mfhd=456') diff --git a/spec/features/accessibility_spec.rb b/spec/features/accessibility_spec.rb index 26d6d9b4a..303d59489 100644 --- a/spec/features/accessibility_spec.rb +++ b/spec/features/accessibility_spec.rb @@ -24,7 +24,7 @@ expect(page).to be_axe_clean .according_to(:wcag2a, :wcag2aa, :wcag21a, :wcag21aa) .excluding('#startOverLink') - .excluding('.blacklight-series_display[dir="ltr"]:nth-child(1) > .more-in-series[title=""][data-toggle="tooltip"]') + .excluding('.blacklight-series_display[dir="ltr"]:nth-child(1) > .more-in-series[title=""]') end end context "search results page" do diff --git a/spec/features/scsb_holdings_spec.rb b/spec/features/scsb_holdings_spec.rb index d01d647b7..3c6fad269 100644 --- a/spec/features/scsb_holdings_spec.rb +++ b/spec/features/scsb_holdings_spec.rb @@ -15,7 +15,7 @@ it 'displays on-site access for supervised use items' do visit '/catalog?search_field=all_fields&q=SCSB-6593031' expect(page).to have_content 'On-site access' - expect(page).to have_selector 'span.icon-request-reading-room' + expect(page).not_to have_selector 'span.icon-request-reading-room' end it 'includes a data attribute to trigger availability check against scsb' do visit '/catalog?search_field=all_fields&q=SCSB-2143785' diff --git a/spec/helpers/holding_block_spec.rb b/spec/helpers/holding_block_spec.rb index 043c66de9..7bfefb58b 100644 --- a/spec/helpers/holding_block_spec.rb +++ b/spec/helpers/holding_block_spec.rb @@ -176,7 +176,7 @@ context '#holding_block_search' do before { stub_holding_locations } let(:expected_result) do - "" + "" end it 'matches the expected result' do expect(search_result).to eq(expected_result) @@ -232,7 +232,7 @@ end it 'includes on-site requirement' do - expect(search_result).to include('On-site by request') + expect(search_result).not_to include('On-site by request') end end @@ -248,7 +248,7 @@ ] end let(:expected_result) do - "" + "" end it 'matches the expected result' do expect(search_result).to eq(expected_result) @@ -292,7 +292,7 @@ before { stub_holding_locations } let(:expected_result) do - "" + "" end it 'matches the expected result' do expect(search_result).to eq(expected_result) @@ -309,7 +309,7 @@ it 'includes the online badge and link since there is an electronic access link' do expect(search_result).to include ">Online
  • Loading...
    Rare Books and Special Collections - Rare Books and Special Collections - Reference Collection in Dulles Reading Room » PS3539.A74Z93 2000
    • " + "" end it 'matches the expected result' do expect(search_result).to eq(expected_result) @@ -394,7 +394,7 @@ allow(Flipflop).to receive(:firestone_locator?).and_return(false) end let(:expected_result) do - "" + "" end it 'matches the expected result' do expect(search_result).to eq(expected_result) @@ -449,7 +449,7 @@ before { stub_holding_locations } let(:expected_result) do - "" + "" end it 'matches the expected result' do expect(search_result).to eq(expected_result) @@ -480,13 +480,13 @@ context '#holding_block_search with embargoed thesis' do before { stub_holding_locations } let(:expected_result) do - "" + "" end it 'matches the expected result' do expect(search_result).to eq(expected_result) end it 'says that the material is under embargo' do - expect(search_result_thesis_embargoed).to include('title="Availability: Material under embargo"') + expect(search_result_thesis_embargoed).not_to include('title="Availability: Material under embargo"') end end @@ -497,7 +497,7 @@ expect(show_result_thesis.last).to include 'Reading Room Request' end it 'displays a Reading Room Request Tooltip' do - expect(show_result_thesis.last).to have_selector "*[title='Request to view in Reading Room']" + expect(show_result_thesis.last).not_to have_selector "*[title='Request to view in Reading Room']" end it 'displays a reading room request as Always requestable' do expect(show_result_thesis.last).to have_selector '.service-always-requestable' @@ -635,7 +635,7 @@ expect(show_result.last).to have_link(t('blacklight.holdings.browse'), href: "/browse/call_numbers?q=#{CGI.escape call_number}") end it 'tooltip for the call number browse' do - expect(show_result.last).to have_selector "*[title='Browse: #{call_number}']" + expect(show_result.last).not_to have_selector "*[title='Browse: #{call_number}']" end it 'tags the holding record id' do expect(show_result.last).to have_selector "*[data-holding-id='22270490550006421']" diff --git a/spec/javascript/orangelight/availability.spec.js b/spec/javascript/orangelight/availability.spec.js index a8e4d3fcd..6f3be8924 100644 --- a/spec/javascript/orangelight/availability.spec.js +++ b/spec/javascript/orangelight/availability.spec.js @@ -98,7 +98,7 @@ describe('AvailabilityUpdater', function() { '
    '+ ' '+ '
  • '+ - ' '+ + ' '+ '
    • '+ ' '+ ''; @@ -245,14 +245,14 @@ describe('AvailabilityUpdater', function() { 'href="/catalog/9972879153506421/stackmap?loc=engineer$stacks&cn=QP355.2%20.P76%202013">Where to find it '+ ' '+ ' '+ - ' QP355.2 .P76 2013 Browse related items '+ ' '+ ' '+ ' '+ ' '+ ' '+ - ' Request'+ + ' Request'+ ' '+ ' '+ ' '+ @@ -264,14 +264,14 @@ describe('AvailabilityUpdater', function() { 'data-location-map="lewis$resterm" data-blacklight-modal="trigger" href="/catalog/9972879153506421/stackmap?loc=lewis$resterm">Where to find it'+ ' '+ ' '+ - ' QP355.2 .P76 2013 Browse related items '+ ' '+ ' '+ ' '+ ' '+ ' '+ - ' Request'+ ' '+ ' '+ @@ -410,7 +410,7 @@ describe('AvailabilityUpdater', function() { ' ' + ' ' + '
  • ' + - ' ' + + ' ' + '
    • ' + ''; @@ -454,7 +454,7 @@ describe('AvailabilityUpdater', function() { ' ' + ' ' + ' HB172 .G664 2016' + - ' ' + ' Browse related items' + ' ' + @@ -510,7 +510,7 @@ describe('AvailabilityUpdater', function() { ' ' + ' ' + ' ' + - ' Request' + + ' Request' + ' ' + ' ' + ' ' + @@ -588,7 +588,7 @@ describe('AvailabilityUpdater', function() { '
    ' + '
    ' + '
    ' + '
    ' + @@ -661,7 +661,7 @@ describe('AvailabilityUpdater', function() { ' Available' + '' + '' + - 'Request' + + 'Request' + ''; ''; const res_share_response = { diff --git a/spec/processors/orangelight/browse_link_processor_spec.rb b/spec/processors/orangelight/browse_link_processor_spec.rb index cb63460f4..0179cc994 100644 --- a/spec/processors/orangelight/browse_link_processor_spec.rb +++ b/spec/processors/orangelight/browse_link_processor_spec.rb @@ -15,8 +15,8 @@ it 'adds search and browse links' do expect(rendered).to eq [ - '1 '\ - '[Browse]' + '1 '\ + '[Browse]' ] end context 'name-title field' do @@ -36,8 +36,8 @@ let(:document) { SolrDocument.new({ name_title_browse_s: ['1'] }) } it 'adds name-title search and browse links' do expect(rendered).to eq [ - '1 '\ - '[Browse]' + '1 '\ + '[Browse]' ] end end diff --git a/spec/processors/orangelight/series_link_processor_spec.rb b/spec/processors/orangelight/series_link_processor_spec.rb index 337dd551f..46062c78b 100644 --- a/spec/processors/orangelight/series_link_processor_spec.rb +++ b/spec/processors/orangelight/series_link_processor_spec.rb @@ -15,9 +15,9 @@ it 'adds links if they also appear in the more_in_this_series_t field' do expect(rendered.first).to eq('Offenbach, Jacques, 1819-1880. Operas. Selections (Bourg) '\ - ''\ + 'dir="ltr" href="/catalog?q1=Offenbach%2C+Jacques%2C+1819-1880.+Operas.+Selections+Bourg&f1=in_series&search_field=advanced">'\ '[More in this series]') end @@ -36,9 +36,9 @@ let(:document) { SolrDocument.new({ 'more_in_this_series_t': ['Offenbach, Jacques, 1819-1880. Operas'] }) } it 'adds the link' do expect(rendered.first).to eq('Offenbach, Jacques, 1819-1880. Operas. Selections (Bourg) '\ - ''\ + 'dir="ltr" href="/catalog?q1=Offenbach%2C+Jacques%2C+1819-1880.+Operas&f1=in_series&search_field=advanced">'\ '[More in this series]') end end diff --git a/spec/requests/request_spec.rb b/spec/requests/request_spec.rb index 019c78ed5..47ae1cf68 100644 --- a/spec/requests/request_spec.rb +++ b/spec/requests/request_spec.rb @@ -122,10 +122,10 @@ fullsubject.each_with_index do |subject, i| sub_component[i].each do |component| c = Regexp.escape(component) - expect(response.body).to include('class="search-subject" data-toggle="'\ - 'tooltip" data-original-title="Search: '\ - "#{subject[/.*#{c}/]}\" title=\"Search: "\ - "#{subject[/.*#{c}/]}\" href=\"/?f[subject_facet][]="\ + expect(response.body).to include('class="search-subject" '\ + 'data-original-title="Search: '\ + "#{subject[/.*#{c}/]}\" "\ + "href=\"/?f[subject_facet][]="\ "#{CGI.escape subject[/.*#{c}/]}\">"\ "#{component}") end @@ -149,13 +149,13 @@ get '/catalog?&search_field=all_fields&q=9947053043506421' expect(response.body).to include('dir="rtl" style="float: right;" href="'\ "/catalog/#{doc_id}\">#{title_vern}") - expect(response.body).to include('
  • "\ + expect(response.body).to include('
  • "\ "#{author}") - expect(response.body).to include('
  • #{author_vern}") end it 'adds ltr rtl dir for title and other fields in document view' do diff --git a/spec/services/physical_holdings_markup_builder_spec.rb b/spec/services/physical_holdings_markup_builder_spec.rb index f2df0d201..534d70622 100644 --- a/spec/services/physical_holdings_markup_builder_spec.rb +++ b/spec/services/physical_holdings_markup_builder_spec.rb @@ -161,7 +161,7 @@ expect(request_placeholder_markup).to include 'data-aeon="false"' expect(request_placeholder_markup).to include 'data-holding-id="3668455"' expect(request_placeholder_markup).to include '