aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-2918-105/+195
|\
| * Make test:isolated run without bundler for Action MailerRobin Dupret2014-08-291-3/+2
| | | | | | | | | | | | | | | | Action Mailer tests weren't able to run in isolation without the bundle exec prefix since we were requiring gems before requiring abstract_unit. We don't need the `gem` call thus and the require_relative since the test directory should be present in the load path when we run any test.
| * Merge pull request #16598 from seuros/masterMatthew Draper2014-08-231-0/+1
| |\ | | | | | | [ActionMailer] require activejob railtie
| | * [ActionMailer] require activejob railtieAbdelkader Boudih2014-08-221-0/+1
| | |
| * | applies API guidelines to new AM docsXavier Noria2014-08-212-32/+32
| | |
| * | Fix SyntaxErrorAkira Matsuda2014-08-211-1/+1
| |/
| * Make the explicit the Active Job dependency of Action MailerRafael Mendonça França2014-08-201-0/+1
| |
| * [Rdoc] Make clear that we are sending an AR object [ci skip]Abdelkader Boudih2014-08-202-16/+16
| |
| * Fix typo in rdoc [ci skip]Abdelkader Boudih2014-08-202-16/+16
| |
| * Updated rdoc / guides / release notes related to ActiveJob / ActionMailerCristian Bica2014-08-206-41/+101
| |
| * Deprecated .deliver / .deliver! to .deliver_now / .deliver_now!Cristian Bica2014-08-209-53/+92
| |
| * Clear deliveries in order not to affect other testsAkira Matsuda2014-08-201-2/+4
| |
| * Remove global helpers from the ActionMailer test suite.Lucas Mazza2014-08-192-13/+1
| |
* | Preparing for 4.2.0.beta1 releaseDavid Heinemeier Hansson2014-08-191-1/+1
|/
* Extra spaceDavid Heinemeier Hansson2014-08-191-1/+0
|
* Add `set_delivery_method` and `restore_delivery_method` to ↵Lucas Mazza2014-08-191-0/+9
| | | | | | | | `ActionMailer::TestCase`. This way these methods are available outside the ActionMailer test suite, but they are still duplicated inside `test/abstract_unit` for test cases that don't inherit from the `ActionMailer::TestCase` class.
* Fix the rails-dom-testing dependecyRafael Mendonça França2014-08-191-1/+1
|
* Merge branch 'master' into loofahRafael Mendonça França2014-08-1710-10/+172
|\ | | | | | | | | Conflicts: actionpack/CHANGELOG.md
| * Add CHANGELOG entry for #deliver_laterDavid Heinemeier Hansson2014-08-171-0/+7
| |
| * [ActiveJob] Use globalid gemAbdelkader Boudih2014-08-171-1/+0
| |
| * [ActionMailer] Rename ActionMailer::DelayedDeliveryJob to ↵Abdelkader Boudih2014-08-174-8/+10
| | | | | | | | ActionMailer::DeliveryJob
| * [ActiveJob] Fix test syntaxAbdelkader Boudih2014-08-171-10/+10
| |
| * Fixed indentationCristian Bica2014-08-161-1/+1
| |
| * Removed method missing from ActionMailer::MessageDeliveryCristian Bica2014-08-152-4/+4
| |
| * Refactor DeliverLater into MessageDeliveryAbdelkader Boudih2014-08-149-83/+73
| |
| * Make ActionMailer::Previews methods class methods.Abdelkader Boudih2014-08-142-0/+8
| |
| * Merge branch 'master' into activejobCristian Bica2014-08-131-1/+3
| |\
| | * use :test delivery method for `base_test.rb`Yves Senn2014-08-132-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves errors like: ``` BaseTest#test_you_can_register_multiple_observers_to_the_mail_object_that_both_get_informed_on_email_delivery: Errno::ECONNREFUSED: Connection refused - connect(2) for "localhost" port 25 /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `initialize' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `open' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `tcp_socket' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:551:in `block in do_start' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:91:in `block in timeout' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:101:in `call' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:101:in `timeout' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:550:in `do_start' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:520:in `start' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/network/delivery_methods/smtp.rb:112:in `deliver!' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:2136:in `do_delivery' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:232:in `block in deliver' /Users/senny/Projects/rails/actionmailer/lib/action_mailer/base.rb:528:in `block in deliver_mail' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:164:in `block in instrument' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications/instrumenter.rb:20:in `instrument' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:164:in `instrument' /Users/senny/Projects/rails/actionmailer/lib/action_mailer/base.rb:526:in `deliver_mail' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:232:in `deliver' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:598:in `block (2 levels) in <class:BaseTest>' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:801:in `mail_side_effects' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:593:in `block in <class:BaseTest>' ``` where the `:smtp` delivery method was leaked over to other test cases.
| | * actionmailer_tests_are_order_dependent!Akira Matsuda2014-08-131-0/+5
| | |
| | * AM, AP, AV, and AMo tests are already order_independent!Akira Matsuda2014-08-131-5/+0
| | |
| * | Added ActionMailer::DeliverLaterAbdelkader Boudih2014-08-137-1/+160
| | |
* | | Merge branch 'master' into loofahRafael Mendonça França2014-08-126-14/+95
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/integration_test.rb actionview/CHANGELOG.md
| * | Nobody sucks so nobody should call this awful method nameRafael Mendonça França2014-08-121-1/+1
| | |
| * | users_dont_suck_but_only_we_suck_and_only_our_tests_are_order_dependent!Akira Matsuda2014-08-121-0/+5
| |/ | | | | | | | | Calling ActiveSupport::TestCase.i_suck_and_my_tests_are_order_dependent! in AS::TestCase makes everyone's tests order dependent, which should never be done by the framework.
| * Deprecate `*_path` methods in mailers@schneems and @sgrif2014-07-303-1/+12
| | | | | | | | | | | | | | | | | | | | | | Email does not support relative links since there is no implicit host. Therefore all links inside of emails must be fully qualified URLs. All path helpers are now deprecated. When removed, the error will give early indication to developers to use `*_url` methods instead. Currently if a developer uses a `*_path` helper, their tests and `mail_view` will not catch the mistake. The only way to see the error is by sending emails in production. Preventing sending out emails with non-working path's is the desired end goal of this PR. Currently path helpers are mixed-in to controllers (the ActionMailer::Base acts as a controller). All `*_url` and `*_path` helpers are made available through the same module. This PR separates this behavior into two modules so we can extend the `*_path` methods to add a Deprecation to them. Once deprecated we can use this same area to raise a NoMethodError and add an informative message directing the developer to use `*_url` instead. The module with warnings is only mixed in when a controller returns false from the newly added `supports_relative_path?`. Paired @sgrif & @schneems
| * Raise an exception when attachments are added after `mail` was called.Yves Senn2014-07-293-1/+62
| | | | | | | | | | | | | | | | | | Closes #16163 Adding attachments after a call to `mail` will result in invalid emails. This is related to the fact, that `mail` is making the required preparations before the email is ready to be sent. These change depending on your added attachments.
| * Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-191-0/+2
| |\ | | | | | | | | | | | | Conflicts: actionpack/test/abstract_unit.rb
| | * Stop requiring mocha automaticallyRafael Mendonça França2014-07-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are planning to remove mocha from our test suite because of performance problems. To make this possible we should stop require mocha on ActionSupport::TestCase. This should not affect applications since users still need to add mocha to Gemfile and this already load mocha. Added FIXME notes to place that still need mocha removal
| * | Prefer to pass block when logging.Guo Xiang Tan2014-07-181-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | The Logger by default includes a guard which checks for the logging level. By removing the custom logging guards, we can decouple the logging guard from the logging action to be done. This also follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance.
| * | Fix typos like `a html` to `an html` and 'an mail' to 'an email'. [ci skip]Santosh Wadghule2014-07-141-1/+1
| |/
* | Defining the right dependenciesRafael Mendonça França2014-07-151-0/+1
| |
* | Include the selector assertions on the test caseRafael Mendonça França2014-07-152-3/+2
| | | | | | | | | | We don't need to require users to include this module on ActionMailer::TestCase
* | Rails is a module not a classRafael Mendonça França2014-07-151-1/+1
| |
* | Merge pull request #11218 from kaspth/loofah-integrationRafael Mendonça França2014-07-102-3/+52
|\ \ | |/ |/| | | | | | | | | | | Loofah-integration Conflicts: actionpack/CHANGELOG.md actionview/CHANGELOG.md
| * Restore delivery method on teardowns.Timm2014-06-161-3/+2
| |
| * Inline Assertion reference.Timm2014-06-161-3/+4
| |
| * Remove response faking.Timm2014-06-161-15/+1
| |
| * Use 1.9 syntax.Timm2014-06-161-6/+6
| |
| * Added rails-dom-testing and rails-html-sanitizer to Gemfile. Added tests for ↵Timm2014-06-161-0/+63
| | | | | | | | assert_select_email.
* | test i18n against a routed appAaron Patterson2014-07-071-1/+16
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 05:53:03 +0000