DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix Devise Helper Controller

Browse source
This commit is contained in:
Xavier J 2016-11-14 17:50:06 +01:00
parent d7fdf22abb
commit bd3df8de22
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spec/spec_helper.rb
View file

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

2
spec/support/controller_helpers.rb
View file

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

2
spec/support/wait_for_ajax.rb
View file

@ -1,7 +1,7 @@
# spec/support/wait_for_ajax.rb # spec/support/wait_for_ajax.rb
module WaitForAjax module WaitForAjax
def wait_for_ajax 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? loop until finished_all_ajax_requests?
end end
end end