X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/480c17be58ded999ecf4f2918777e1368e28932e..f7b4793c5048e7e939e7d614bed2c1b2473433d3:/test/integration/user_login_test.rb

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index 155905ca9..d027334d0 100644
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 class UserLoginTest < ActionDispatch::IntegrationTest
-  fixtures :users, :user_blocks
+  fixtures :users, :user_roles
 
   def setup
     OmniAuth.config.test_mode = true
@@ -12,6 +12,7 @@ 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[:github] = nil
     OmniAuth.config.test_mode = false
   end
 
@@ -128,6 +129,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_email_password_blocked
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.email, "test"
 
@@ -137,6 +139,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_email_password_blocked_upcase
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.email.upcase, "test"
 
@@ -146,6 +149,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_email_password_blocked_titlecase
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.email.titlecase, "test"
 
@@ -266,6 +270,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_username_password_blocked
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.display_name.upcase, "test"
 
@@ -275,6 +280,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_username_password_blocked_upcase
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.display_name, "test"
 
@@ -284,6 +290,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_username_password_blocked_titlecase
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.display_name.titlecase, "test"
 
@@ -548,7 +555,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_template "changeset/history"
     assert_select "span.username", "openIDuser"
 
-    user = User.find_by_display_name("openIDuser")
+    user = User.find_by(:display_name => "openIDuser")
     assert_equal "google", user.auth_provider
     assert_equal "987654321", user.auth_uid
   end
@@ -729,6 +736,94 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     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)