Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 May 2016 12:39:47 +0000 (14:39 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 May 2016 12:39:47 +0000 (14:39 +0200)
1  2 
tests/tine20/Tinebase/AllTests.php
tine20/Admin/Controller/User.php
tine20/Tinebase/User/ActiveDirectory.php

@@@ -34,15 -34,15 +34,16 @@@ class Tinebase_AllTest
      public static function suite()
      {
          $suite = new PHPUnit_Framework_TestSuite('Tine 2.0 Tinebase All Tests');
 +        $suite->addTestSuite('Tinebase_AccessLogTest');
          $suite->addTestSuite('Tinebase_AccountTest');
+         $suite->addTestSuite('Tinebase_AuthTest');
          $suite->addTestSuite('Tinebase_CoreTest');
-         $suite->addTestSuite('Tinebase_ModelConfigurationTest');
          $suite->addTestSuite('Tinebase_DateTimeTest');
          $suite->addTestSuite('Tinebase_ExceptionTest');
+         $suite->addTestSuite('Tinebase_LdapTest');
+         $suite->addTestSuite('Tinebase_ModelConfigurationTest');
          $suite->addTestSuite('Tinebase_Record_RecordTest');
          $suite->addTestSuite('Tinebase_Record_RecordSetTest');
-         $suite->addTestSuite('Tinebase_AuthTest');
          $suite->addTestSuite('Tinebase_UserTest');
          $suite->addTestSuite('Tinebase_GroupTest');
          $suite->addTestSuite('Tinebase_ZendFilterTest');
Simple merge