Merge pull request #936 from projectblacklight/use_facet_field_label

render_filter_element should use facet_field_label for i18n. Fixes #935

Author: cbeer

app/helpers/blacklight/render_constraints_helper_behavior.rb

@@ -68,8 +68,7 @@ def render_filter_element(facet, values, localized_params)
 
     safe_join(values.map do |val|
       next if val.blank? # skip empty string
-      render_constraint_element( blacklight_config.facet_fields[facet].label,
-                  facet_display_value(facet, val),
+      render_constraint_element( facet_field_label(facet), facet_display_value(facet, val),
                   :remove => search_action_path(remove_facet_params(facet, val, localized_params)),
                   :classes => ["filter", "filter-" + facet.parameterize]
                 )

spec/helpers/render_constraints_helper_spec.rb

@@ -2,6 +2,12 @@
 
 describe RenderConstraintsHelper do
 
+  let(:config) do
+    Blacklight::Configuration.new do |config|
+      config.add_facet_field 'type'
+    end
+  end
+
   before do
     # the helper methods below infer paths from the current route
     controller.request.path_parameters["controller"] = 'catalog'
@@ -18,29 +24,25 @@
 
   describe '#render_filter_element' do
     before do
-      @config = Blacklight::Configuration.new do |config|
-        config.add_facet_field 'type'
-      end
-      helper.stub(:blacklight_config => @config)
+      allow(helper).to receive(:blacklight_config).and_return(config)
+      expect(helper).to receive(:facet_field_label).with('type').and_return("Item Type")
     end
+    subject { helper.render_filter_element('type', ['journal'], {:q=>'biz'}) }
+
     it "should have a link relative to the current url" do
-      result = helper.render_filter_element('type', ['journal'], {:q=>'biz'})
-      expect(result).to have_link "Remove constraint Type: journal", href: "/catalog?q=biz"
+      expect(subject).to have_link "Remove constraint Item Type: journal", href: "/catalog?q=biz"
+      expect(subject).to have_selector ".filterName", text: 'Item Type'
     end
   end
 
   describe "#render_constraints_filters" do
     before do
-      @config = Blacklight::Configuration.new do |config|
-        config.add_facet_field 'type'
-      end
-      helper.stub(:blacklight_config => @config)
+      allow(helper).to receive(:blacklight_config).and_return(config)
     end
+    subject { helper.render_constraints_filters(:f=>{'type'=>['']}) }
 
     it "should render nothing for empty facet limit param" do
-      rendered = helper.render_constraints_filters(:f=>{'type'=>['']})
-      expect(rendered).to be_blank
+      expect(subject).to be_blank
     end
   end
-
 end