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

[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..131292f412d90f286b8798b81b84bde1015b2be4 100644 (file)
--- a/test/controllers/accounts_controller_test.rb
+++ b/test/controllers/accounts_controller_test.rb
@@ -60,7 +60,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     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
@@ -68,7 +68,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     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
@@ -79,7 +79,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     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
@@ -94,7 +94,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     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
@@ -106,7 +106,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     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
@@ -121,7 +121,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     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
@@ -152,4 +152,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
+
+  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