Commit 44571167 authored by Bryce Johnson's avatar Bryce Johnson

Fix nesting on sessions/new.

parent 1fd09260
...@@ -12,12 +12,11 @@ ...@@ -12,12 +12,11 @@
- if signin_enabled? && signup_enabled? - if signin_enabled? && signup_enabled?
= render 'devise/shared/signup_box' = render 'devise/shared/signup_box'
- if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled?
.clearfix
= render 'devise/shared/omniauth_box'
-# Show a message if none of the mechanisms above are enabled -# Show a message if none of the mechanisms above are enabled
- if !signin_enabled? && !ldap_enabled? && !(omniauth_enabled? && devise_mapping.omniauthable?) - if !signin_enabled? && !ldap_enabled? && !(omniauth_enabled? && devise_mapping.omniauthable?)
%div %div
No authentication methods configured. No authentication methods configured.
- if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled?
.clearfix
= render 'devise/shared/omniauth_box'
...@@ -33,7 +33,7 @@ module LoginHelpers ...@@ -33,7 +33,7 @@ module LoginHelpers
fill_in "user_login", with: user.email fill_in "user_login", with: user.email
fill_in "user_password", with: "12345678" fill_in "user_password", with: "12345678"
check 'user_remember_me' if remember check 'user_remember_me' if remember
first('.login-box').click_button('Sign in') click_button "Sign in"
Thread.current[:current_user] = user Thread.current[:current_user] = user
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment