From 1fd9a46d713a4b314621bd7cf171bd048b10741f Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 29 Jun 2006 01:54:16 +0000 Subject: Resolve conflict among mailer actions with the same name. Closes #5520. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4509 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/test/fixtures/first_mailer/share.rhtml | 1 + .../funky_path_mailer/multipart_with_template_path_with_dots.rhtml | 1 + .../fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml | 1 - actionmailer/test/fixtures/second_mailer/share.rhtml | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 actionmailer/test/fixtures/first_mailer/share.rhtml create mode 100644 actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml create mode 100644 actionmailer/test/fixtures/second_mailer/share.rhtml (limited to 'actionmailer/test/fixtures') diff --git a/actionmailer/test/fixtures/first_mailer/share.rhtml b/actionmailer/test/fixtures/first_mailer/share.rhtml new file mode 100644 index 0000000000..da43638ceb --- /dev/null +++ b/actionmailer/test/fixtures/first_mailer/share.rhtml @@ -0,0 +1 @@ +first mail 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 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.rhtml @@ -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/multipart_with_template_path_with_dots.rhtml b/actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml index 897a5065cf..e69de29bb2 100644 --- a/actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml +++ b/actionmailer/test/fixtures/path.with.dots/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.rhtml b/actionmailer/test/fixtures/second_mailer/share.rhtml new file mode 100644 index 0000000000..9a54010672 --- /dev/null +++ b/actionmailer/test/fixtures/second_mailer/share.rhtml @@ -0,0 +1 @@ +second mail -- cgit v1.2.3