Merge remote-tracking branch 'upstream/pull/5075'

[rails.git] / test / controllers / accounts_controller_test.rb

diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb
index 1e39a7329e6c3a7b9fccac22696e223edc3effeb..18ad34f66692dcb6eb8ca3c6c818a75fc38ee22a 100644 (file)
--- a/test/controllers/accounts_controller_test.rb
+++ b/test/controllers/accounts_controller_test.rb
@@ -25,7 +25,6 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     # Make sure that you are redirected to the login page when
     # you are not logged in
     get edit_account_path
     # Make sure that you are redirected to the login page when
     # you are not logged in
     get edit_account_path

-    assert_response :redirect

     assert_redirected_to login_path(:referer => "/account/edit")
 
     # Make sure we get the page when we are logged in as the right user
     assert_redirected_to login_path(:referer => "/account/edit")
 
     # Make sure we get the page when we are logged in as the right user


@@ -49,10 +48,8 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
 
     # Adding external authentication should redirect to the auth provider
     patch account_path, :params => { :user => user.attributes.merge(:auth_provider => "google") }
 
     # Adding external authentication should redirect to the auth provider
     patch account_path, :params => { :user => user.attributes.merge(:auth_provider => "google") }

-    assert_response :redirect

     assert_redirected_to auth_path(:provider => "google", :origin => "/account")
     follow_redirect!
     assert_redirected_to auth_path(:provider => "google", :origin => "/account")
     follow_redirect!

-    assert_response :redirect

     assert_redirected_to %r{^https://accounts.google.com/o/oauth2/auth\?.*}
 
     # Changing name to one that exists should fail
     assert_redirected_to %r{^https://accounts.google.com/o/oauth2/auth\?.*}
 
     # Changing name to one that exists should fail


@@ -60,7 +57,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     patch account_path, :params => { :user => new_attributes }
     assert_response :success
     assert_template :edit
     patch account_path, :params => { :user => new_attributes }
     assert_response :success
     assert_template :edit

-    assert_select ".notice", false
+    assert_select ".alert-success", false

     assert_select "form#accountForm > div > input.is-invalid#user_display_name"
 
     # Changing name to one that exists should fail, regardless of case
     assert_select "form#accountForm > div > input.is-invalid#user_display_name"
 
     # Changing name to one that exists should fail, regardless of case


@@ -68,18 +65,17 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     patch account_path, :params => { :user => new_attributes }
     assert_response :success
     assert_template :edit
     patch account_path, :params => { :user => new_attributes }
     assert_response :success
     assert_template :edit

-    assert_select ".notice", false
+    assert_select ".alert-success", false

     assert_select "form#accountForm > div > input.is-invalid#user_display_name"
 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")
     patch account_path, :params => { :user => new_attributes }
     assert_select "form#accountForm > div > input.is-invalid#user_display_name"
 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")
     patch account_path, :params => { :user => new_attributes }

-    assert_response :redirect

     assert_redirected_to edit_account_url
     get edit_account_path
     assert_response :success
     assert_template :edit
     assert_redirected_to edit_account_url
     get edit_account_path
     assert_response :success
     assert_template :edit

-    assert_select ".notice", /^User information updated successfully/
+    assert_select ".alert-success", /^User information updated successfully/

     assert_select "form#accountForm > div > input#user_display_name[value=?]", "new tester"
 
     # Record the change of name
     assert_select "form#accountForm > div > input#user_display_name[value=?]", "new tester"
 
     # Record the change of name


@@ -94,7 +90,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     end
     assert_response :success
     assert_template :edit
     end
     assert_response :success
     assert_template :edit

-    assert_select ".notice", false
+    assert_select ".alert-success", false

     assert_select "form#accountForm > div > input.is-invalid#user_new_email"
 
     # Changing email to one that exists should fail, regardless of case
     assert_select "form#accountForm > div > input.is-invalid#user_new_email"
 
     # Changing email to one that exists should fail, regardless of case


@@ -106,7 +102,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     end
     assert_response :success
     assert_template :edit
     end
     assert_response :success
     assert_template :edit

-    assert_select ".notice", false
+    assert_select ".alert-success", false

     assert_select "form#accountForm > div > input.is-invalid#user_new_email"
 
     # Changing email to one that doesn't exist should work
     assert_select "form#accountForm > div > input.is-invalid#user_new_email"
 
     # Changing email to one that doesn't exist should work


@@ -116,12 +112,11 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
         patch account_path, :params => { :user => user.attributes }
       end
     end
         patch account_path, :params => { :user => user.attributes }
       end
     end

-    assert_response :redirect

     assert_redirected_to edit_account_url
     get edit_account_path
     assert_response :success
     assert_template :edit
     assert_redirected_to edit_account_url
     get edit_account_path
     assert_response :success
     assert_template :edit

-    assert_select ".notice", /^User information updated successfully/
+    assert_select ".alert-success", /^User information updated successfully/

     assert_select "form#accountForm > div > input#user_new_email[value=?]", user.new_email
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_select "form#accountForm > div > input#user_new_email[value=?]", user.new_email
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count


@@ -135,7 +130,6 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     # Make sure that you are redirected to the login page when
     # you are not logged in
     get edit_account_path
     # Make sure that you are redirected to the login page when
     # you are not logged in
     get edit_account_path

-    assert_response :redirect

     assert_redirected_to login_path(:referer => "/account/edit")
 
     # Make sure we get the page when we are logged in as the right user
     assert_redirected_to login_path(:referer => "/account/edit")
 
     # Make sure we get the page when we are logged in as the right user


@@ -152,4 +146,23 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     # Make sure we have a button to "go public"
     assert_select "form.button_to[action='/user/go_public']", true
   end
     # Make sure we have a button to "go public"
     assert_select "form.button_to[action='/user/go_public']", true
   end

+
+  def test_destroy_allowed
+    user = create(:user)
+    session_for(user)
+
+    delete account_path
+    assert_response :redirect
+  end
+
+  def test_destroy_not_allowed
+    with_user_account_deletion_delay(24) do
+      user = create(:user)
+      create(:changeset, :user => user, :created_at => Time.now.utc)
+      session_for(user)
+
+      delete account_path
+      assert_response :bad_request
+    end
+  end

 end
 end