Make api create changeset path resourceful

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

diff --git a/test/system/user_email_change_test.rb b/test/system/user_email_change_test.rb
index eceb7341665e5e365a15cbf92172f5ddfeda020b..ccf1cf2ad93027f0234946b8695459d8726946a0 100644 (file)
--- a/test/system/user_email_change_test.rb
+++ b/test/system/user_email_change_test.rb
@@ -12,7 +12,7 @@ class UserEmailChangeTest < ApplicationSystemTestCase
     sign_in_as(user)
 
     assert_emails 1 do
     sign_in_as(user)
 
     assert_emails 1 do

-      visit edit_account_path
+      visit account_path

       fill_in "New Email Address", :with => "new_tester@example.com"
       click_on "Save Changes"
       assert_equal "new_tester@example.com", user.reload.new_email
       fill_in "New Email Address", :with => "new_tester@example.com"
       click_on "Save Changes"
       assert_equal "new_tester@example.com", user.reload.new_email


@@ -21,15 +21,13 @@ class UserEmailChangeTest < ApplicationSystemTestCase
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal "new_tester@example.com", email.to.first
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal "new_tester@example.com", email.to.first

-    assert_match %r{/user/confirm-email\?confirm_string=[A-Za-z0-9-_%]+\s}, email.parts[0].parts[0].decoded
+    assert_match %r{/user/confirm-email\?confirm_string=[A-Za-z0-9\-_%]+\s}, email.parts[0].parts[0].decoded

 
 

-    if email.parts[0].parts[0].decoded =~ %r{(/user/confirm-email\?confirm_string=[A-Za-z0-9-_%]+)\s}
+    if email.parts[0].parts[0].decoded =~ %r{(/user/confirm-email\?confirm_string=[A-Za-z0-9\-_%]+)\s}

       visit Regexp.last_match(1)
       visit Regexp.last_match(1)

-      assert page.has_css?("body.accounts-edit")
+      assert page.has_css?("body.accounts-show")

     end
 
     assert_equal "new_tester@example.com", user.reload.email
     end
 
     assert_equal "new_tester@example.com", user.reload.email

-
-    ActionMailer::Base.deliveries.clear

   end
 end
   end
 end