Add some tests for the locale library

[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 940eb30445b422c1538be83f3e7dae08f09ad653..6c6a104478a2ffa5081f2da007772afcfab90871 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


@@ -385,9 +385,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_facebook_success
   end
 
   def test_user_create_facebook_success

-    OmniAuth.config.add_mock(:facebook, :uid => "123454321", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/new.tester" }
-                             })
+    OmniAuth.config.add_mock(:facebook, :uid => "123454321")

 
     new_email = "newtester-facebook@osm.org"
     display_name = "new_tester-facebook"
 
     new_email = "newtester-facebook@osm.org"
     display_name = "new_tester-facebook"


@@ -447,9 +445,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_facebook_redirect
   end
 
   def test_user_create_facebook_redirect

-    OmniAuth.config.add_mock(:facebook, :uid => "123454321", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/new.tester" }
-                             })
+    OmniAuth.config.add_mock(:facebook, :uid => "123454321")

 
     new_email = "redirect_tester_facebook@osm.org"
     display_name = "redirect_tester_facebook"
 
     new_email = "redirect_tester_facebook@osm.org"
     display_name = "redirect_tester_facebook"


@@ -502,9 +498,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_windowslive_success
   end
 
   def test_user_create_windowslive_success

-    OmniAuth.config.add_mock(:windowslive, :uid => "123454321", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/new.tester" }
-                             })
+    OmniAuth.config.add_mock(:windowslive, :uid => "123454321")

 
     new_email = "newtester-windowslive@osm.org"
     display_name = "new_tester-windowslive"
 
     new_email = "newtester-windowslive@osm.org"
     display_name = "new_tester-windowslive"


@@ -564,9 +558,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_windowslive_redirect
   end
 
   def test_user_create_windowslive_redirect

-    OmniAuth.config.add_mock(:windowslive, :uid => "123454321", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/new.tester" }
-                             })
+    OmniAuth.config.add_mock(:windowslive, :uid => "123454321")

 
     new_email = "redirect_tester_windowslive@osm.org"
     display_name = "redirect_tester_windowslive"
 
     new_email = "redirect_tester_windowslive@osm.org"
     display_name = "redirect_tester_windowslive"