0
@@ -195,7 +195,14 @@ module Spec
0
                     @first_render ||= args[0] unless args[0] =~ /^layouts/
0
                   end
0
                   
0
-                  define_method :pick_template do |*args|
0
+                  # BC branching code: in Rails #6f932b4 :pick_template became :_pick_template
0
+                  pick_template_method_name = if ::ActionView::Base.instance_methods.include?('_pick_template')
0
+                    :_pick_template
0
+                  else
0
+                    :pick_template
0
+                  end
0
+                  
0
+                  define_method pick_template_method_name do |*args|
0
                     @_first_render ||= args[0] unless args[0] =~ /^layouts/
0
                     PickedTemplate.new
0
                   end