Set Accept-Language in a rails 3 compatible way

[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 86fddf7b2606e93fb130bbd1768fa70b5a5e6ba7..b0d0ecffdea38ded85c32057046fbd82a00c8f4b 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -3,9 +3,13 @@ require File.dirname(__FILE__) + '/../test_helper'
 class UserCreationTest < ActionController::IntegrationTest
   fixtures :users
 
 class UserCreationTest < ActionController::IntegrationTest
   fixtures :users
 

+  def setup
+    openid_setup
+  end
+

   def test_create_user_form
     I18n.available_locales.each do |locale|
   def test_create_user_form
     I18n.available_locales.each do |locale|

-      get '/user/new', {}, {"accept_language" => locale.to_s}
+      get '/user/new', {}, {"HTTP_ACCEPT_LANGUAGE" => locale.to_s}

       assert_response :success
       assert_template 'user/new'
     end
       assert_response :success
       assert_template 'user/new'
     end


@@ -19,7 +23,7 @@ class UserCreationTest < ActionController::IntegrationTest
         assert_difference('ActionMailer::Base.deliveries.size', 0) do
           post '/user/save',
             {:user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
         assert_difference('ActionMailer::Base.deliveries.size', 0) do
           post '/user/save',
             {:user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},

-            {"accept_language" => localer.to_s}
+            {"HTTP_ACCEPT_LANGUAGE" => localer.to_s}

         end
       end
       assert_response :success
         end
       end
       assert_response :success


@@ -39,7 +43,7 @@ class UserCreationTest < ActionController::IntegrationTest
         assert_difference('ActionMailer::Base.deliveries.size', 0) do
           post '/user/save',
           {:user => {:email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
         assert_difference('ActionMailer::Base.deliveries.size', 0) do
           post '/user/save',
           {:user => {:email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},

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

         end
       end
       assert_response :success
         end
       end
       assert_response :success


@@ -58,7 +62,7 @@ class UserCreationTest < ActionController::IntegrationTest
         assert_difference('ActionMailer::Base.deliveries.size', 1) do
           post_via_redirect "/user/save",
             {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
         assert_difference('ActionMailer::Base.deliveries.size', 1) do
           post_via_redirect "/user/save",
             {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},

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

         end
       end
 
         end
       end
 


@@ -108,7 +112,7 @@ class UserCreationTest < ActionController::IntegrationTest
 
     assert_equal register_email.to[0], new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to[0], new_email
     # Check that the confirm account url is correct

-    confirm_regex = Regexp.new("/user/confirm\\?confirm_string=([a-zA-Z0-9]*)")
+    confirm_regex = Regexp.new("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9]*)")

     assert_match(confirm_regex, register_email.body)
     confirm_string = confirm_regex.match(register_email.body)[1]
 
     assert_match(confirm_regex, register_email.body)
     confirm_string = confirm_regex.match(register_email.body)[1]
 


@@ -203,7 +207,7 @@ class UserCreationTest < ActionController::IntegrationTest
 
     assert_equal register_email.to[0], new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to[0], new_email
     # Check that the confirm account url is correct

-    confirm_regex = Regexp.new("/user/confirm\\?confirm_string=([a-zA-Z0-9]*)")
+    confirm_regex = Regexp.new("/user/redirect_tester_openid/confirm\\?confirm_string=([a-zA-Z0-9]*)")

     assert_match(confirm_regex, register_email.body)
     confirm_string = confirm_regex.match(register_email.body)[1]
 
     assert_match(confirm_regex, register_email.body)
     confirm_string = confirm_regex.match(register_email.body)[1]