2 files changed, 6 insertions, 0 deletions
diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb
index be2a662adc..22d1895560 100644
--- a/actionview/lib/action_view/base.rb
+++ b/actionview/lib/action_view/base.rb
@@ -213,6 +213,8 @@ module ActionView #:nodoc:
         context.lookup_context
       when Array
         ActionView::LookupContext.new(context)
+      when ActionView::PathSet
+        ActionView::LookupContext.new(context)
       when nil
         ActionView::LookupContext.new([])
       else
diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb
index ee8a110b44..1f6dbfc4a5 100644
--- a/actionview/test/template/render_test.rb
+++ b/actionview/test/template/render_test.rb
@@ -360,6 +360,10 @@ module RenderTestCases
     assert_deprecated do
       ActionView::Base.new ["/a"]
     end
+
+    assert_deprecated do
+      ActionView::Base.new ActionView::PathSet.new ["/a"]
+    end
   end
 
   def test_without_compiled_method_container_is_deprecated