Circular Dependency Error in Rails 4 during Rspec Request Specs

I have an app running on Rails 4 / Ruby 2. The frontend is being developed with Ember. When running rake spec, I'm getting the below exception. It seems to only happen in Rspec feature specs (not in dev mode). Also, it usually only happens if I run just the one feature spec; if I run the entire test suite, I don't usually get the error. The error is occurring because of this commit to Rails: https

[TokyoIncidents]

フロントエンド Backbone でこれと同じ現象が起こったけどこれしか方法ないの？

[patorash]

require_relativeで他のコントローラーを読んでおく必要があるのかな…？