Merge pull request #4148 from tomhughes/avatar-image

[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 173bcf22c568819bc098a488aa688f0bf5948413..7546c3797ee6f2939834dd1d9a0fc1b68587f6ba 100644 (file)
--- a/test/controllers/accounts_controller_test.rb
+++ b/test/controllers/accounts_controller_test.rb
@@ -60,16 +60,16 @@ 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 "form#accountForm > div.form-group > input.is-invalid#user_display_name"
+    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
     new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase)
     patch account_path, :params => { :user => new_attributes }
     assert_response :success
     assert_template :edit
 
     # Changing name to one that exists should fail, regardless of case
     new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase)
     patch account_path, :params => { :user => new_attributes }
     assert_response :success
     assert_template :edit

-    assert_select ".notice", false
-    assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name"
+    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")
 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")


@@ -79,8 +79,8 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     get edit_account_path
     assert_response :success
     assert_template :edit
     get edit_account_path
     assert_response :success
     assert_template :edit

-    assert_select ".notice", /^User information updated successfully/
-    assert_select "form#accountForm > div.form-group > input#user_display_name[value=?]", "new tester"
+    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
     user.display_name = "new tester"
 
     # Record the change of name
     user.display_name = "new tester"


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

-    assert_select ".notice", false
-    assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email"
+    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
     user.new_email = create(:user).email.upcase
 
     # Changing email to one that exists should fail, regardless of case
     user.new_email = create(:user).email.upcase


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

-    assert_select ".notice", false
-    assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email"
+    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
     user.new_email = "new_tester@example.com"
 
     # Changing email to one that doesn't exist should work
     user.new_email = "new_tester@example.com"


@@ -121,8 +121,8 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     get edit_account_path
     assert_response :success
     assert_template :edit
     get edit_account_path
     assert_response :success
     assert_template :edit

-    assert_select ".notice", /^User information updated successfully/
-    assert_select "form#accountForm > div.form-group > input#user_new_email[value=?]", user.new_email
+    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_equal user.new_email, email.to.first
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal user.new_email, email.to.first