Fix nesting on sessions/new.

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.
 
+  - if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled?
+    .clearfix
+      = render 'devise/shared/omniauth_box'

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