Merge pull request #1171 from projectblacklight/rails-19419

Fix rails/rails#19419 for all field labels

Author: jcoyne

app/helpers/blacklight/configuration_helper_behavior.rb

@@ -118,7 +118,7 @@ def view_label view
   #   @param [Symbol] any number of additional keys
   #   @param [Symbol] ...
   def field_label *i18n_keys
-    first, *rest = i18n_keys
+    first, *rest = i18n_keys.compact
 
     t(first, default: rest)
   end

spec/helpers/configuration_helper_spec.rb

@@ -159,6 +159,13 @@
 
       label = helper.field_label :key_a, :key_b, "default text"
     end
+
+    it "should compact nil keys (fixes rails/rails#19419)" do
+      allow(helper).to receive(:t).with(:key_a, default: [:key_b])
+
+      label = helper.field_label :key_a, nil, :key_b
+
+    end
   end
 
   describe "#default_per_page" do