Fix rails/rails#19419 for all field labels

projectblacklight · Mar 26, 2015 · 6220777 · 6220777
1 parent cc8be70
commit 6220777
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/app/helpers/blacklight/configuration_helper_behavior.rb b/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

diff --git a/spec/helpers/configuration_helper_spec.rb b/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