Move confirmation methods into ConfirmationsController

[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 144a45a45ad990af426dd413dc8f62164da1e96f..a39e423c0899589b32be3da8df7c7956c7f09315 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -32,22 +32,27 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_submit_duplicate_email
   end
 
   def test_user_create_submit_duplicate_email

-    I18n.available_locales.each do |locale|
+    Locale.available.each do |locale|

       dup_email = create(:user).email
       display_name = "#{locale}_new_tester"
       assert_difference("User.count", 0) do
         assert_difference("ActionMailer::Base.deliveries.size", 0) do
           perform_enqueued_jobs do
             post "/user/new",
       dup_email = create(:user).email
       display_name = "#{locale}_new_tester"
       assert_difference("User.count", 0) do
         assert_difference("ActionMailer::Base.deliveries.size", 0) do
           perform_enqueued_jobs do
             post "/user/new",

-                 :params => { :user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } },
+                 :params => { :user => { :email => dup_email,
+                                         :email_confirmation => dup_email,
+                                         :display_name => display_name,
+                                         :pass_crypt => "testtest",
+                                         :pass_crypt_confirmation => "testtest" } },

                  :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
           end
         end
       end
       assert_response :success
       assert_template "users/new"
                  :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
           end
         end
       end
       assert_response :success
       assert_template "users/new"

-      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_equal locale.to_s, response.headers["Content-Language"]
+      assert_select "form"
+      assert_select "form > div.form-group > input.is-invalid#user_email"

       assert_no_missing_translations
     end
   end
       assert_no_missing_translations
     end
   end


@@ -60,14 +65,18 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         assert_difference("ActionMailer::Base.deliveries.size", 0) do
           perform_enqueued_jobs do
             post "/user/new",
         assert_difference("ActionMailer::Base.deliveries.size", 0) do
           perform_enqueued_jobs do
             post "/user/new",

-                 :params => { :user => { :email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } },
+                 :params => { :user => { :email => email,
+                                         :email_confirmation => email,
+                                         :display_name => dup_display_name,
+                                         :pass_crypt => "testtest",
+                                         :pass_crypt_confirmation => "testtest" } },

                  :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
           end
         end
       end
       assert_response :success
       assert_template "users/new"
                  :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
           end
         end
       end
       assert_response :success
       assert_template "users/new"

-      assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
+      assert_select "form > div.form-group > input.is-invalid#user_display_name"

       assert_no_missing_translations
     end
   end
       assert_no_missing_translations
     end
   end


@@ -81,7 +90,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         assert_difference("ActionMailer::Base.deliveries.size", 0) do
           perform_enqueued_jobs do
             post "/user/new",
         assert_difference("ActionMailer::Base.deliveries.size", 0) do
           perform_enqueued_jobs do
             post "/user/new",

-                 :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }
+                 :params => { :user => { :email => new_email,
+                                         :email_confirmation => new_email,
+                                         :display_name => display_name,
+                                         :pass_crypt => "testtest",
+                                         :pass_crypt_confirmation => "testtest" } }

           end
         end
       end
           end
         end
       end


@@ -92,7 +105,8 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         assert_difference("ActionMailer::Base.deliveries.size", 1) do
           perform_enqueued_jobs do
             post "/user/save",
         assert_difference("ActionMailer::Base.deliveries.size", 1) do
           perform_enqueued_jobs do
             post "/user/save",

-                 :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+                 :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s },
+                 :params => { :read_ct => 1, :read_tou => 1 }

             follow_redirect!
           end
         end
             follow_redirect!
           end
         end


@@ -107,14 +121,44 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
       # Check the page
       assert_response :success
 
       # Check the page
       assert_response :success

-      assert_template "users/confirm"
+      assert_template "confirmations/confirm"
+
+      ActionMailer::Base.deliveries.clear
+    end
+  end
+
+  def test_user_create_no_tou_failure
+    I18n.available_locales.each do |locale|
+      new_email = "#{locale}newtester@osm.org"
+      display_name = "#{locale}_new_tester"
+
+      assert_difference("User.count", 0) do
+        assert_difference("ActionMailer::Base.deliveries.size", 0) do
+          perform_enqueued_jobs do
+            post "/user/new",
+                 :params => { :user => { :email => new_email,
+                                         :email_confirmation => new_email,
+                                         :display_name => display_name,
+                                         :pass_crypt => "testtest",
+                                         :pass_crypt_confirmation => "testtest" } }
+          end
+        end
+      end
+
+      assert_redirected_to "/user/terms"
+
+      perform_enqueued_jobs do
+        post "/user/save",
+             :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+        assert_redirected_to "/user/terms"
+      end

 
       ActionMailer::Base.deliveries.clear
     end
   end
 
   # Check that the user can successfully recover their password
 
       ActionMailer::Base.deliveries.clear
     end
   end
 
   # Check that the user can successfully recover their password

-  def lost_password_recovery_success
+  def test_lost_password_recovery_success

     # Open the lost password form
     # Submit the lost password form
     # Check the e-mail
     # Open the lost password form
     # Submit the lost password form
     # Check the e-mail


@@ -132,10 +176,20 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }, :referer => referer }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :pass_crypt => password,
+                                       :pass_crypt_confirmation => password },
+                            :referer => referer }

           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :pass_crypt => password,
+                                       :pass_crypt_confirmation => password },
+                            :read_ct => 1, :read_tou => 1 }

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -154,14 +208,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect
 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect


@@ -180,17 +234,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "openid",
+                                       :auth_uid => "http://localhost:1123/new.tester",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => password, :pass_crypt_confirmation => password } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "openid",
+                                       :auth_uid => "http://localhost:1123/new.tester",
+                                       :pass_crypt => password,
+                                       :pass_crypt_confirmation => password },
+                            :read_ct => 1, :read_tou => 1 }

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


@@ -199,7 +266,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end


@@ -213,10 +280,16 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "openid",
+                                       :auth_uid => "http://localhost:1123/new.tester",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!


@@ -245,17 +318,31 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "openid",
+                                       :auth_uid => "http://localhost:1123/new.tester",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" },
+                            :referer => referer }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "openid",
+                                       :auth_uid => "http://localhost:1123/new.tester",
+                                       :pass_crypt => "testtest",
+                                       :pass_crypt_confirmation => "testtest" },
+                            :read_ct => 1, :read_tou => 1 }

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -274,14 +361,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect
 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect


@@ -302,17 +389,29 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "google",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "google",
+                                       :auth_uid => "123454321",
+                                       :pass_crypt => password,
+                                       :pass_crypt_confirmation => password },
+                            :read_ct => 1, :read_tou => 1 }

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


@@ -321,7 +420,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end


@@ -335,10 +434,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "google",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!


@@ -369,17 +473,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "google",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" },
+                            :referer => referer }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "google",
+                                       :auth_uid => "http://localhost:1123/new.tester",
+                                       :pass_crypt => "testtest",
+                                       :pass_crypt_confirmation => "testtest" },
+                            :read_ct => 1, :read_tou => 1 }

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -398,14 +515,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect
 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect


@@ -424,17 +541,29 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "facebook",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "facebook",
+                                       :auth_uid => "123454321",
+                                       :pass_crypt => password,
+                                       :pass_crypt_confirmation => password },
+                            :read_ct => 1, :read_tou => 1 }

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


@@ -443,7 +572,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end


@@ -457,10 +586,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "facebook",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!


@@ -489,17 +623,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "facebook",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" },
+                            :referer => referer }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "facebook",
+                                       :auth_uid => "http://localhost:1123/new.tester",
+                                       :pass_crypt => "testtest",
+                                       :pass_crypt_confirmation => "testtest" },
+                            :read_ct => 1, :read_tou => 1 }

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -518,14 +665,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect
 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect


@@ -544,17 +691,29 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "windowslive",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "windowslive")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "windowslive")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "windowslive",
+                                       :auth_uid => "123454321",
+                                       :pass_crypt => password,
+                                       :pass_crypt_confirmation => password },
+                            :read_ct => 1, :read_tou => 1 }

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


@@ -563,7 +722,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end


@@ -577,10 +736,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "windowslive",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "windowslive")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "windowslive")
           follow_redirect!


@@ -609,17 +773,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "windowslive",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" },
+                            :referer => referer }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "windowslive")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "windowslive")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "windowslive",
+                                       :auth_uid => "http://localhost:1123/new.tester",
+                                       :pass_crypt => "testtest",
+                                       :pass_crypt_confirmation => "testtest" },
+                            :read_ct => 1, :read_tou => 1 }

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -638,14 +815,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect
 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect


@@ -664,17 +841,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "github",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "github",
+                                       :auth_uid => "123454321",
+                                       :pass_crypt => password,
+                                       :pass_crypt_confirmation => password },
+                            :read_ct => 1,
+                            :read_tou => 1 }

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


@@ -683,7 +873,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end


@@ -697,10 +887,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "github",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!


@@ -729,17 +924,31 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "github",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" },
+                            :referer => referer }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "github",
+                                       :auth_uid => "http://localhost:1123/new.tester",
+                                       :pass_crypt => "testtest",
+                                       :pass_crypt_confirmation => "testtest" },
+                            :read_ct => 1,
+                            :read_tou => 1 }

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -758,14 +967,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect
 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect


@@ -784,17 +993,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "wikipedia",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "wikipedia",
+                                       :auth_uid => "123454321",
+                                       :pass_crypt => password,
+                                       :pass_crypt_confirmation => password },
+                            :read_ct => 1,
+                            :read_tou => 1 }

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


@@ -803,7 +1025,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end


@@ -817,10 +1039,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "wikipedia",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!


@@ -849,17 +1076,31 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "wikipedia",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" },
+                            :referer => referer }

           assert_response :redirect
           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
           assert_response :redirect
           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")

-          follow_redirect!
+          post response.location

           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           assert_response :redirect
           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",

-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "wikipedia",
+                                       :auth_uid => "http://localhost:1123/new.tester",
+                                       :pass_crypt => "testtest",
+                                       :pass_crypt_confirmation => "testtest" },
+                            :read_ct => 1,
+                            :read_tou => 1 }

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -878,14 +1119,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "confirmations/confirm"

 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect
 
     post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
     assert_response :redirect