From c269544adc323ac2e694d931c6980c75ee9f5874 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 24 Jun 2015 06:05:21 -0400 Subject: [PATCH] Fix get_resource_uri() test so it handles properly default_host with prefix and port --- plugins/libkolab/tests/kolab_storage_folder.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/libkolab/tests/kolab_storage_folder.php b/plugins/libkolab/tests/kolab_storage_folder.php index c2f91756..845244f4 100644 --- a/plugins/libkolab/tests/kolab_storage_folder.php +++ b/plugins/libkolab/tests/kolab_storage_folder.php @@ -97,13 +97,15 @@ class kolab_storage_folder_test extends PHPUnit_Framework_TestCase function test_003_get_resource_uri() { - $rcmail = rcmail::get_instance(); + $rcmail = rcmail::get_instance(); $foldername = 'Calendar'; + $uri = parse_url($rcmail->config->get('default_host')); + $hostname = $uri['host']; $folder = new kolab_storage_folder($foldername, 'event', 'event.default'); $this->assertEquals($folder->get_resource_uri(), sprintf('imap://%s@%s/%s', urlencode($rcmail->config->get('tests_username')), - $rcmail->config->get('default_host'), + $hostname, $foldername )); }