Merge pull request #996 from projectblacklight/rails-42

Fix Rails 4.2 test failures

Author: jcoyne

app/views/catalog/_view_type_group.html.erb

@@ -3,9 +3,9 @@
   <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
     <%  document_index_views.each do |view, config| %>
-    <%= link_to url_for(params.merge(:view => view)), :title => t("blacklight.search.view_title.#{view}", default: t("blacklight.search.view.#{view}", default: blacklight_config.view[view].title)), :class => "btn btn-default view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
+    <%= link_to url_for(params.merge(:view => view)), :title => t(:"blacklight.search.view_title.#{view}", default: [:"blacklight.search.view.#{view}", blacklight_config.view[view].title || view.to_s]), :class => "btn btn-default view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
       <%= render_view_type_group_icon view %>
-        <span class="caption"><%= t("blacklight.search.view.#{view}") %></span>
+        <span class="caption"><%= t(:"blacklight.search.view.#{view}", default: blacklight_config.view[view].title || view.to_s) %></span>
       <% end %>
     <% end %>
   </div>

spec/helpers/render_constraints_helper_spec.rb

@@ -10,7 +10,7 @@
 
   before do
     # the helper methods below infer paths from the current route
-    controller.request.path_parameters["controller"] = 'catalog'
+    controller.request.path_parameters[:controller] = 'catalog'
     allow(helper).to receive(:search_action_path) do |*args|
       catalog_index_path *args
     end

spec/views/catalog/_view_type_group.html.erb_spec.rb

@@ -26,9 +26,9 @@
     end
     render partial: 'catalog/view_type_group'
     expect(rendered).to have_selector('.btn-group.view-type-group')
-    expect(rendered).to have_selector('.view-type-a', :text => 'A')
-    expect(rendered).to have_selector('.view-type-b', :text => 'B')
-    expect(rendered).to have_selector('.view-type-c', :text => 'C')
+    expect(rendered).to have_selector('.view-type-a', :text => 'a')
+    expect(rendered).to have_selector('.view-type-b', :text => 'b')
+    expect(rendered).to have_selector('.view-type-c', :text => 'c')
   end
 
 
@@ -40,9 +40,9 @@
       config.view.b
     end
     render partial: 'catalog/view_type_group'
-    expect(rendered).to have_selector('.active', :text => 'A')
-    expect(rendered).to_not have_selector('.active', :text => 'B')
-    expect(rendered).to have_selector('.btn', :text => 'B')
+    expect(rendered).to have_selector('.active', :text => 'a')
+    expect(rendered).to_not have_selector('.active', :text => 'b')
+    expect(rendered).to have_selector('.btn', :text => 'b')
   end
 
 end