From c20fa4a1ad57a6fa013c7c9ddba72c6c3aafe345 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 15 Oct 2013 18:49:14 +0200
Subject: Fix address matching in Return-Path header on identity selection
 (#1489374)

---
 tests/MailFunc.php | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'tests')

diff --git a/tests/MailFunc.php b/tests/MailFunc.php
index 32304f307..08cbd4ed0 100644
--- a/tests/MailFunc.php
+++ b/tests/MailFunc.php
@@ -181,4 +181,40 @@ class MailFunc extends PHPUnit_Framework_TestCase
         $this->assertRegExp('|src="cid:theCID"|', $html, "URI base resolving exception [1]");
         $this->assertRegExp('|src="http://other\.domain\.tld/img3\.gif"|', $html, "URI base resolving exception [2]");
     }
+
+    /**
+     * Test identities selection using Return-Path header
+     */
+    function test_rcmail_identity_select()
+    {
+        $identities = array(
+            array(
+                'name' => 'Test',
+                'email_ascii' => 'addr@domain.tld',
+                'ident' => 'Test <addr@domain.tld>',
+            ),
+            array(
+                'name' => 'Test',
+                'email_ascii' => 'thing@domain.tld',
+                'ident' => 'Test <thing@domain.tld>',
+            ),
+            array(
+                'name' => 'Test',
+                'email_ascii' => 'other@domain.tld',
+                'ident' => 'Test <other@domain.tld>',
+            ),
+        );
+
+        $message = new stdClass;
+        $message->headers = new rcube_message_header;
+        $message->headers->set('Return-Path', '<some_thing@domain.tld>');
+        $res = rcmail_identity_select($message, $identities);
+
+        $this->assertSame($identities[0], $res);
+
+        $message->headers->set('Return-Path', '<thing@domain.tld>');
+        $res = rcmail_identity_select($message, $identities);
+
+        $this->assertSame($identities[1], $res);
+    }
 }
-- 
cgit v1.2.3