From: Tom Hughes Date: Mon, 8 Jul 2013 08:34:59 +0000 (+0100) Subject: Update tests for changes to signup form X-Git-Tag: live~4852 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8313bf0612b03771e280c616099beba846008cb9 Update tests for changes to signup form --- diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb index 578f477f6..79666adfe 100644 --- a/test/functional/user_controller_test.rb +++ b/test/functional/user_controller_test.rb @@ -259,7 +259,7 @@ class UserControllerTest < ActionController::TestCase assert_response :success assert_template 'new' assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_email" + assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_email" end def test_user_create_submit_duplicate_email_uppercase @@ -279,7 +279,7 @@ class UserControllerTest < ActionController::TestCase assert_response :success assert_template 'new' assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_email" + assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_email" end def test_user_create_submit_duplicate_name @@ -299,7 +299,7 @@ class UserControllerTest < ActionController::TestCase assert_response :success assert_template 'new' assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_display_name" + assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name" end def test_user_create_submit_duplicate_name_uppercase @@ -319,7 +319,7 @@ class UserControllerTest < ActionController::TestCase assert_response :success assert_template 'new' assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_display_name" + assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name" end def test_user_lost_password diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 67fbea7ec..6e253afad 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -30,7 +30,7 @@ class UserCreationTest < ActionController::IntegrationTest assert_template 'user/new' assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_email" + assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_email" assert_no_missing_translations end end @@ -49,7 +49,7 @@ class UserCreationTest < ActionController::IntegrationTest assert_response :success assert_template 'user/new' assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_display_name" + assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name" assert_no_missing_translations end end