Commit graph

62 commits

Author SHA1 Message Date
mark_story
f8966a64f2 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
2012-04-09 21:55:02 -04:00
mark_story
c718a18218 Fix coding standards errors. 2012-04-08 21:01:25 -04:00
mark_story
18296d2bf6 Fix a few coding standards errors. 2012-04-02 23:19:05 -04:00
Norio Suzuki
26b93afc3c fixed CakeEmail::reset, no initialized charset and headerCharset property 2012-04-01 23:42:18 +00:00
Rachman Chavik
6fa30db504 CakeEmail can use theme when rendering template 2012-03-28 22:01:30 +07:00
Ceeram
d748fc7451 Merge branch '2.1' into 2.2 2012-03-23 16:32:04 +01:00
Kyle Robinson Young
90e7afbdc7 Correct parameter order of assertEquals and assertNotEquals 2012-03-22 23:37:12 -07:00
mark_story
c58b61c17b Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
mark_story
d0733ceb00 Fix most coding standards in Case/Network 2012-03-16 22:19:01 -04:00
Norio Suzuki
358b84b577 Add charset() / headerCharset() methods to CakeEmail class 2012-03-16 12:54:30 +00:00
Ceeram
3e0294a695 Several fixes for testcases.
- Ensure correct ordering of find results
- avoid fatal error when testing email transport classes on 5.2
- add skips when running cross db join tests and multiple sqlite configs are defined
2012-03-15 01:31:28 +01:00
Ceeram
40f4f54b34 Several fixes for testcases.
- Ensure correct ordering of find results
- avoid fatal error when testing email transport classes on 5.2
- add skips when running cross db join tests and multiple sqlite configs are defined
2012-03-14 15:08:46 +01:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -08:00
mark_story
2afb05b590 Merge branch '2.0' into 2.1
Conflicts:
	app/View/Pages/home.ctp
	lib/Cake/Config/config.php
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
mark_story
0207a61e9b Move alias wrapping into _formatAddress()
Fixes #2502
2012-02-11 10:16:08 -05:00
Ceeram
7e5ef1dc0d avoid failing tests by 1 second diff 2012-02-10 19:53:04 +01:00
mark_story
f02a3b0531 Wrap aliases containing , in ""
Fixes #2502
2012-01-25 21:03:03 -05:00
mark_story
4d73f4e6a1 Fix boundaries used in multi-part messages.
Inline attachments should use the multipart/related boundary.  Otherwise
sections will be incorrectly nested.

Fixes #2413
2012-01-11 20:44:42 -05:00
Mark Story
83b28c42cf Fix failing tests and missing boundary markers.
When sending html + text emails, there were duplicate multipart/alternative sections
and the trailing top level boundary was missing.
2011-12-27 23:38:21 -05:00
Mark Story
f366a9ff83 Add test for inline attachments. 2011-12-27 22:51:47 -05:00
Mark Story
0e4af546d6 Update sending attachments.
Both inline and external attachments, as well as mixed sets of
inline and external attachments should work now.  Re-built the internals
of message rendering to remove duplication and redundant code paths.

Fixes #2413
Fixes #2320
2011-12-27 22:51:47 -05:00
Mark Story
34eedcc017 Add a few regression tests for CakeEmail. 2011-12-27 22:51:47 -05:00
Mark Story
bbef4aa36d Convert assertions to assetContains. 2011-12-27 22:51:47 -05:00
Mark Story
eda916d85b Update tests to use assertContains 2011-12-26 12:03:48 -05:00
Kyle Robinson Young
c8650165bb Add returnPath to test on SmtpTransport 2011-12-22 23:16:43 -08:00
euromark
a41539dfa4 Indentation fix (tab instead of spaces)
Fixes #2398

Conflicts:

	lib/Cake/Test/Case/Console/Command/ShellTest.php

Signed-off-by: mark_story <mark@mark-story.com>
2011-12-20 22:26:43 -05:00
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -08:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
Kyle Robinson Young
c97dca1570 Test case compatibility assertIsA() to assertInstanceOf() 2011-11-16 21:07:08 -05:00
Kyle Robinson Young
98f03dc6df Replacing test case compatibility functions 2011-11-16 21:07:08 -05:00
mark_story
87f5b6cf26 Fix more strict errors.
Fix strict errors in test files.
Remove a test in CakeEmail as array -> string causes a notice
in PHP 5.4
2011-11-13 20:47:55 -05:00
mark_story
bfd95d0e04 Fixing remaining failing tests in PHPUnit 3.6 2011-11-04 22:54:09 -04:00
Graham Weldon
212028cda2 Remove comments, and fix debug transport for email. 2011-10-23 00:23:50 +11:00
Graham Weldon
2844f4a477 Fixed sending BCC with DATA for CakeEmail, as well as 7->8bit conversion tests passing 2011-10-23 00:20:37 +11:00
Graham Weldon
f8697ccb55 Added skip if mbstring not available 2011-10-22 17:52:41 +11:00
Graham Weldon
51dd024a1a Merge remote-tracking branch 'origin/2.0' into 2.0 2011-10-22 14:55:53 +11:00
Ceeram
4d795a7383 ensure SmtpTransportTest passes, always use localhost as hostname 2011-10-21 15:02:53 +02:00
Norio Suzuki
712822ef83 add some test for ISO-2022-JP charset mails 2011-10-20 00:18:42 +09:00
Graham Weldon
e3898585be Added test for content transfer encoding for iso-2022-jp. Thanks @suzuki 2011-10-19 15:49:30 +11:00
Graham Weldon
cef441c16b Added test for ISO-2022-JP to demonstration fail for charset. Thanks @suzuki 2011-10-19 15:32:20 +11:00
Graham Weldon
cdc21e46cb Changed expectation for CakeEmail to 8bit for transport. 2011-10-19 15:20:09 +11:00
Jose Lorenzo Rodriguez
b38c0e50a4 Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating
all string from the App.encoding value to the configured charset if they differ. This makes possible to
send correctly emails in japanese charset
2011-10-16 15:43:10 -04:30
Mark Story mark@mark-story.com
957a8d5c00 Fixing log files to directories a webserver doesn't always have write access too. 2011-09-01 20:24:39 +01:00
Ceeram
0b00fb4fe0 fixing bug in deliver(), and adding more tests 2011-08-29 17:13:41 +02:00
Ceeram
4b093a858c adding more testcases for CakeEmail 2011-08-29 16:02:00 +02:00
Ceeram
c5d0955cd0 adding back blank line 2011-08-29 11:39:08 +02:00
Ceeram
87ffd92c2b Fixing transport test, as transport class now returns as stated in RFC 2822 2011-08-29 11:38:01 +02:00
Ceeram
3be9a8a5e8 debugtransport now also returns in correct format as stated in RFC 2822 2.3, updated tests 2011-08-29 11:21:46 +02:00