Update minimum ruby version to 3.2

[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 f75fde75e197be59b835632b71781f3cc7ab93ff..4aae1046b586b97a4d25e25edc7031aa1a689c8c 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -30,12 +30,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => dup_email,
                                        :display_name => display_name,
                                        :pass_crypt => "testtest",
                :params => { :user => { :email => dup_email,
                                        :display_name => display_name,
                                        :pass_crypt => "testtest",

-                                       :pass_crypt_confirmation => "testtest",
-                                       :consider_pd => "1" } }
+                                       :pass_crypt_confirmation => "testtest" } }

         end
       end
     end
         end
       end
     end


@@ -51,14 +50,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_difference("User.count", 0) do
       assert_no_difference("ActionMailer::Base.deliveries.size") do
         perform_enqueued_jobs do
     assert_difference("User.count", 0) do
       assert_no_difference("ActionMailer::Base.deliveries.size") do
         perform_enqueued_jobs do

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => dup_email,
                                        :display_name => display_name,
                                        :pass_crypt => "testtest",
                                        :pass_crypt_confirmation => "testtest",
                                        :auth_provider => "google",
                :params => { :user => { :email => dup_email,
                                        :display_name => display_name,
                                        :pass_crypt => "testtest",
                                        :pass_crypt_confirmation => "testtest",
                                        :auth_provider => "google",

-                                       :auth_uid => "123454321",
-                                       :consider_pd => "1" } }
+                                       :auth_uid => "123454321" } }

         end
       end
     end
         end
       end
     end


@@ -74,7 +72,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => email,
                                        :display_name => dup_display_name,
                                        :pass_crypt => "testtest",
                :params => { :user => { :email => email,
                                        :display_name => dup_display_name,
                                        :pass_crypt => "testtest",


@@ -93,12 +91,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => email,
                                        :display_name => display_name,
                                        :pass_crypt => "testtest",
                :params => { :user => { :email => email,
                                        :display_name => display_name,
                                        :pass_crypt => "testtest",

-                                       :pass_crypt_confirmation => "blahblah",
-                                       :consider_pd => "1" } }
+                                       :pass_crypt_confirmation => "blahblah" } }

         end
       end
     end
         end
       end
     end


@@ -113,12 +110,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_difference("User.count", 0) do
       assert_no_difference("ActionMailer::Base.deliveries.size") do
         perform_enqueued_jobs do
     assert_difference("User.count", 0) do
       assert_no_difference("ActionMailer::Base.deliveries.size") do
         perform_enqueued_jobs do

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => email,
                                        :display_name => dup_display_name,
                                        :auth_provider => "google",
                :params => { :user => { :email => email,
                                        :display_name => dup_display_name,
                                        :auth_provider => "google",

-                                       :auth_uid => "123454321",
-                                       :consider_pd => "1" } }
+                                       :auth_uid => "123454321" } }

         end
       end
     end
         end
       end
     end


@@ -134,12 +130,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_difference("User.count", 1) do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
     assert_difference("User.count", 1) do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :pass_crypt => "testtest",
                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :pass_crypt => "testtest",

-                                       :pass_crypt_confirmation => "testtest",
-                                       :consider_pd => "1" } }
+                                       :pass_crypt_confirmation => "testtest" } }

           assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
           follow_redirect!
         end
           assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
           follow_redirect!
         end


@@ -158,7 +153,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     found_confirmation_url = register_email.parts.first.parts.first.to_s =~ %r{\shttp://test.host(/\S+)\s}
     assert found_confirmation_url
     confirmation_url = Regexp.last_match(1)
     found_confirmation_url = register_email.parts.first.parts.first.to_s =~ %r{\shttp://test.host(/\S+)\s}
     assert found_confirmation_url
     confirmation_url = Regexp.last_match(1)

-    ActionMailer::Base.deliveries.clear

 
     post confirmation_url
 
 
     post confirmation_url
 


@@ -188,12 +182,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :pass_crypt => password,
                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :pass_crypt => password,

-                                       :pass_crypt_confirmation => password,
-                                       :consider_pd => "1" },
+                                       :pass_crypt_confirmation => password },

                             :referer => referer }
           assert_response(:redirect)
           assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
                             :referer => referer }
           assert_response(:redirect)
           assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name


@@ -217,8 +210,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    ActionMailer::Base.deliveries.clear
-

     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success


@@ -250,20 +241,17 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => new_email,
                                :auth_provider => "openid", :auth_uid => auth_uid
           follow_redirect!
           assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => new_email,
                                :auth_provider => "openid", :auth_uid => auth_uid
           follow_redirect!

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "openid",
                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "openid",

-                                       :auth_uid => auth_uid,
-                                       :consider_pd => "1" } }
+                                       :auth_uid => auth_uid } }

         end
       end
     end
 
     # Check the page
     assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
         end
       end
     end
 
     # Check the page
     assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_openid_duplicate_email
   end
 
   def test_user_create_openid_duplicate_email


@@ -285,8 +273,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_openid_failure
   end
 
   def test_user_create_openid_failure


@@ -303,8 +289,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         end
       end
     end
         end
       end
     end

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_openid_redirect
   end
 
   def test_user_create_openid_redirect


@@ -326,12 +310,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => new_email,
                                :auth_provider => "openid", :auth_uid => auth_uid
           follow_redirect!
           assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => new_email,
                                :auth_provider => "openid", :auth_uid => auth_uid
           follow_redirect!

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "openid",
                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "openid",

-                                       :auth_uid => auth_uid,
-                                       :consider_pd => "1" } }
+                                       :auth_uid => auth_uid } }

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -352,8 +335,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    ActionMailer::Base.deliveries.clear
-

     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success


@@ -388,12 +369,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                :auth_provider => "google", :auth_uid => auth_uid
           follow_redirect!
 
                                :auth_provider => "google", :auth_uid => auth_uid
           follow_redirect!
 

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "google",
                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "google",

-                                       :auth_uid => auth_uid,
-                                       :consider_pd => "1" },
+                                       :auth_uid => auth_uid },

                             :email_hmac => email_hmac }
           assert_redirected_to welcome_path
           follow_redirect!
                             :email_hmac => email_hmac }
           assert_redirected_to welcome_path
           follow_redirect!


@@ -404,8 +384,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     # Check the page
     assert_response :success
     assert_template "site/welcome"
     # Check the page
     assert_response :success
     assert_template "site/welcome"

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_google_duplicate_email
   end
 
   def test_user_create_google_duplicate_email


@@ -429,8 +407,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_google_failure
   end
 
   def test_user_create_google_failure


@@ -448,8 +424,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         end
       end
     end
         end
       end
     end

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_google_redirect
   end
 
   def test_user_create_google_redirect


@@ -474,13 +448,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                :email => orig_email, :email_hmac => email_hmac,
                                :auth_provider => "google", :auth_uid => auth_uid
           follow_redirect!
                                :email => orig_email, :email_hmac => email_hmac,
                                :auth_provider => "google", :auth_uid => auth_uid
           follow_redirect!

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :email_hmac => email_hmac,
                                        :display_name => display_name,
                                        :auth_provider => "google",
                :params => { :user => { :email => new_email,
                                        :email_hmac => email_hmac,
                                        :display_name => display_name,
                                        :auth_provider => "google",

-                                       :auth_uid => auth_uid,
-                                       :consider_pd => "1" } }
+                                       :auth_uid => auth_uid } }

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


@@ -502,8 +475,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    ActionMailer::Base.deliveries.clear
-

     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success


@@ -537,12 +508,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                :auth_provider => "facebook", :auth_uid => auth_uid
           follow_redirect!
 
                                :auth_provider => "facebook", :auth_uid => auth_uid
           follow_redirect!
 

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "facebook",
                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "facebook",

-                                       :auth_uid => auth_uid,
-                                       :consider_pd => "1" },
+                                       :auth_uid => auth_uid },

                             :email_hmac => email_hmac }
           assert_redirected_to welcome_path
           follow_redirect!
                             :email_hmac => email_hmac }
           assert_redirected_to welcome_path
           follow_redirect!


@@ -553,8 +523,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     # Check the page
     assert_response :success
     assert_template "site/welcome"
     # Check the page
     assert_response :success
     assert_template "site/welcome"

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_facebook_duplicate_email
   end
 
   def test_user_create_facebook_duplicate_email


@@ -577,8 +545,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_facebook_failure
   end
 
   def test_user_create_facebook_failure


@@ -596,8 +562,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         end
       end
     end
         end
       end
     end

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_facebook_redirect
   end
 
   def test_user_create_facebook_redirect


@@ -623,13 +587,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                :auth_provider => "facebook", :auth_uid => auth_uid
           follow_redirect!
 
                                :auth_provider => "facebook", :auth_uid => auth_uid
           follow_redirect!
 

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :email_hmac => email_hmac,
                                        :display_name => display_name,
                                        :auth_provider => "facebook",
                :params => { :user => { :email => new_email,
                                        :email_hmac => email_hmac,
                                        :display_name => display_name,
                                        :auth_provider => "facebook",

-                                       :auth_uid => auth_uid,
-                                       :consider_pd => "1" } }
+                                       :auth_uid => auth_uid } }

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


@@ -651,8 +614,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    ActionMailer::Base.deliveries.clear
-

     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success


@@ -685,12 +646,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                :email => new_email, :email_hmac => email_hmac,
                                :auth_provider => "microsoft", :auth_uid => auth_uid
           follow_redirect!
                                :email => new_email, :email_hmac => email_hmac,
                                :auth_provider => "microsoft", :auth_uid => auth_uid
           follow_redirect!

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "microsoft",
                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "microsoft",

-                                       :auth_uid => auth_uid,
-                                       :consider_pd => "1" },
+                                       :auth_uid => auth_uid },

                             :email_hmac => email_hmac }
           assert_redirected_to welcome_path
           follow_redirect!
                             :email_hmac => email_hmac }
           assert_redirected_to welcome_path
           follow_redirect!


@@ -701,8 +661,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     # Check the page
     assert_response :success
     assert_template "site/welcome"
     # Check the page
     assert_response :success
     assert_template "site/welcome"

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_microsoft_duplicate_email
   end
 
   def test_user_create_microsoft_duplicate_email


@@ -725,8 +683,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_microsoft_failure
   end
 
   def test_user_create_microsoft_failure


@@ -744,8 +700,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         end
       end
     end
         end
       end
     end

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_microsoft_redirect
   end
 
   def test_user_create_microsoft_redirect


@@ -770,13 +724,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                :auth_provider => "microsoft", :auth_uid => auth_uid
           follow_redirect!
 
                                :auth_provider => "microsoft", :auth_uid => auth_uid
           follow_redirect!
 

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :email_hmac => email_hmac,
                                        :display_name => display_name,
                                        :auth_provider => "microsoft",
                :params => { :user => { :email => new_email,
                                        :email_hmac => email_hmac,
                                        :display_name => display_name,
                                        :auth_provider => "microsoft",

-                                       :auth_uid => auth_uid,
-                                       :consider_pd => "1" } }
+                                       :auth_uid => auth_uid } }

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


@@ -798,8 +751,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    ActionMailer::Base.deliveries.clear
-

     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success


@@ -834,7 +785,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                :auth_provider => "github", :auth_uid => auth_uid
           follow_redirect!
 
                                :auth_provider => "github", :auth_uid => auth_uid
           follow_redirect!
 

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "github",
                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "github",


@@ -853,8 +804,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     # Check the page
     assert_response :success
     assert_template "site/welcome"
     # Check the page
     assert_response :success
     assert_template "site/welcome"

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_github_duplicate_email
   end
 
   def test_user_create_github_duplicate_email


@@ -878,8 +827,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_github_failure
   end
 
   def test_user_create_github_failure


@@ -896,8 +843,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         end
       end
     end
         end
       end
     end

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_github_redirect
   end
 
   def test_user_create_github_redirect


@@ -921,13 +866,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                :email => orig_email, :email_hmac => email_hmac,
                                :auth_provider => "github", :auth_uid => auth_uid
           follow_redirect!
                                :email => orig_email, :email_hmac => email_hmac,
                                :auth_provider => "github", :auth_uid => auth_uid
           follow_redirect!

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :email_hmac => email_hmac,
                                        :display_name => display_name,
                                        :auth_provider => "github",
                :params => { :user => { :email => new_email,
                                        :email_hmac => email_hmac,
                                        :display_name => display_name,
                                        :auth_provider => "github",

-                                       :auth_uid => auth_uid,
-                                       :consider_pd => "1" } }
+                                       :auth_uid => auth_uid } }

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


@@ -949,8 +893,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    ActionMailer::Base.deliveries.clear
-

     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success


@@ -984,7 +926,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                :email => new_email, :email_hmac => email_hmac,
                                :auth_provider => "wikipedia", :auth_uid => auth_uid
           follow_redirect!
                                :email => new_email, :email_hmac => email_hmac,
                                :auth_provider => "wikipedia", :auth_uid => auth_uid
           follow_redirect!

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "wikipedia",
                :params => { :user => { :email => new_email,
                                        :display_name => display_name,
                                        :auth_provider => "wikipedia",


@@ -1025,8 +967,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"
     assert_response :success
     assert_template "users/new"
     assert_select "form > div > input.is-invalid#user_email"

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_wikipedia_failure
   end
 
   def test_user_create_wikipedia_failure


@@ -1044,8 +984,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         end
       end
     end
         end
       end
     end

-
-    ActionMailer::Base.deliveries.clear

   end
 
   def test_user_create_wikipedia_redirect
   end
 
   def test_user_create_wikipedia_redirect


@@ -1071,13 +1009,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                :auth_provider => "wikipedia", :auth_uid => auth_uid
           follow_redirect!
 
                                :auth_provider => "wikipedia", :auth_uid => auth_uid
           follow_redirect!
 

-          post "/user/new",
+          post "/user",

                :params => { :user => { :email => new_email,
                                        :email_hmac => email_hmac,
                                        :display_name => display_name,
                                        :auth_provider => "wikipedia",
                :params => { :user => { :email => new_email,
                                        :email_hmac => email_hmac,
                                        :display_name => display_name,
                                        :auth_provider => "wikipedia",

-                                       :auth_uid => auth_uid,
-                                       :consider_pd => "1" } }
+                                       :auth_uid => auth_uid } }

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


@@ -1099,8 +1036,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    ActionMailer::Base.deliveries.clear
-

     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success
     # Go to the confirmation page
     get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }
     assert_response :success