Changeset 355

Show
Ignore:
Timestamp:
04/07/06 09:43:23 (3 years ago)
Author:
snowblink
Message:

Updated User Controller tests to parse the user_id and email out of the URL in the email body.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • login_engine/branches/rb_1.0/test/functional/user_controller_test.rb

    r282 r355  
    8888    assert_match /login:\s+\w+\n/, mail.encoded 
    8989    assert_match /password:\s+\w+\n/, mail.encoded 
    90     mail.encoded =~ /user_id=(.*?)&key=(.*?)"/ 
    91     user_id = $1 
    92     key = $2 
     90    #mail.encoded =~ /user_id=(.*?)&key=(.*?)"/ 
     91    user_id = /user_id=(\d+)/.match(mail.encoded)[1] 
     92    key = /key=([a-z0-9]+)/.match(mail.encoded)[1] 
     93 
     94    assert_not_nil user_id 
     95    assert_not_nil key 
    9396 
    9497    user = User.find_by_email("newbob@test.com") 
    …… 
    249252    assert_equal 1, ActionMailer::Base.deliveries.size 
    250253    mail = ActionMailer::Base.deliveries[0] 
    251     mail.encoded =~ /user_id=(.*?)&key=(.*?)"/ 
    252     id = $1 
    253     key = $2 
    254      
    255     post :restore_deleted, :user_id => "#{id}", "key" => "badkey" 
     254    user_id = /user_id=(\d+)/.match(mail.encoded)[1] 
     255    key = /key=([a-z0-9]+)/.match(mail.encoded)[1] 
     256     
     257    post :restore_deleted, :user_id => "#{user_id}", "key" => "badkey" 
    256258    assert_session_has_no :user 
    257259 
    258260    # Advance the time past the delete date 
    259261    Time.advance_by_days = LoginEngine.config :delayed_delete_days 
    260     post :restore_deleted, :user_id => "#{id}", "key" => "#{key}" 
     262    post :restore_deleted, :user_id => "#{user_id}", "key" => "#{key}" 
    261263    assert_session_has_no :user 
    262264    Time.advance_by_days = 0 
    263265 
    264     post :restore_deleted, :user_id => "#{id}", "key" => "#{key}" 
     266    post :restore_deleted, :user_id => "#{user_id}", "key" => "#{key}" 
    265267    assert_session_has :user       
    266268  end 
    …… 
    455457        mail = ActionMailer::Base.deliveries[0] 
    456458        assert_equal "bob@test.com", mail.to_addrs[0].to_s 
    457         mail.encoded =~ /user_id=(.*?)&key=(.*?)"/ 
    458         id = $1 
    459         key = $2 
    460         post :change_password, :user => { :password => "#{password}", :password_confirmation => "#{password}"}, :user_id => "#{id}", :key => "#{key}" 
     459        user_id = /user_id=(\d+)/.match(mail.encoded)[1] 
     460        key = /key=([a-z0-9]+)/.match(mail.encoded)[1] 
     461        post :change_password, :user => { :password => "#{password}", :password_confirmation => "#{password}"}, :user_id => "#{user_id}", :key => "#{key}" 
    461462        assert_session_has :user 
    462463        get :logout