Merge branch 'master' of https://github.com/roundcube/roundcubemail

Conflicts:
	plugins/password/config.inc.php.dist

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/Framework/Csv2vcard.php b/tests/Framework/Csv2vcard.php
index 5d52efc58..4f48dfaa2 100644
--- a/tests/Framework/Csv2vcard.php
+++ b/tests/Framework/Csv2vcard.php
@@ -55,4 +55,22 @@ class Framework_Csv2vcard extends PHPUnit_Framework_TestCase
         $vcard    = trim(str_replace("\r\n", "\n", $vcard));
         $this->assertEquals($vcf_text, $vcard);
     }
+
+    function test_import_gmail()
+    {
+        $csv_text = file_get_contents(TESTS_DIR . '/src/Csv2vcard/gmail.csv');
+        $vcf_text = file_get_contents(TESTS_DIR . '/src/Csv2vcard/gmail.vcf');
+
+        $csv = new rcube_csv2vcard;
+        $csv->import($csv_text);
+        $result = $csv->export();
+        $vcard  = $result[0]->export(false);
+
+        $this->assertCount(1, $result);
+
+        $vcf_text = trim(str_replace("\r\n", "\n", $vcf_text));
+        $vcard    = trim(str_replace("\r\n", "\n", $vcard));
+
+        $this->assertEquals($vcf_text, $vcard);
+    }
 }