Merge remote-tracking branch 'origin/master' into routing

[rails.git] / test / integration / user_creation_test.rb

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 179f9eae169f077b60df02ee9b2a2f2cf18e893c..503160e9daa6c8095ebd9488d0fd4b2ab306e9d1 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserCreationTest < ActionDispatch::IntegrationTest
   fixtures :users
@@ -29,7 +29,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       assert_response :success
       assert_template 'user/new'
       assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root
-      assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
+      assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
       assert_no_missing_translations
     end
   end
@@ -47,7 +47,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       end
       assert_response :success
       assert_template 'user/new'
-      assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
+      assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
       assert_no_missing_translations
     end
   end