diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-09-28 18:13:42 +0300 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-10-15 09:28:53 +0300 |
| commit | 445711675ca198660dcaee014cd4229b8eb266ab (patch) | |
| tree | c210693db2cf29611cf7151b0e43446370726772 | |
| parent | 1fd09260826413da928363c3199d4dfbb770d2c3 (diff) | |
Fix nesting on sessions/new.
| -rw-r--r-- | app/views/devise/sessions/new.html.haml | 15 | ||||
| -rw-r--r-- | spec/support/login_helpers.rb | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 2fb05b9456b..fa8e7979461 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -12,12 +12,11 @@ - if signin_enabled? && signup_enabled? = 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 - - if !signin_enabled? && !ldap_enabled? && !(omniauth_enabled? && devise_mapping.omniauthable?) - %div - No authentication methods configured. + -# Show a message if none of the mechanisms above are enabled + - if !signin_enabled? && !ldap_enabled? && !(omniauth_enabled? && devise_mapping.omniauthable?) + %div + No authentication methods configured. + - if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled? + .clearfix + = render 'devise/shared/omniauth_box' diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb index ea9edc85248..c0b3e83244d 100644 --- a/spec/support/login_helpers.rb +++ b/spec/support/login_helpers.rb @@ -33,7 +33,7 @@ module LoginHelpers fill_in "user_login", with: user.email fill_in "user_password", with: "12345678" check 'user_remember_me' if remember - first('.login-box').click_button('Sign in') + click_button "Sign in" Thread.current[:current_user] = user end |