Add code blocks markdown guidance

[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..8ec0dc9bc049e2486458f50b650034e5d0f52beb 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -2,119 +2,141 @@ require "test_helper"
 
 class UserCreationTest < ActionDispatch::IntegrationTest
   def setup
 
 class UserCreationTest < ActionDispatch::IntegrationTest
   def setup

-    I18n.locale = "en"
-

     OmniAuth.config.test_mode = true
 
     stub_request(:get, /.*gravatar.com.*d=404/).to_return(:status => 404)
   end
 
   def teardown
     OmniAuth.config.test_mode = true
 
     stub_request(:get, /.*gravatar.com.*d=404/).to_return(:status => 404)
   end
 
   def teardown

-    I18n.locale = "en"
-

     OmniAuth.config.mock_auth[:openid] = nil
     OmniAuth.config.mock_auth[:google] = nil
     OmniAuth.config.mock_auth[:facebook] = nil
     OmniAuth.config.mock_auth[:openid] = nil
     OmniAuth.config.mock_auth[:google] = nil
     OmniAuth.config.mock_auth[:facebook] = nil

-    OmniAuth.config.mock_auth[:windowslive] = nil
+    OmniAuth.config.mock_auth[:microsoft] = nil

     OmniAuth.config.mock_auth[:github] = nil
     OmniAuth.config.mock_auth[:wikipedia] = nil
     OmniAuth.config.test_mode = false
   end
 
   def test_create_user_form
     OmniAuth.config.mock_auth[:github] = nil
     OmniAuth.config.mock_auth[:wikipedia] = nil
     OmniAuth.config.test_mode = false
   end
 
   def test_create_user_form

-    I18n.available_locales.each do |locale|
-      reset!
-      get "/user/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
-      follow_redirect!
-      assert_response :success
-      assert_template "users/new"
-    end
+    get "/user/new"
+    follow_redirect!
+    assert_response :success
+    assert_template "users/new"

   end
 
   def test_user_create_submit_duplicate_email
   end
 
   def test_user_create_submit_duplicate_email

-    I18n.available_locales.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",
-                 :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
+    dup_email = create(:user).email
+    display_name = "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" } }

         end
       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_no_missing_translations

     end
     end

+    assert_response :success
+    assert_template "users/new"
+    assert_select "form"
+    assert_select "form > div > input.is-invalid#user_email"

   end
 
   def test_user_create_submit_duplicate_username
   end
 
   def test_user_create_submit_duplicate_username

-    I18n.available_locales.each do |locale|
-      dup_display_name = create(:user).display_name
-      email = "#{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 => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } },
-                 :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
-          end
+    dup_display_name = create(:user).display_name
+    email = "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 => email,
+                                       :email_confirmation => email,
+                                       :display_name => dup_display_name,
+                                       :pass_crypt => "testtest",
+                                       :pass_crypt_confirmation => "testtest" } }

         end
       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_no_missing_translations

     end
     end

+    assert_response :success
+    assert_template "users/new"
+    assert_select "form > div > input.is-invalid#user_display_name"

   end
 
   def test_user_create_success
   end
 
   def test_user_create_success

-    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
+    new_email = "newtester@osm.org"
+    display_name = "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
       end

+    end

 
 

-      assert_redirected_to "/user/terms"
+    assert_redirected_to "/user/terms"

 
 

-      assert_difference("User.count") do
-        assert_difference("ActionMailer::Base.deliveries.size", 1) do
-          perform_enqueued_jobs do
-            post "/user/save",
-                 :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
-            follow_redirect!
-          end
+    assert_difference("User.count") do
+      assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
+          post "/user/save",
+               :params => { :read_ct => 1, :read_tou => 1 }
+          follow_redirect!

         end
       end
         end
       end

+    end
+
+    # Check the e-mail
+    register_email = ActionMailer::Base.deliveries.first
+
+    assert_equal register_email.to.first, new_email
+    # Check that the confirm account url is correct
+    assert_match(/#{@url}/, register_email.body.to_s)
+
+    # Check the page
+    assert_response :success
+    assert_template "confirmations/confirm"
+
+    ActionMailer::Base.deliveries.clear
+  end

 
 

-      # Check the e-mail
-      register_email = ActionMailer::Base.deliveries.first
+  def test_user_create_no_tou_failure
+    new_email = "#newtester@osm.org"
+    display_name = "new_tester"

 
 

-      assert_equal register_email.to.first, new_email
-      # Check that the confirm account url is correct
-      assert_match(/#{@url}/, register_email.body.to_s)
+    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

 
 

-      # Check the page
-      assert_response :success
-      assert_template "users/confirm"
+    assert_redirected_to "/user/terms"

 
 

-      ActionMailer::Base.deliveries.clear
+    perform_enqueued_jobs do
+      post "/user/save"
+      assert_redirected_to "/user/terms"

     end
     end

+
+    ActionMailer::Base.deliveries.clear

   end
 
   # Check that the user can successfully recover their password
   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 +154,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


@@ -146,7 +178,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

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

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end


@@ -154,14 +186,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 +212,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 +244,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 +258,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 +296,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


@@ -266,7 +331,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

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

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end


@@ -274,14 +339,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


@@ -291,29 +356,41 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_google_success
   end
 
   def test_user_create_google_success

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

     new_email = "newtester-google@osm.org"
     display_name = "new_tester-google"
     password = "testtest"
     new_email = "newtester-google@osm.org"
     display_name = "new_tester-google"
     password = "testtest"

+
+    OmniAuth.config.add_mock(:google, :uid => "123454321", :info => { "email" => new_email })
+

     assert_difference("User.count") do
     assert_difference("User.count") do

-      assert_difference("ActionMailer::Base.deliveries.size", 1) do
+      assert_no_difference("ActionMailer::Base.deliveries.size") do

         perform_enqueued_jobs do
           post "/user/new",
         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 } }
-          assert_response :redirect
+               :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
+          assert_redirected_to welcome_path

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


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

-    assert_template "users/confirm"
+    assert_template "site/welcome"

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


@@ -335,10 +412,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 +451,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


@@ -390,7 +485,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

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

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end


@@ -398,14 +493,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


@@ -415,27 +510,41 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_facebook_success
   end
 
   def test_user_create_facebook_success

-    OmniAuth.config.add_mock(:facebook, :uid => "123454321")
-

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

+
+    OmniAuth.config.add_mock(:facebook, :uid => "123454321", :info => { "email" => new_email })
+

     assert_difference("User.count") do
     assert_difference("User.count") do

-      assert_difference("ActionMailer::Base.deliveries.size", 1) do
+      assert_no_difference("ActionMailer::Base.deliveries.size") do

         perform_enqueued_jobs do
           post "/user/new",
         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 } }
-          assert_response :redirect
+               :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
+          assert_redirected_to welcome_path

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


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

-    assert_template "users/confirm"
+    assert_template "site/welcome"

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


@@ -457,10 +566,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 +603,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


@@ -510,7 +637,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

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

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end


@@ -518,14 +645,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


@@ -534,28 +661,42 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_template "site/welcome"
   end
 
     assert_template "site/welcome"
   end
 

-  def test_user_create_windowslive_success
-    OmniAuth.config.add_mock(:windowslive, :uid => "123454321")
-
-    new_email = "newtester-windowslive@osm.org"
-    display_name = "new_tester-windowslive"
+  def test_user_create_microsoft_success
+    new_email = "newtester-microsoft@osm.org"
+    display_name = "new_tester-microsoft"

     password = "testtest"
     password = "testtest"

+
+    OmniAuth.config.add_mock(:microsoft, :uid => "123454321", :info => { "email" => new_email })
+

     assert_difference("User.count") do
     assert_difference("User.count") do

-      assert_difference("ActionMailer::Base.deliveries.size", 1) do
+      assert_difference("ActionMailer::Base.deliveries.size", 0) do

         perform_enqueued_jobs do
           post "/user/new",
         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 => "microsoft",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_response :redirect

-          assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
-          follow_redirect!
+          assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
+          post response.location

           assert_response :redirect
           assert_response :redirect

-          assert_redirected_to auth_success_path(:provider => "windowslive")
+          assert_redirected_to auth_success_path(:provider => "microsoft")

           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           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 } }
-          assert_response :redirect
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "microsoft",
+                                       :auth_uid => "123454321",
+                                       :pass_crypt => password,
+                                       :pass_crypt_confirmation => password },
+                            :read_ct => 1, :read_tou => 1 }
+          assert_response :redirect
+          assert_redirected_to welcome_path

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -563,29 +704,34 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "users/confirm"
+    assert_template "site/welcome"

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

-  def test_user_create_windowslive_failure
-    OmniAuth.config.mock_auth[:windowslive] = :connection_failed
+  def test_user_create_microsoft_failure
+    OmniAuth.config.mock_auth[:microsoft] = :connection_failed

 
 

-    new_email = "newtester-windowslive2@osm.org"
-    display_name = "new_tester-windowslive2"
+    new_email = "newtester-microsoft2@osm.org"
+    display_name = "new_tester-microsoft2"

     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
         perform_enqueued_jobs do
           post "/user/new",
     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, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" } }
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "microsoft",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" } }

           assert_response :redirect
           assert_response :redirect

-          assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
-          follow_redirect!
+          assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
+          post response.location

           assert_response :redirect
           assert_response :redirect

-          assert_redirected_to auth_success_path(:provider => "windowslive")
+          assert_redirected_to auth_success_path(:provider => "microsoft")

           follow_redirect!
           assert_response :redirect
           follow_redirect!
           assert_response :redirect

-          assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/user/new")
+          assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/user/new")

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


@@ -598,28 +744,41 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end
 

-  def test_user_create_windowslive_redirect
-    OmniAuth.config.add_mock(:windowslive, :uid => "123454321")
+  def test_user_create_microsoft_redirect
+    OmniAuth.config.add_mock(:microsoft, :uid => "123454321")

 
 

-    new_email = "redirect_tester_windowslive@osm.org"
-    display_name = "redirect_tester_windowslive"
+    new_email = "redirect_tester_microsoft@osm.org"
+    display_name = "redirect_tester_microsoft"

     # nothing special about this page, just need a protected page to redirect back to.
     referer = "/traces/mine"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
     # nothing special about this page, just need a protected page to redirect back to.
     referer = "/traces/mine"
     assert_difference("User.count") do
       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 }
-          assert_response :redirect
-          assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
-          follow_redirect!
-          assert_response :redirect
-          assert_redirected_to auth_success_path(:provider => "windowslive")
+               :params => { :user => { :email => new_email,
+                                       :email_confirmation => new_email,
+                                       :display_name => display_name,
+                                       :auth_provider => "microsoft",
+                                       :pass_crypt => "",
+                                       :pass_crypt_confirmation => "" },
+                            :referer => referer }
+          assert_response :redirect
+          assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
+          post response.location
+          assert_response :redirect
+          assert_redirected_to auth_success_path(:provider => "microsoft")

           follow_redirect!
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
           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 => "microsoft",
+                                       :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


@@ -630,7 +789,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

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

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end


@@ -638,14 +797,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


@@ -655,27 +814,42 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_github_success
   end
 
   def test_user_create_github_success

-    OmniAuth.config.add_mock(:github, :uid => "123454321")
-

     new_email = "newtester-github@osm.org"
     display_name = "new_tester-github"
     password = "testtest"
     new_email = "newtester-github@osm.org"
     display_name = "new_tester-github"
     password = "testtest"

+
+    OmniAuth.config.add_mock(:github, :uid => "123454321", :info => { "email" => new_email })
+

     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
     assert_difference("User.count") do
       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 } }
-          assert_response :redirect
+               :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
+          assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -683,7 +857,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 +871,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 +908,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


@@ -750,7 +943,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

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

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end


@@ -758,14 +951,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


@@ -775,27 +968,42 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_wikipedia_success
   end
 
   def test_user_create_wikipedia_success

-    OmniAuth.config.add_mock(:wikipedia, :uid => "123454321")
-

     new_email = "newtester-wikipedia@osm.org"
     display_name = "new_tester-wikipedia"
     password = "testtest"
     new_email = "newtester-wikipedia@osm.org"
     display_name = "new_tester-wikipedia"
     password = "testtest"

+
+    OmniAuth.config.add_mock(:wikipedia, :uid => "123454321", :info => { "email" => new_email })
+

     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
         perform_enqueued_jobs do
           post "/user/new",
     assert_difference("User.count") do
       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 } }
-          assert_response :redirect
+               :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
+          assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -803,7 +1011,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 +1025,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 +1062,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


@@ -870,7 +1097,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

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

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end


@@ -878,14 +1105,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