One configuration file to rule them all.

horde · May 21, 2014 · 0dbc37a · 0dbc37a
1 parent 1d1bdfd
commit 0dbc37a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/framework/Mail_Autoconfig/package.xml b/framework/Mail_Autoconfig/package.xml
@@ -10,14 +10,14 @@
   <email>slusarz@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2014-05-17</date>
+ <date>2014-05-21</date>
  <version>
-  <release>1.0.0</release>
+  <release>1.0.0beta1</release>
   <api>1.0.0</api>
  </version>
  <stability>
-  <release>stable</release>
-  <api>stable</api>
+  <release>beta</release>
+  <api>beta</api>
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
@@ -61,7 +61,6 @@
      <dir name="Mail">
       <dir name="Autoconfig">
        <dir name="Driver">
-        <file name="conf.php.dist" role="test" />
         <file name="GuessTest.php" role="test" />
         <file name="SrvTest.php" role="test" />
         <file name="TestBase.php" role="test" />
@@ -152,13 +151,27 @@
    <install as="Horde/Mail/Autoconfig/bootstrap.php" name="test/Horde/Mail/Autoconfig/bootstrap.php" />
    <install as="Horde/Mail/Autoconfig/conf.php.dist" name="test/Horde/Mail/Autoconfig/conf.php.dist" />
    <install as="Horde/Mail/Autoconfig/phpunit.xml" name="test/Horde/Mail/Autoconfig/phpunit.xml" />
-   <install as="Horde/Mail/Autoconfig/Driver/conf.php.dist" name="test/Horde/Mail/Autoconfig/Driver/conf.php.dist" />
    <install as="Horde/Mail/Autoconfig/Driver/GuessTest.php" name="test/Horde/Mail/Autoconfig/Driver/GuessTest.php" />
    <install as="Horde/Mail/Autoconfig/Driver/SrvTest.php" name="test/Horde/Mail/Autoconfig/Driver/SrvTest.php" />
    <install as="Horde/Mail/Autoconfig/Driver/TestBase.php" name="test/Horde/Mail/Autoconfig/Driver/TestBase.php" />
    <install as="Horde/Mail/Autoconfig/Driver/ThunderbirdTest.php" name="test/Horde/Mail/Autoconfig/Driver/ThunderbirdTest.php" />
   </filelist>
  </phprelease>
  <changelog>
+  <release>
+   <date>2014-05-21</date>
+   <version>
+    <release>1.0.0beta1</release>
+    <api>1.0.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+   <notes>
+* [mms] Initial release.
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/framework/Mail_Autoconfig/test/Horde/Mail/Autoconfig/Driver/TestBase.php b/framework/Mail_Autoconfig/test/Horde/Mail/Autoconfig/Driver/TestBase.php
@@ -82,7 +82,7 @@ public function testGetMailConfig($domains)
 
     public function provider()
     {
-        $config = self::getConfig('MAILAUTOCONFIG_TEST_CONFIG');
+        $config = self::getConfig('MAILAUTOCONFIG_TEST_CONFIG', __DIR__ . '/..');
         if (!is_null($config) &&
             !empty($config['mail_autoconfig']['domains'])) {
             return $config['mail_autoconfig']['domains'];

diff --git a/framework/Mail_Autoconfig/test/Horde/Mail/Autoconfig/Driver/conf.php.dist b/framework/Mail_Autoconfig/test/Horde/Mail/Autoconfig/Driver/conf.php.dist
diff --git a/framework/Mail_Autoconfig/test/Horde/Mail/Autoconfig/conf.php.dist b/framework/Mail_Autoconfig/test/Horde/Mail/Autoconfig/conf.php.dist
@@ -3,5 +3,11 @@ $conf['mail_autoconfig'] = array(
     /* Test e-mails used for the non-auth autoconfig tests. */
     'nonauth_emails' => array(
         array(array('test@gmail.com'))
+    ),
+    /* Test domains used for the autoconfig driver tests. */
+    'domains' => array(
+        /* As of May 2014, Gmail supports SRV records. */
+        array(array('gmail.com')),
+        array(array('test.mail.gmail.com', 'mail.gmail.com', 'gmail.com'))
     )
 );