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

[rails.git] / test / system / user_signup_test.rb

diff --git a/test/system/user_signup_test.rb b/test/system/user_signup_test.rb
index 5bd88f5a445cadba27891cb62a4af897a4445710..e97046800738edf107ce30c586873f96d6e958b1 100644 (file)
--- a/test/system/user_signup_test.rb
+++ b/test/system/user_signup_test.rb
@@ -14,12 +14,15 @@ class UserSignupTest < ApplicationSystemTestCase
 
     visit root_path
     click_on "Sign Up"
-    fill_in "Email", :with => user.email
-    fill_in "Email Confirmation", :with => user.email
-    fill_in "Display Name", :with => user.display_name
-    fill_in "Password", :with => "testtest"
-    fill_in "Confirm Password", :with => "testtest"
-    click_button "Sign Up"
+
+    within ".new_user" do
+      fill_in "Email", :with => user.email
+      fill_in "Email Confirmation", :with => user.email
+      fill_in "Display Name", :with => user.display_name
+      fill_in "Password", :with => "testtest"
+      fill_in "Confirm Password", :with => "testtest"
+      click_on "Sign Up"
+    end
 
     assert_content "Contributor terms"
     click_on "Cancel"