Merge "Uncomment and fix a test"

diff --git a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
index f0d8384..e49e1d8 100644 (file)
--- a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
@@ -131,7 +131,7 @@ class ApiQueryBasicTest extends ApiQueryTestBase {
        private static $allcategories = [
                [ 'list' => 'allcategories', 'acprefix' => 'AQBT-' ],
                [ 'allcategories' => [
-                       [ '*' => 'AQBT-Cat' ],
+                       [ 'category' => 'AQBT-Cat' ],
                ] ]
        ];
 
@@ -233,9 +233,7 @@ class ApiQueryBasicTest extends ApiQueryTestBase {
                $this->check( self::$allpages );
                $this->check( self::$alllinks );
                $this->check( self::$alltransclusions );
-               // This test is temporarily disabled until a sqlite bug is fixed
-               // Confirmed still broken 15-nov-2013
-               // $this->check( self::$allcategories );
+               $this->check( self::$allcategories );
                $this->check( self::$backlinks );
                $this->check( self::$embeddedin );
                $this->check( self::$categorymembers );