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

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

diff --git a/test/system/confirmation_resend_test.rb b/test/system/confirmation_resend_test.rb
index 6bbde09e0a2dfd86dc5a084245a8d269d30bc498..31b9ed7bb10204350f87c93288b25bcf0c279bce 100644 (file)
--- a/test/system/confirmation_resend_test.rb
+++ b/test/system/confirmation_resend_test.rb
@@ -5,22 +5,24 @@ class ConfirmationResendSystemTest < ApplicationSystemTestCase
     @user = build(:user)
     visit user_new_path
 
     @user = build(:user)
     visit user_new_path
 

-    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

 
     check "I have read and agree to the above contributor terms"
     check "I have read and agree to the Terms of Use"
 
     check "I have read and agree to the above contributor terms"
     check "I have read and agree to the Terms of Use"

-    click_button "Continue"
+    click_on "Continue"

   end
 
   test "flash message should not contain raw html" do
     visit user_confirm_resend_path(@user)
 
   end
 
   test "flash message should not contain raw html" do
     visit user_confirm_resend_path(@user)
 

-    assert page.has_content?("sent a new confirmation")
-    assert_not page.has_content?("<p>")
+    assert_content "sent a new confirmation"
+    assert_no_content "<p>"

   end
 end
   end
 end