Merge pull request #3796 from projectblacklight/jcoyne-patch-1

Simplify Devise test helpers inclusion

Author: jcoyne

spec/spec_helper.rb

@@ -59,12 +59,7 @@
   # instead of true.
   config.use_transactional_fixtures = true
 
-  if defined? Devise::Test::ControllerHelpers
-    config.include Devise::Test::ControllerHelpers, type: :controller
-  else
-    config.include Devise::TestHelpers, type: :controller
-    config.include Devise::TestHelpers, type: :i18n
-  end
+  config.include Devise::Test::ControllerHelpers, type: :controller
 
   config.infer_spec_type_from_file_location!
   config.include PresenterTestHelpers, type: :presenter