Fix ActionMailer test issues
Fix ActionMailer test issues

* Don't depend so much no the message in a NameError
* Reset the delivery method properly

sergey-alekseev/rails,travisofthenorth/rails,mtsmfm/railstest,tjschuck/rails,kddeisz/rails,travisofthenorth/rails,elfassy/rails,joonyou/rails,kmcphillips/rails,Erol/rails,odedniv/rails,mijoharas/rails,yahonda/rails,gfvcastro/rails,deraru/rails,elfassy/rails,rossta/rails,MSP-Greg/rails,assain/rails,untidy-hair/rails,mtsmfm/rails,prathamesh-sonpatki/rails,bogdanvlviv/rails,lcreid/rails,Spin42/rails,kamipo/rails,tgxworld/rails,kaspth/rails,elfassy/rails,fabianoleittes/rails,kaspth/rails,fabianoleittes/rails,arunagw/rails,lcreid/rails,arjes/rails,sergey-alekseev/rails,illacceptanything/illacceptanything,yahonda/rails,illacceptanything/illacceptanything,samphilipd/rails,marklocklear/rails,tijwelch/rails,kmayer/rails,arjes/rails,kenta-s/rails,stefanmb/rails,flanger001/rails,notapatch/rails,pschambacher/rails,rails/rails,gavingmiller/rails,lucasmazza/rails,eileencodes/rails,flanger001/rails,odedniv/rails,lcreid/rails,brchristian/rails,Vasfed/rails,betesh/rails,hanystudy/rails,kenta-s/rails,prathamesh-sonpatki/rails,gcourtemanche/rails,Envek/rails,palkan/rails,tjschuck/rails,yalab/rails,Edouard-chin/rails,tgxworld/rails,repinel/rails,voray/rails,Edouard-chin/rails,matrinox/rails,kirs/rails-1,mijoharas/rails,rossta/rails,utilum/rails,baerjam/rails,baerjam/rails,joonyou/rails,vassilevsky/rails,pvalena/rails,printercu/rails,vipulnsward/rails,vassilevsky/rails,koic/rails,illacceptanything/illacceptanything,deraru/rails,mathieujobin/reduced-rails-for-travis,marklocklear/rails,starknx/rails,notapatch/rails,felipecvo/rails,Edouard-chin/rails,stefanmb/rails,bogdanvlviv/rails,bradleypriest/rails,yhirano55/rails,yawboakye/rails,samphilipd/rails,vipulnsward/rails,pschambacher/rails,yasslab/railsguides.jp,starknx/rails,hanystudy/rails,kddeisz/rails,illacceptanything/illacceptanything,amoody2108/TechForJustice,iainbeeston/rails,voray/rails,mathieujobin/reduced-rails-for-travis,yalab/rails,kirs/rails-1,Sen-Zhang/rails,arunagw/rails,bogdanvlviv/rails,yawboakye/rails,iainbeeston/rails,matrinox/rails,notapatch/rails,utilum/rails,gavingmiller/rails,ledestin/rails,xlymian/rails,illacceptanything/illacceptanything,aditya-kapoor/rails,kachick/rails,mijoharas/rails,mohitnatoo/rails,mtsmfm/railstest,joonyou/rails,kirs/rails-1,mohitnatoo/rails,starknx/rails,brchristian/rails,felipecvo/rails,pvalena/rails,aditya-kapoor/rails,tgxworld/rails,marklocklear/rails,yalab/rails,schuetzm/rails,brchristian/rails,aditya-kapoor/rails,notapatch/rails,deraru/rails,yahonda/rails,assain/rails,flanger001/rails,MSP-Greg/rails,palkan/rails,georgeclaghorn/rails,eileencodes/rails,sealocal/rails,Sen-Zhang/rails,Stellenticket/rails,88rabbit/newRails,xlymian/rails,sergey-alekseev/rails,yasslab/railsguides.jp,Vasfed/rails,rafaelfranca/omg-rails,rafaelfranca/omg-rails,vipulnsward/rails,Edouard-chin/rails,sealocal/rails,gfvcastro/rails,yawboakye/rails,pvalena/rails,printercu/rails,amoody2108/TechForJustice,alecspopa/rails,gauravtiwari/rails,hanystudy/rails,rossta/rails,Envek/rails,richseviora/rails,BlakeWilliams/rails,mtsmfm/railstest,schuetzm/rails,ttanimichi/rails,ledestin/rails,mechanicles/rails,tijwelch/rails,baerjam/rails,eileencodes/rails,mechanicles/rails,bogdanvlviv/rails,repinel/rails,untidy-hair/rails,rails/rails,MSP-Greg/rails,ttanimichi/rails,maicher/rails,illacceptanything/illacceptanything,georgeclaghorn/rails,MichaelSp/rails,bolek/rails,kachick/rails,jeremy/rails,Erol/rails,ttanimichi/rails,illacceptanything/illacceptanything,deraru/rails,sealocal/rails,fabianoleittes/rails,ngpestelos/rails,illacceptanything/illacceptanything,riseshia/railsguides.kr,illacceptanything/illacceptanything,illacceptanything/illacceptanything,gcourtemanche/rails,ledestin/rails,voray/rails,prathamesh-sonpatki/rails,mohitnatoo/rails,betesh/rails,kddeisz/rails,mechanicles/rails,arunagw/rails,lcreid/rails,arjes/rails,illacceptanything/illacceptanything,kmcphillips/rails,rafaelfranca/omg-rails,Envek/rails,mathieujobin/reduced-rails-for-travis,tijwelch/rails,jeremy/rails,gfvcastro/rails,illacceptanything/illacceptanything,baerjam/rails,coreyward/rails,matrinox/rails,88rabbit/newRails,printercu/rails,EmmaB/rails-1,Erol/rails,vipulnsward/rails,samphilipd/rails,jeremy/rails,betesh/rails,flanger001/rails,repinel/rails,untidy-hair/rails,esparta/rails,riseshia/railsguides.kr,kmcphillips/rails,Vasfed/rails,richseviora/rails,alecspopa/rails,maicher/rails,Stellenticket/rails,yalab/rails,kaspth/rails,esparta/rails,yasslab/railsguides.jp,ngpestelos/rails,Erol/rails,riseshia/railsguides.kr,tjschuck/rails,repinel/rails,fabianoleittes/rails,rbhitchcock/rails,koic/rails,shioyama/rails,kamipo/rails,mohitnatoo/rails,rbhitchcock/rails,gauravtiwari/rails,pschambacher/rails,georgeclaghorn/rails,MichaelSp/rails,illacceptanything/illacceptanything,odedniv/rails,BlakeWilliams/rails,kmayer/rails,rails/rails,maicher/rails,tgxworld/rails,BlakeWilliams/rails,gavingmiller/rails,joonyou/rails,schuetzm/rails,kenta-s/rails,illacceptanything/illacceptanything,Vasfed/rails,xlymian/rails,riseshia/railsguides.kr,iainbeeston/rails,kmayer/rails,jeremy/rails,gfvcastro/rails,ngpestelos/rails,georgeclaghorn/rails,lucasmazza/rails,prathamesh-sonpatki/rails,esparta/rails,mechanicles/rails,stefanmb/rails,eileencodes/rails,mtsmfm/rails,coreyward/rails,yhirano55/rails,bradleypriest/rails,untidy-hair/rails,shioyama/rails,assain/rails,assain/rails,iainbeeston/rails,betesh/rails,BlakeWilliams/rails,rails/rails,utilum/rails,arunagw/rails,bolek/rails,travisofthenorth/rails,EmmaB/rails-1,bolek/rails,esparta/rails,Sen-Zhang/rails,felipecvo/rails,rbhitchcock/rails,Envek/rails,vassilevsky/rails,kamipo/rails,gcourtemanche/rails,yahonda/rails,aditya-kapoor/rails,yhirano55/rails,MSP-Greg/rails,amoody2108/TechForJustice,richseviora/rails,kachick/rails,illacceptanything/illacceptanything,Stellenticket/rails,mtsmfm/rails,Spin42/rails,koic/rails,pvalena/rails,Stellenticket/rails,gauravtiwari/rails,kmcphillips/rails,shioyama/rails,alecspopa/rails,tjschuck/rails,schuetzm/rails,shioyama/rails,yhirano55/rails,MichaelSp/rails,printercu/rails,coreyward/rails,utilum/rails,yasslab/railsguides.jp,lucasmazza/rails,Spin42/rails,yawboakye/rails,bradleypriest/rails,palkan/rails,kddeisz/rails,travisofthenorth/rails,palkan/rails,88rabbit/newRails,EmmaB/rails-1