Moved strings to locales + Added 'Issues' button + Fixed typo in tests

[rails.git] / test / integration / user_login_test.rb

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index 4dc4ac8f36114b979b413f39bf7e9405b38127ab..c13dbfaaba2c3f7f2225aaee704924582e70881d 100644 (file)
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -12,28 +12,15 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     OmniAuth.config.mock_auth[:google] = nil
     OmniAuth.config.mock_auth[:facebook] = nil
     OmniAuth.config.mock_auth[:windowslive] = nil
     OmniAuth.config.mock_auth[:google] = nil
     OmniAuth.config.mock_auth[:facebook] = nil
     OmniAuth.config.mock_auth[:windowslive] = nil

+    OmniAuth.config.mock_auth[:github] = nil

     OmniAuth.config.test_mode = false
   end
 
   def test_login_email_password_normal
     user = users(:normal_user)
 
     OmniAuth.config.test_mode = false
   end
 
   def test_login_email_password_normal
     user = users(:normal_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.email, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email, "test"

 
 

-    post "/login", :username => user.email, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "test"
   end
     assert_template "changeset/history"
     assert_select "span.username", "test"
   end


@@ -41,22 +28,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_email_password_normal_upcase
     user = users(:normal_user)
 
   def test_login_email_password_normal_upcase
     user = users(:normal_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.email.upcase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email.upcase, "test"

 
 

-    post "/login", :username => user.email.upcase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "TEST"
   end
     assert_template "changeset/history"
     assert_select "span.username", "TEST"
   end


@@ -64,22 +37,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_email_password_normal_titlecase
     user = users(:normal_user)
 
   def test_login_email_password_normal_titlecase
     user = users(:normal_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.email.titlecase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email.titlecase, "test"

 
 

-    post "/login", :username => user.email.titlecase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "login"
     assert_select "span.username", false
   end
     assert_template "login"
     assert_select "span.username", false
   end


@@ -87,22 +46,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_email_password_public
     user = users(:public_user)
 
   def test_login_email_password_public
     user = users(:public_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.email, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email, "test"

 
 

-    post "/login", :username => user.email, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end
     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end


@@ -110,22 +55,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_email_password_public_upcase
     user = users(:public_user)
 
   def test_login_email_password_public_upcase
     user = users(:public_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.email.upcase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email.upcase, "test"

 
 

-    post "/login", :username => user.email.upcase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end
     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end


@@ -133,22 +64,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_email_password_public_titlecase
     user = users(:public_user)
 
   def test_login_email_password_public_titlecase
     user = users(:public_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.email.titlecase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email.titlecase, "test"

 
 

-    post "/login", :username => user.email.titlecase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end
     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end


@@ -156,223 +73,92 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_email_password_inactive
     user = users(:inactive_user)
 
   def test_login_email_password_inactive
     user = users(:inactive_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.email, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email, "test2"

 
 

-    post "/login", :username => user.email, :password => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "confirm"
     assert_template "confirm"

+    assert_select "span.username", false

   end
 
   def test_login_email_password_inactive_upcase
     user = users(:inactive_user)
 
   end
 
   def test_login_email_password_inactive_upcase
     user = users(:inactive_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.email.upcase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email.upcase, "test2"

 
 

-    post "/login", :username => user.email.upcase, :password => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "confirm"
     assert_template "confirm"

+    assert_select "span.username", false

   end
 
   def test_login_email_password_inactive_titlecase
     user = users(:inactive_user)
 
   end
 
   def test_login_email_password_inactive_titlecase
     user = users(:inactive_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.email.titlecase, "test2"

 
 

-    post "/login", :username => user.email.titlecase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
-
-    post "/login", :username => user.email.titlecase, :password => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "confirm"
     assert_template "confirm"

+    assert_select "span.username", false

   end
 
   def test_login_email_password_suspended
     user = users(:suspended_user)
 
   end
 
   def test_login_email_password_suspended
     user = users(:suspended_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.email, "test"

 
 

-    post "/login", :username => user.email, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
-
-    post "/login", :username => user.email, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "login"
     assert_template "login"

+    assert_select "span.username", false

     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_email_password_suspended_upcase
     user = users(:suspended_user)
 
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_email_password_suspended_upcase
     user = users(:suspended_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.email.upcase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email.upcase, "test"

 
 

-    post "/login", :username => user.email.upcase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "login"
     assert_template "login"

+    assert_select "span.username", false

     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_email_password_suspended_titlecase
     user = users(:suspended_user)
 
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_email_password_suspended_titlecase
     user = users(:suspended_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.email.titlecase, "test"

 
 

-    post "/login", :username => user.email.titlecase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
-
-    post "/login", :username => user.email.titlecase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "login"
     assert_template "login"

+    assert_select "span.username", false

     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_email_password_blocked
     user = users(:blocked_user)
 
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_email_password_blocked
     user = users(:blocked_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.email, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email, "test"

 
 

-    post "/login", :username => user.email, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "user_blocks/show"
     assert_template "user_blocks/show"

+    assert_select "span.username", "blocked"

   end
 
   def test_login_email_password_blocked_upcase
     user = users(:blocked_user)
 
   end
 
   def test_login_email_password_blocked_upcase
     user = users(:blocked_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.email.upcase, "test"

 
 

-    post "/login", :username => user.email.upcase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
-
-    post "/login", :username => user.email.upcase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "user_blocks/show"
     assert_template "user_blocks/show"

+    assert_select "span.username", "blocked"

   end
 
   def test_login_email_password_blocked_titlecase
     user = users(:blocked_user)
 
   end
 
   def test_login_email_password_blocked_titlecase
     user = users(:blocked_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.email.titlecase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email.titlecase, "test"

 
 

-    post "/login", :username => user.email.titlecase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "user_blocks/show"
     assert_template "user_blocks/show"

+    assert_select "span.username", "blocked"

   end
 
   def test_login_username_password_normal
     user = users(:normal_user)
 
   end
 
   def test_login_username_password_normal
     user = users(:normal_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.display_name, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.display_name, "test"

 
 

-    post "/login", :username => user.display_name, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "test"
   end
     assert_template "changeset/history"
     assert_select "span.username", "test"
   end


@@ -380,22 +166,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_username_password_normal_upcase
     user = users(:normal_user)
 
   def test_login_username_password_normal_upcase
     user = users(:normal_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name.upcase, "test"

 
 

-    post "/login", :username => user.display_name.upcase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
-
-    post "/login", :username => user.display_name.upcase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "TEST"
   end
     assert_template "changeset/history"
     assert_select "span.username", "TEST"
   end


@@ -403,22 +175,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_username_password_normal_titlecase
     user = users(:normal_user)
 
   def test_login_username_password_normal_titlecase
     user = users(:normal_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name.titlecase, "test"

 
 

-    post "/login", :username => user.display_name.titlecase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
-
-    post "/login", :username => user.display_name.titlecase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "login"
     assert_select "span.username", false
   end
     assert_template "login"
     assert_select "span.username", false
   end


@@ -426,22 +184,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_username_password_public
     user = users(:public_user)
 
   def test_login_username_password_public
     user = users(:public_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name, "test"

 
 

-    post "/login", :username => user.display_name, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
-
-    post "/login", :username => user.display_name, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end
     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end


@@ -449,22 +193,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_username_password_public_upcase
     user = users(:public_user)
 
   def test_login_username_password_public_upcase
     user = users(:public_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.display_name.upcase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.display_name.upcase, "test"

 
 

-    post "/login", :username => user.display_name.upcase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end
     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end


@@ -472,22 +202,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_username_password_public_titlecase
     user = users(:public_user)
 
   def test_login_username_password_public_titlecase
     user = users(:public_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.display_name.titlecase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.display_name.titlecase, "test"

 
 

-    post "/login", :username => user.display_name.titlecase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end
     assert_template "changeset/history"
     assert_select "span.username", "test2"
   end


@@ -495,217 +211,92 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_username_password_inactive
     user = users(:inactive_user)
 
   def test_login_username_password_inactive
     user = users(:inactive_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name, "test2"

 
 

-    post "/login", :username => user.display_name, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
-
-    post "/login", :username => user.display_name, :password => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "confirm"
     assert_template "confirm"

+    assert_select "span.username", false

   end
 
   def test_login_username_password_inactive_upcase
     user = users(:inactive_user)
 
   end
 
   def test_login_username_password_inactive_upcase
     user = users(:inactive_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name.upcase, "test2"

 
 

-    post "/login", :username => user.display_name.upcase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
-
-    post "/login", :username => user.display_name.upcase, :password => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "confirm"
     assert_template "confirm"

+    assert_select "span.username", false

   end
 
   def test_login_username_password_inactive_titlecase
     user = users(:inactive_user)
 
   end
 
   def test_login_username_password_inactive_titlecase
     user = users(:inactive_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.display_name.titlecase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.display_name.titlecase, "test2"

 
 

-    post "/login", :username => user.display_name.titlecase, :password => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "confirm"
     assert_template "confirm"

+    assert_select "span.username", false

   end
 
   def test_login_username_password_suspended
     user = users(:suspended_user)
 
   end
 
   def test_login_username_password_suspended
     user = users(:suspended_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.display_name, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.display_name, "test"

 
 

-    post "/login", :username => user.display_name, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "login"
     assert_template "login"

+    assert_select "span.username", false

     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_username_password_suspended_upcase
     user = users(:suspended_user)
 
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_username_password_suspended_upcase
     user = users(:suspended_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.display_name.upcase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.display_name.upcase, "test"

 
 

-    post "/login", :username => user.display_name.upcase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "login"
     assert_template "login"

+    assert_select "span.username", false

     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_username_password_suspended_titlecase
     user = users(:suspended_user)
 
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_username_password_suspended_titlecase
     user = users(:suspended_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.display_name.titlecase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.display_name.titlecase, "test"

 
 

-    post "/login", :username => user.display_name.titlecase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "login"
     assert_template "login"

+    assert_select "span.username", false

     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_username_password_blocked
     user = users(:blocked_user)
 
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_username_password_blocked
     user = users(:blocked_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name.upcase, "test"

 
 

-    post "/login", :username => user.display_name, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
-
-    post "/login", :username => user.display_name, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "user_blocks/show"
     assert_template "user_blocks/show"

+    assert_select "span.username", "blocked"

   end
 
   def test_login_username_password_blocked_upcase
     user = users(:blocked_user)
 
   end
 
   def test_login_username_password_blocked_upcase
     user = users(:blocked_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.display_name.upcase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.display_name, "test"

 
 

-    post "/login", :username => user.display_name.upcase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "user_blocks/show"
     assert_template "user_blocks/show"

+    assert_select "span.username", "blocked"

   end
 
   def test_login_username_password_blocked_titlecase
     user = users(:blocked_user)
 
   end
 
   def test_login_username_password_blocked_titlecase
     user = users(:blocked_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
-
-    post "/login", :username => user.display_name.titlecase, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.display_name.titlecase, "test"

 
 

-    post "/login", :username => user.display_name.titlecase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "user_blocks/show"
     assert_template "user_blocks/show"

+    assert_select "span.username", "blocked"

   end
 
   def test_login_email_password_remember_me
     user = users(:normal_user)
 
   end
 
   def test_login_email_password_remember_me
     user = users(:normal_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.email, "test", "yes"

 
 

-    post "/login", :username => user.email, :password => "test", :remember_me => true, :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "test"
     assert session.key?(:_remember_for)
     assert_template "changeset/history"
     assert_select "span.username", "test"
     assert session.key?(:_remember_for)


@@ -714,16 +305,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_username_password_remember_me
     user = users(:normal_user)
 
   def test_login_username_password_remember_me
     user = users(:normal_user)
 

-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name, "test", "yes"

 
 

-    post "/login", :username => user.display_name, :password => "test", :remember_me => true, :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success

     assert_template "changeset/history"
     assert_select "span.username", "test"
     assert session.key?(:_remember_for)
     assert_template "changeset/history"
     assert_select "span.username", "test"
     assert session.key?(:_remember_for)


@@ -1146,4 +729,132 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_template "user/new"
     assert_select "span.username", false
   end
     assert_template "user/new"
     assert_select "span.username", false
   end

+
+  def test_login_github_success
+    OmniAuth.config.add_mock(:github, :uid => "123456789")
+
+    get "/login", :referer => "/history"
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "user/login"
+    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "changeset/history"
+    assert_select "span.username", "githubuser"
+  end
+
+  def test_login_github_connection_failed
+    OmniAuth.config.mock_auth[:github] = :connection_failed
+
+    get "/login", :referer => "/history"
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "user/login"
+    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    follow_redirect!
+    assert_response :redirect
+    assert_redirected_to auth_failure_path(:strategy => "github", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_select "span.username", false
+  end
+
+  def test_login_github_invalid_credentials
+    OmniAuth.config.mock_auth[:github] = :invalid_credentials
+
+    get "/login", :referer => "/history"
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "user/login"
+    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    follow_redirect!
+    assert_response :redirect
+    assert_redirected_to auth_failure_path(:strategy => "github", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_select "span.username", false
+  end
+
+  def test_login_github_unknown
+    OmniAuth.config.add_mock(:github, :uid => "987654321")
+
+    get "/login", :referer => "/history"
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "user/login"
+    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "user/new"
+    assert_select "span.username", false
+  end
+
+  private
+
+  def try_password_login(username, password, remember_me = nil)
+    get "/login"
+    assert_response :redirect
+    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "input#username", 1 do
+      assert_select "[value]", false
+    end
+    assert_select "input#password", 1 do
+      assert_select "[value=?]", ""
+    end
+    assert_select "input#remember_me", 1 do
+      assert_select "[checked]", false
+    end
+
+    post "/login", :username => username, :password => "wrong", :remember_me => remember_me, :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "input#username", 1 do
+      assert_select "[value=?]", username
+    end
+    assert_select "input#password", 1 do
+      assert_select "[value=?]", ""
+    end
+    assert_select "input#remember_me", 1 do
+      assert_select "[checked]", remember_me == "yes"
+    end
+
+    post "/login", :username => username, :password => password, :remember_me => remember_me, :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+  end

 end
 end