X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/90e46a58de583ac2bd7bb43077faa94186957a7a..491da055847c0b0184016606c93a65eeae38ce80:/test/functional/user_controller_test.rb?ds=sidebyside

diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb
index 24daa1a6c..4379a1d49 100644
--- a/test/functional/user_controller_test.rb
+++ b/test/functional/user_controller_test.rb
@@ -212,7 +212,7 @@ class UserControllerTest < ActionController::TestCase
     register_email = ActionMailer::Base.deliveries.first
   
     assert_equal register_email.to[0], new_email
-    assert_match /#{@url}/, register_email.body
+    assert_match /#{@url}/, register_email.body.to_s
 
     # Check the page
     assert_redirected_to :action => 'login', :referer => nil
@@ -367,7 +367,7 @@ class UserControllerTest < ActionController::TestCase
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_select "div#notice", /^User information updated successfully/
-    assert_select "table#accountForm > tr > td > textarea#user_description", user.description
+    assert_select "table#accountForm > tr > td > div#user_description_container > div#user_description_content > textarea#user_description", user.description
 
     # Changing name to one that exists should fail
     user.display_name = users(:public_user).display_name