aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
Commit message (Collapse)AuthorAgeFilesLines
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-134-18/+40
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| * Allow custom type for multipart emails [#1691 state:resolved]Sean Dague2009-03-101-1/+29
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ruby 1.9 compat: rename deprecated assert_raises to assert_raise.Jeremy Kemper2009-03-082-5/+5
| | | | | | | | [#1617 state:resolved]
| * Removed the "charset" parameter from the Content-Type header of multipart ↵Elliott Wood2009-03-021-0/+1
| | | | | | | | | | | | | | sections of nested multipart messages. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2109 state:committed]
| * Fix a failing mailer test.thedarkone2009-02-201-1/+1
| |
| * Port fast reloadable templates from rails-dev-boost.thedarkone2009-02-122-1/+2
| |
| * Fixed that ActionMailer should send correctly formatted Return-Path in MAIL ↵Matt Jones2009-02-051-0/+1
| | | | | | | | | | | | FROM for SMTP [#1842 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Require rubygemsJeremy Kemper2009-02-031-1/+1
| |
| * Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha.Jeremy Kemper2009-02-032-11/+3
| |
* | Begin unifying the interface between ActionController and ActionViewYehuda Katz2009-01-221-4/+22
|/
* Add ActionMailer::Base#enable_starttls_auto option for enabling/disabling ↵Jose' Valim2009-01-181-0/+12
| | | | | | STARTTLS. [#1731 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Make ActioMailer quoting test play nice with Ruby 1.9 [#1726 state:resolved]Mike Gunderloy2009-01-161-2/+4
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Clean up view path cruft and split path implementations into Template::Path ↵Joshua Peek2008-12-291-1/+0
| | | | and Template::EagerPath
* Ensure the template format is always passed to the template finder. Now we ↵Joshua Peek2008-12-211-3/+6
| | | | can cleanup some nasty stuff.
* Fix tests broken by switch to PathnameJeremy Kemper2008-12-091-3/+3
|
* Register bogus template handlers for ActionMailer test fixturesJoshua Peek2008-12-032-0/+10
|
* Ensure ActionMailer doesn't blow up when a two argument proc is set for the ↵Tekin Suleyman2008-12-012-0/+55
| | | | | | | asset host Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1394 state:committed]
* Remove explicit tmail requires in favor of autoloadJeremy Kemper2008-11-231-1/+0
|
* ActionMailer should respect content type when choosing layoutsColin Curtin2008-11-214-0/+20
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Fixed RFC-2045 quoted-printable bug [#1421 state:committed]Alexey Mahotkin2008-11-201-1/+1
| | | | | | | | | | | | | | | http://www.faqs.org/rfcs/rfc2045.html says: may be represented by an "=" followed by a two digit hexadecimal representation of the octet's value. The digits of the hexadecimal alphabet, for this purpose, are "0123456789ABCDEF". Uppercase letters must be used; lowercase letters are not allowed. ActionMailer, however, used "=%02x" specification. Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Merge branch 'master' into testingJeremy Kemper2008-11-151-0/+14
|\
| * Added lambda merging to OptionMerger (especially useful with named_scope and ↵David Heinemeier Hansson2008-11-151-0/+2
| | | | | | | | with_options) [#740 state:commited] (Paweł Kondzior)
| * Fixed method_missing for ActionMailer so it no longer matches methods where ↵Joel Chippindale2008-11-111-0/+4
| | | | | | | | | | | | deliver or create are not a suffix [#1318 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fix for ActionMailer::Base.method_missing so that it raises NoMethodError ↵Joel Chippindale2008-11-111-0/+8
| | | | | | | | | | | | when no method is found [#1330 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Ruby 1.9 compat: check for minitest's assertion alsoJeremy Kemper2008-11-081-3/+3
|/
* Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and ↵Grant Hollingworth2008-11-062-2/+20
| | | | | | the SMTP server supports it [#1336 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Fixed load path for actionmailer and activesupport tests to always load from ↵madlep2008-10-041-0/+2
| | | | | | | | local lib files. [#983 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Protect body ivar from being clobbered by the mailer template assignsJoshua Peek2008-09-282-0/+14
|
* Fixed problem causes by leftover backup templates ending in tilde ↵U-ESCAPEE\Mack2008-09-091-0/+10
| | | | | | [state:committed #969] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Revert "Revert "Add layout functionality to mailers.""David Heinemeier Hansson2008-09-096-0/+83
| | | | This reverts commit 36c6aa01ee0a7aee5b0510a8e649c44de318b060.
* Revert "Add layout functionality to mailers."David Heinemeier Hansson2008-09-096-83/+0
| | | | This reverts commit e9a8e0053be3b293ab89fb584f1d660063f107aa.
* Add layout functionality to mailers.Pratik Naik2008-08-316-0/+83
| | | | | Mailer layouts behaves just like controller layouts, except layout names need to have '_mailer' postfix for them to be automatically picked up.
* ActionMailer should respond_to? to methods handled by method_missing [#700 ↵James Mead2008-08-291-0/+52
| | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Removed old deprecation test because the warning was removed in 1129a24Joshua Peek2008-08-221-9/+3
|
* Ensure templates are rendered if all the parts are already processedJoshua Peek2008-08-131-0/+0
|
* Tidy up ActionMailer rendering logic to take advantage of view path cache ↵Joshua Peek2008-08-061-20/+11
| | | | instead of using file system lookups
* Fix file permissionsTarmo Tänav2008-07-311-0/+0
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Only create a path for ActionMailer template root instead of a path set. ↵Joshua Peek2008-07-191-3/+3
| | | | Better fix than 7461227
* Update uses_mocha in ActionMailer and ActiveResourceJoshua Peek2008-07-191-5/+13
|
* Stubba is included in Mocha alreadyJoshua Peek2008-07-111-2/+1
|
* Replaced TemplateFinder abstraction with ViewLoadPathsJoshua Peek2008-06-171-3/+3
|
* Add ActionMailer#reply_to. [#245 state:resolved]Adam2008-05-291-0/+34
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Bah, don't test TMail in AMJeremy Kemper2008-04-033-19/+0
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9219 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ruby 1.9 compat: compare with same encodingJeremy Kemper2008-04-032-11/+18
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9218 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* force_encoding to ascii-8bit instead of nilJeremy Kemper2008-04-011-20/+18
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9184 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ruby 1.9 compat: mark utf-8 encoding.Jeremy Kemper2008-03-311-0/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9165 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Remove empty .rhtml templatesJeremy Kemper2008-02-0716-7/+7
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8820 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Less verbose mail logging: just recipients for :info log level; the whole ↵Jeremy Kemper2008-02-021-1/+2
| | | | | | email for :debug only. Closes #8000. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8781 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ruby 1.9 compat: test encoding fixes. Closes #10597 [murphy]Jeremy Kemper2008-01-191-1/+5
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8666 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Updated TMail to version 1.2.1 [raasdnil]Rick Olson2008-01-111-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8620 5ecf4fe2-1ee6-0310-87b1-e25e094e27de