spec/features/activity_page_spec.rb

@@ -2,7 +2,6 @@
 
 describe 'activity page', type: :feature, js: true do
   before do
-    include Devise::TestHelpers, type: :feature
     Capybara.current_driver = :poltergeist
   end
 

spec/features/admin_role_spec.rb

@@ -2,7 +2,6 @@
 
 describe 'Admin users', type: :feature, js: true do
   before do
-    include Devise::TestHelpers, type: :feature
     Capybara.current_driver = :selenium
     page.current_window.resize_to(1920, 1080)
   end

spec/features/course_creation_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 def set_up_suite
-  include Devise::TestHelpers, type: :feature
   Capybara.current_driver = :selenium
   page.current_window.resize_to(1920, 1080)
   stub_oauth_edit

spec/features/course_page_spec.rb

@@ -28,7 +28,6 @@ def js_visit(path, count=3)
 describe 'the course page', type: :feature, js: true do
   let(:es_wiktionary) { create(:wiki, language: 'es', project: 'wiktionary') }
   before do
-    include Devise::TestHelpers, type: :feature
     Capybara.current_driver = :poltergeist
     page.current_window.resize_to(1920, 1080)
 

spec/features/course_stats_spec.rb

@@ -22,6 +22,10 @@
   let(:articles)   { [article] }
   let(:users)      { [user] }
 
+  before do
+    Capybara.current_driver = :poltergeist
+  end
+
   it 'displays statistics about the course' do
     cu.update_cache
     course.update_cache

spec/rails_helper.rb

@@ -62,7 +62,7 @@
 
   config.include(JavascriptHelper, type: :feature)
 
-  config.include Devise::TestHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :controller
   # RSpec Rails can automatically mix in different behaviours to your tests
   # based on their file location, for example enabling you to call `get` and
   # `post` in specs under `spec/controllers`.