Merge branch 'rs-issue-35701' into 'master'

Ensure DeviseHelpers is loaded before inclusion in LoginHelpers Closes #35701 See merge request !13261
2017-08-04 13:33:58 +00:00 · 2017-08-04 13:33:58 +00:00 · 8fff6a3422
parent 990feb9f2b f7a61c4a44
commit 8fff6a3422
1 changed files with 2 additions and 0 deletions
--- a/spec/support/login_helpers.rb
+++ b/spec/support/login_helpers.rb
@ -1,3 +1,5 @@
+require_relative 'devise_helpers'
+
 module LoginHelpers
  include DeviseHelpers