[3.1-stable] layout directive not working with controller inheritance

[masterkain]

class ApplicationController < ActionController::Base
  protect_from_forgery
  layout Proc.new { |controller| controller.request.xhr? ? 'ajax' : 'application' }
end

class StoresController < ApplicationController
  def search
  end
end

When the search action is called through Ajax (passing the proper X-Requested-With:XMLHttpRequest header) only the 'application' layout will be rendered along with the view.

On the other side if we copy/move the layout declaration in StoresController it works.

[raviolicode]

These tests pass on 3-1-stable, can you give more information?

[masterkain]

I tried with a quick rspec 2 test: https://gist.github.com/1033747

[masterkain]

I narrowed down the problem, it has something to do with the pjax_rails gem, closing.
https://github.com/masterkain/pjax_rails/blob/master/lib/pjax.rb#L5

Thanks @raviolicode for chiming in.