1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 06975ffa2f..f0ed3425de 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -167,12 +167,12 @@ module ActionView
         @frozen_formats = true
       end
 
-      # Overload formats= to reject ["*/*"] values.
+      # Overload formats= to expand ["*/*"] values and automatically
+      # add :html as fallback to :js.
       def formats=(values)
-        if values && values.size == 1
-          value = values.first
-          values = nil    if value == "*/*"
-          values << :html if value == :js
+        if values
+          values.concat(_formats_defaults) if values.delete "*/*"
+          values << :html if values == [:js]
         end
         super(values)
       end