Fix Devise Helper Controller

spec/spec_helper.rb

@@ -39,7 +39,7 @@ Capybara.register_driver :poltergeist do |app|
 end
 
 
-Capybara.default_wait_time = 1
+Capybara.default_max_wait_time = 1
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -107,7 +107,7 @@ RSpec.configure do |config|
   config.order = 'random'
 
   config.include Devise::TestHelpers, type: :view
-  config.include Devise::TestHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers
 
   config.include FactoryGirl::Syntax::Methods
 

spec/support/controller_helpers.rb

@@ -1,4 +1,4 @@
 
 RSpec.configure do |config|
-  config.include Devise::TestHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers
 end

spec/support/wait_for_ajax.rb

@@ -1,7 +1,7 @@
 # spec/support/wait_for_ajax.rb
 module WaitForAjax
   def wait_for_ajax
-    Timeout.timeout(Capybara.default_wait_time) do
+    Timeout.timeout(Capybara.default_max_wait_time) do
       loop until finished_all_ajax_requests?
     end
   end