diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-21 00:29:44 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-21 00:29:44 +0000 |
| commit | 21187c0fb4fc559927a2f947f909dedd85969ffb (patch) | |
| tree | efd0ceb5c3a88531916186e97aa106041c293975 /actionmailer/test | |
| parent | b5419cd66ea160d1ee94f3ca521bb44adf3a21ca (diff) | |
| download | rails-21187c0fb4fc559927a2f947f909dedd85969ffb.tar.gz rails-21187c0fb4fc559927a2f947f909dedd85969ffb.tar.bz2 rails-21187c0fb4fc559927a2f947f909dedd85969ffb.zip | |
Apply the rest of Chads patch
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/test')
28 files changed, 34 insertions, 34 deletions
diff --git a/actionmailer/test/fixtures/first_mailer/share.erb b/actionmailer/test/fixtures/first_mailer/share.erb new file mode 100644 index 0000000000..da43638ceb --- /dev/null +++ b/actionmailer/test/fixtures/first_mailer/share.erb @@ -0,0 +1 @@ +first mail diff --git a/actionmailer/test/fixtures/first_mailer/share.rhtml b/actionmailer/test/fixtures/first_mailer/share.rhtml index da43638ceb..e69de29bb2 100644 --- a/actionmailer/test/fixtures/first_mailer/share.rhtml +++ b/actionmailer/test/fixtures/first_mailer/share.rhtml @@ -1 +0,0 @@ -first mail diff --git a/actionmailer/test/fixtures/helper_mailer/use_example_helper.erb b/actionmailer/test/fixtures/helper_mailer/use_example_helper.erb new file mode 100644 index 0000000000..fcff3bb1b4 --- /dev/null +++ b/actionmailer/test/fixtures/helper_mailer/use_example_helper.erb @@ -0,0 +1 @@ +So, <%= example_format(@text) %> diff --git a/actionmailer/test/fixtures/helper_mailer/use_example_helper.rhtml b/actionmailer/test/fixtures/helper_mailer/use_example_helper.rhtml index fcff3bb1b4..e69de29bb2 100644 --- a/actionmailer/test/fixtures/helper_mailer/use_example_helper.rhtml +++ b/actionmailer/test/fixtures/helper_mailer/use_example_helper.rhtml @@ -1 +0,0 @@ -So, <%= example_format(@text) %> diff --git a/actionmailer/test/fixtures/helper_mailer/use_helper.erb b/actionmailer/test/fixtures/helper_mailer/use_helper.erb new file mode 100644 index 0000000000..378777f8bb --- /dev/null +++ b/actionmailer/test/fixtures/helper_mailer/use_helper.erb @@ -0,0 +1 @@ +Hello, <%= person_name %>. Thanks for registering! diff --git a/actionmailer/test/fixtures/helper_mailer/use_helper.rhtml b/actionmailer/test/fixtures/helper_mailer/use_helper.rhtml index 378777f8bb..e69de29bb2 100644 --- a/actionmailer/test/fixtures/helper_mailer/use_helper.rhtml +++ b/actionmailer/test/fixtures/helper_mailer/use_helper.rhtml @@ -1 +0,0 @@ -Hello, <%= person_name %>. Thanks for registering! diff --git a/actionmailer/test/fixtures/helper_mailer/use_helper_method.erb b/actionmailer/test/fixtures/helper_mailer/use_helper_method.erb new file mode 100644 index 0000000000..d5b8b285e7 --- /dev/null +++ b/actionmailer/test/fixtures/helper_mailer/use_helper_method.erb @@ -0,0 +1 @@ +This message brought to you by <%= name_of_the_mailer_class %>. diff --git a/actionmailer/test/fixtures/helper_mailer/use_helper_method.rhtml b/actionmailer/test/fixtures/helper_mailer/use_helper_method.rhtml index d5b8b285e7..e69de29bb2 100644 --- a/actionmailer/test/fixtures/helper_mailer/use_helper_method.rhtml +++ b/actionmailer/test/fixtures/helper_mailer/use_helper_method.rhtml @@ -1 +0,0 @@ -This message brought to you by <%= name_of_the_mailer_class %>. diff --git a/actionmailer/test/fixtures/helper_mailer/use_mail_helper.erb b/actionmailer/test/fixtures/helper_mailer/use_mail_helper.erb new file mode 100644 index 0000000000..96ec49d18a --- /dev/null +++ b/actionmailer/test/fixtures/helper_mailer/use_mail_helper.erb @@ -0,0 +1,5 @@ +From "Romeo and Juliet": + +<%= block_format @text %> + +Good ol' Shakespeare. diff --git a/actionmailer/test/fixtures/helper_mailer/use_mail_helper.rhtml b/actionmailer/test/fixtures/helper_mailer/use_mail_helper.rhtml index 96ec49d18a..e69de29bb2 100644 --- a/actionmailer/test/fixtures/helper_mailer/use_mail_helper.rhtml +++ b/actionmailer/test/fixtures/helper_mailer/use_mail_helper.rhtml @@ -1,5 +0,0 @@ -From "Romeo and Juliet": - -<%= block_format @text %> - -Good ol' Shakespeare. diff --git a/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb b/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb new file mode 100644 index 0000000000..897a5065cf --- /dev/null +++ b/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb @@ -0,0 +1 @@ +Have a lovely picture, from me. Enjoy!
\ No newline at end of file diff --git a/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml b/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml index 897a5065cf..e69de29bb2 100644 --- a/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml +++ b/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml @@ -1 +0,0 @@ -Have a lovely picture, from me. Enjoy!
\ No newline at end of file diff --git a/actionmailer/test/fixtures/second_mailer/share.erb b/actionmailer/test/fixtures/second_mailer/share.erb new file mode 100644 index 0000000000..9a54010672 --- /dev/null +++ b/actionmailer/test/fixtures/second_mailer/share.erb @@ -0,0 +1 @@ +second mail diff --git a/actionmailer/test/fixtures/second_mailer/share.rhtml b/actionmailer/test/fixtures/second_mailer/share.rhtml index 9a54010672..e69de29bb2 100644 --- a/actionmailer/test/fixtures/second_mailer/share.rhtml +++ b/actionmailer/test/fixtures/second_mailer/share.rhtml @@ -1 +0,0 @@ -second mail diff --git a/actionmailer/test/fixtures/templates/signed_up.erb b/actionmailer/test/fixtures/templates/signed_up.erb new file mode 100644 index 0000000000..a85d5fa442 --- /dev/null +++ b/actionmailer/test/fixtures/templates/signed_up.erb @@ -0,0 +1,3 @@ +Hello there, + +Mr. <%= @recipient %>
\ No newline at end of file diff --git a/actionmailer/test/fixtures/templates/signed_up.rhtml b/actionmailer/test/fixtures/templates/signed_up.rhtml index a85d5fa442..e69de29bb2 100644 --- a/actionmailer/test/fixtures/templates/signed_up.rhtml +++ b/actionmailer/test/fixtures/templates/signed_up.rhtml @@ -1,3 +0,0 @@ -Hello there, - -Mr. <%= @recipient %>
\ No newline at end of file diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.erb b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.erb new file mode 100644 index 0000000000..6940419d47 --- /dev/null +++ b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.erb @@ -0,0 +1 @@ +Ignored when searching for implicitly multipart parts. diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml index 6940419d47..e69de29bb2 100644 --- a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml +++ b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml @@ -1 +0,0 @@ -Ignored when searching for implicitly multipart parts. diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb new file mode 100644 index 0000000000..946d99ede5 --- /dev/null +++ b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb @@ -0,0 +1,10 @@ +<html> + <body> + HTML formatted message to <strong><%= @recipient %></strong>. + </body> +</html> +<html> + <body> + HTML formatted message to <strong><%= @recipient %></strong>. + </body> +</html> diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml index 946d99ede5..e69de29bb2 100644 --- a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml +++ b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml @@ -1,10 +0,0 @@ -<html> - <body> - HTML formatted message to <strong><%= @recipient %></strong>. - </body> -</html> -<html> - <body> - HTML formatted message to <strong><%= @recipient %></strong>. - </body> -</html> diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.erb b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.erb new file mode 100644 index 0000000000..a6c8d54cf9 --- /dev/null +++ b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.erb @@ -0,0 +1,2 @@ +Plain text to <%= @recipient %>. +Plain text to <%= @recipient %>. diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml index a6c8d54cf9..e69de29bb2 100644 --- a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml +++ b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml @@ -1,2 +0,0 @@ -Plain text to <%= @recipient %>. -Plain text to <%= @recipient %>. diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.erb b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.erb new file mode 100644 index 0000000000..c14348c770 --- /dev/null +++ b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.erb @@ -0,0 +1 @@ +yaml to: <%= @recipient %>
\ No newline at end of file diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml index c14348c770..e69de29bb2 100644 --- a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml +++ b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml @@ -1 +0,0 @@ -yaml to: <%= @recipient %>
\ No newline at end of file diff --git a/actionmailer/test/fixtures/test_mailer/signed_up.erb b/actionmailer/test/fixtures/test_mailer/signed_up.erb new file mode 100644 index 0000000000..a85d5fa442 --- /dev/null +++ b/actionmailer/test/fixtures/test_mailer/signed_up.erb @@ -0,0 +1,3 @@ +Hello there, + +Mr. <%= @recipient %>
\ No newline at end of file diff --git a/actionmailer/test/fixtures/test_mailer/signed_up.rhtml b/actionmailer/test/fixtures/test_mailer/signed_up.rhtml index a85d5fa442..e69de29bb2 100644 --- a/actionmailer/test/fixtures/test_mailer/signed_up.rhtml +++ b/actionmailer/test/fixtures/test_mailer/signed_up.rhtml @@ -1,3 +0,0 @@ -Hello there, - -Mr. <%= @recipient %>
\ No newline at end of file diff --git a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb b/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb new file mode 100644 index 0000000000..e8fb65d4d2 --- /dev/null +++ b/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb @@ -0,0 +1,3 @@ +Hello there, + +Mr. <%= @recipient %>. Please see our greeting at <%= @welcome_url %>
\ No newline at end of file diff --git a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.rhtml b/actionmailer/test/fixtures/test_mailer/signed_up_with_url.rhtml index e8fb65d4d2..e69de29bb2 100644 --- a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.rhtml +++ b/actionmailer/test/fixtures/test_mailer/signed_up_with_url.rhtml @@ -1,3 +0,0 @@ -Hello there, - -Mr. <%= @recipient %>. Please see our greeting at <%= @welcome_url %>
\ No newline at end of file |