Merge "Add editing own JSON to editmyoptions grant"

[lhc/web/wiklou.git] / tests / phpunit / includes / api / ApiEditPageTest.php

diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index 852812b..2161093 100644 (file)
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -33,6 +33,10 @@ class ApiEditPageTest extends ApiTestCase {
                        'testing-nontext' => 'DummyNonTextContentHandler',
                        'testing-serialize-error' => 'DummySerializeErrorContentHandler',
                ] );
+               $this->tablesUsed = array_merge(
+                       $this->tablesUsed,
+                       [ 'change_tag', 'change_tag_def', 'logging' ]
+               );
        }
 
        public function testEdit() {
@@ -1341,7 +1345,13 @@ class ApiEditPageTest extends ApiTestCase {
 
                $dbw = wfGetDB( DB_MASTER );
                $this->assertSame( 'custom tag', $dbw->selectField(
-                       'change_tag', 'ct_tag', [ 'ct_rev_id' => $revId ], __METHOD__ ) );
+                       [ 'change_tag', 'change_tag_def' ],
+                       'ctd_name',
+                       [ 'ct_rev_id' => $revId ],
+                       __METHOD__,
+                       [ 'change_tag_def' => [ 'INNER JOIN', 'ctd_id = ct_tag_id' ] ]
+                       )
+               );
        }
 
        public function testEditWithoutTagPermission() {