Merge remote-tracking branch 'upstream/pull/4356'

[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 5b39ea76a44be70480178b2011a466f57369092a..a9c64bea4f22377f1eaf594e5a98bb06c514810c 100644 (file)
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -9,7 +9,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     OmniAuth.config.mock_auth[:openid] = nil
     OmniAuth.config.mock_auth[:google] = nil
     OmniAuth.config.mock_auth[:facebook] = nil
     OmniAuth.config.mock_auth[:openid] = nil
     OmniAuth.config.mock_auth[:google] = nil
     OmniAuth.config.mock_auth[:facebook] = nil

-    OmniAuth.config.mock_auth[:windowslive] = nil
+    OmniAuth.config.mock_auth[:microsoft] = nil

     OmniAuth.config.mock_auth[:github] = nil
     OmniAuth.config.mock_auth[:wikipedia] = nil
     OmniAuth.config.test_mode = false
     OmniAuth.config.mock_auth[:github] = nil
     OmniAuth.config.mock_auth[:wikipedia] = nil
     OmniAuth.config.test_mode = false


@@ -113,7 +113,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     assert_template "sessions/new"
     assert_select "span.username", false
 
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end


@@ -125,7 +125,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     assert_template "sessions/new"
     assert_select "span.username", false
 
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end


@@ -137,7 +137,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     assert_template "sessions/new"
     assert_select "span.username", false
 
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end


@@ -270,7 +270,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     assert_template "sessions/new"
     assert_select "span.username", false
 
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end


@@ -282,7 +282,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     assert_template "sessions/new"
     assert_select "span.username", false
 
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end


@@ -294,7 +294,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     assert_template "sessions/new"
     assert_select "span.username", false
 
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end


@@ -409,7 +409,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end


@@ -457,7 +457,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_select "div.alert.alert-danger", "Connection to authentication provider failed"

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


@@ -482,7 +482,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"

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


@@ -572,7 +572,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end


@@ -621,7 +621,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_select "div.alert.alert-danger", "Connection to authentication provider failed"

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


@@ -645,7 +645,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"

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


@@ -758,7 +758,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end


@@ -805,7 +805,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_select "div.alert.alert-danger", "Connection to authentication provider failed"

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


@@ -829,7 +829,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"

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


@@ -853,9 +853,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_select "span.username", false
   end
 
     assert_select "span.username", false
   end
 

-  def test_login_windowslive_success
-    user = create(:user, :auth_provider => "windowslive", :auth_uid => "1234567890")
-    OmniAuth.config.add_mock(:windowslive, :uid => user.auth_uid)
+  def test_login_microsoft_success
+    user = create(:user, :auth_provider => "microsoft", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid)

 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect


@@ -863,9 +863,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "microsoft")

     follow_redirect!
     assert_response :redirect
     follow_redirect!
     follow_redirect!
     assert_response :redirect
     follow_redirect!


@@ -874,9 +874,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 

-  def test_login_windowslive_pending
-    user = create(:user, :pending, :auth_provider => "windowslive", :auth_uid => "1234567890")
-    OmniAuth.config.add_mock(:windowslive, :uid => user.auth_uid)
+  def test_login_microsoft_pending
+    user = create(:user, :pending, :auth_provider => "microsoft", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid)

 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect


@@ -884,9 +884,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "microsoft")

     follow_redirect!
     assert_response :redirect
     follow_redirect!
     follow_redirect!
     assert_response :redirect
     follow_redirect!


@@ -894,9 +894,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_template "confirm"
   end
 
     assert_template "confirm"
   end
 

-  def test_login_windowslive_suspended
-    user = create(:user, :suspended, :auth_provider => "windowslive", :auth_uid => "1234567890")
-    OmniAuth.config.add_mock(:windowslive, :uid => user.auth_uid)
+  def test_login_microsoft_suspended
+    user = create(:user, :suspended, :auth_provider => "microsoft", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid)

 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect


@@ -904,24 +904,24 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "microsoft")

     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
 
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
 

-  def test_login_windowslive_blocked
-    user = create(:user, :auth_provider => "windowslive", :auth_uid => "1234567890")
+  def test_login_microsoft_blocked
+    user = create(:user, :auth_provider => "microsoft", :auth_uid => "1234567890")

     create(:user_block, :needs_view, :user => user)
     create(:user_block, :needs_view, :user => user)

-    OmniAuth.config.add_mock(:windowslive, :uid => user.auth_uid)
+    OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid)

 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect


@@ -929,9 +929,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "microsoft")

     follow_redirect!
     assert_response :redirect
     follow_redirect!
     follow_redirect!
     assert_response :redirect
     follow_redirect!


@@ -940,8 +940,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 

-  def test_login_windowslive_connection_failed
-    OmniAuth.config.mock_auth[:windowslive] = :connection_failed
+  def test_login_microsoft_connection_failed
+    OmniAuth.config.mock_auth[:microsoft] = :connection_failed

 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect


@@ -949,23 +949,23 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "microsoft")

     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :redirect

-    assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
+    assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")

     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_select "div.alert.alert-danger", "Connection to authentication provider failed"

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

-  def test_login_windowslive_invalid_credentials
-    OmniAuth.config.mock_auth[:windowslive] = :invalid_credentials
+  def test_login_microsoft_invalid_credentials
+    OmniAuth.config.mock_auth[:microsoft] = :invalid_credentials

 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect


@@ -973,23 +973,23 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "microsoft")

     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :redirect

-    assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
+    assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")

     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"

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

-  def test_login_windowslive_unknown
-    OmniAuth.config.add_mock(:windowslive, :uid => "987654321")
+  def test_login_microsoft_unknown
+    OmniAuth.config.add_mock(:microsoft, :uid => "987654321")

 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect


@@ -997,9 +997,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "microsoft")

     follow_redirect!
     assert_response :redirect
     follow_redirect!
     follow_redirect!
     assert_response :redirect
     follow_redirect!


@@ -1068,7 +1068,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end


@@ -1115,7 +1115,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_select "div.alert.alert-danger", "Connection to authentication provider failed"

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


@@ -1139,7 +1139,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"

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


@@ -1223,7 +1223,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false
     assert_response :success
     assert_template "sessions/new"
     assert_select "span.username", false

-    assert_select "div.flash.error", /your account has been suspended/ do
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do

       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end
       assert_select "a[href='mailto:openstreetmap@example.com']", "support"
     end
   end


@@ -1270,7 +1270,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_select "div.alert.alert-danger", "Connection to authentication provider failed"

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


@@ -1294,7 +1294,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"
     follow_redirect!
     assert_response :success
     assert_template "sessions/new"

-    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"

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