Merge remote-tracking branch 'openstreetmap/pull/1174'

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

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 1ff8f9a650409a99d0f4b9bda73405286d91e0cb..2bc17f711f7b2324049dff09b2318849c666299e 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -40,7 +40,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       end
       assert_response :success
       assert_template "user/new"
       end
       assert_response :success
       assert_template "user/new"

-      assert_equal response.headers["Content-Language"][0..1], locale.to_s[0..1] unless locale == :root
+      assert_equal locale.to_s, response.headers["Content-Language"] unless locale == :root

       assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
       assert_no_missing_translations
     end
       assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
       assert_no_missing_translations
     end


@@ -81,7 +81,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("User.count") do
         assert_difference("ActionMailer::Base.deliveries.size", 1) do
           post_via_redirect "/user/save", {},
       assert_difference("User.count") do
         assert_difference("ActionMailer::Base.deliveries.size", 1) do
           post_via_redirect "/user/save", {},

-                            { "HTTP_ACCEPT_LANGUAGE" => "#{locale}" }
+                            { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }

         end
       end
 
         end
       end
 


@@ -511,7 +511,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
         follow_redirect!
         assert_response :redirect
         assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
         follow_redirect!
         assert_response :redirect

-        assert_redirected_to auth_success_path(:provider => "windowslive")
+        assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/user/new")

         follow_redirect!
         assert_response :redirect
         assert_redirected_to "/user/terms"
         follow_redirect!
         assert_response :redirect
         assert_redirected_to "/user/terms"


@@ -542,7 +542,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
         follow_redirect!
         assert_response :redirect
         assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
         follow_redirect!
         assert_response :redirect

-        assert_redirected_to auth_success_path(:provider => "windowslive")
+        assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/user/new")

         follow_redirect!
         assert_response :redirect
         assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/user/new")
         follow_redirect!
         assert_response :redirect
         assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/user/new")


@@ -572,7 +572,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
         follow_redirect!
         assert_response :redirect
         assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
         follow_redirect!
         assert_response :redirect

-        assert_redirected_to auth_success_path(:provider => "windowslive")
+        assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/user/new")

         follow_redirect!
         assert_response :redirect
         assert_redirected_to "/user/terms"
         follow_redirect!
         assert_response :redirect
         assert_redirected_to "/user/terms"