jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390848 )
Change subject: Normalize titles passed to QueryHelper::matchPage() ...................................................................... Normalize titles passed to QueryHelper::matchPage() So that linksto:foo would be the same as linksto:Foo Requested at https://meta.wikimedia.org/wiki/2017_Community_Wishlist_Survey/Search/Linksto_should_be_case-insensitive_in_the_first_character Change-Id: Id477b5662ed35726eff6a597c42fa953f1f49381 --- M includes/Query/QueryHelper.php A tests/unit/Query/QueryHelperTest.php M tests/unit/fixtures/searchText/browsertest_142.default.expected M tests/unit/fixtures/searchText/browsertest_142.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_142.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_148.default.expected M tests/unit/fixtures/searchText/browsertest_148.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_148.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_149.default.expected M tests/unit/fixtures/searchText/browsertest_149.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_149.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_150.default.expected M tests/unit/fixtures/searchText/browsertest_150.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_150.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_151.default.expected M tests/unit/fixtures/searchText/browsertest_151.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_151.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_152.default.expected M tests/unit/fixtures/searchText/browsertest_152.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_152.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_153.default.expected M tests/unit/fixtures/searchText/browsertest_153.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_153.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_154.default.expected M tests/unit/fixtures/searchText/browsertest_154.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_154.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_155.default.expected M tests/unit/fixtures/searchText/browsertest_155.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_155.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_156.default.expected M tests/unit/fixtures/searchText/browsertest_156.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_156.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_192.default.expected M tests/unit/fixtures/searchText/browsertest_192.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_192.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_192.query M tests/unit/fixtures/searchText/browsertest_193.default.expected M tests/unit/fixtures/searchText/browsertest_193.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_193.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_193.query M tests/unit/fixtures/searchText/browsertest_194.default.expected M tests/unit/fixtures/searchText/browsertest_194.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_194.fullyfeatured.expected M tests/unit/fixtures/searchText/browsertest_194.query M tests/unit/fixtures/searchText/browsertest_214.default.expected M tests/unit/fixtures/searchText/browsertest_214.fullyfeatured-interwiki.expected M tests/unit/fixtures/searchText/browsertest_214.fullyfeatured.expected 47 files changed, 161 insertions(+), 119 deletions(-) Approvals: Cindy-the-browser-test-bot: Looks good to me, but someone else must approve EBernhardson: Looks good to me, approved jenkins-bot: Verified DCausse: Looks good to me, but someone else must approve diff --git a/includes/Query/QueryHelper.php b/includes/Query/QueryHelper.php index 223e7c9..ae3814d 100644 --- a/includes/Query/QueryHelper.php +++ b/includes/Query/QueryHelper.php @@ -3,6 +3,7 @@ namespace CirrusSearch\Query; use CirrusSearch\Search\SearchContext; +use Title; /** * helpers for building queries @@ -19,10 +20,12 @@ * @return \Elastica\Query\Match For matching $title to $field */ public static function matchPage( $field, $title, $underscores = false ) { + $t = Title::newFromText( $title ); + if ( $t ) { + $title = $t->getPrefixedText(); + } if ( $underscores ) { $title = str_replace( ' ', '_', $title ); - } else { - $title = str_replace( '_', ' ', $title ); } $match = new \Elastica\Query\Match(); $match->setFieldQuery( $field, $title ); diff --git a/tests/unit/Query/QueryHelperTest.php b/tests/unit/Query/QueryHelperTest.php new file mode 100644 index 0000000..ccd37db --- /dev/null +++ b/tests/unit/Query/QueryHelperTest.php @@ -0,0 +1,39 @@ +<?php + +namespace CirrusSearch\Query; + +use CirrusSearch\CirrusTestCase; + +/** + * @group CirrusSearch + */ +class QueryHelperTest extends CirrusTestCase { + /** + * @dataProvider provideMatchPage + * + * @param $expected + * @param $field + * @param $title + * @param $underscores + */ + public function testMatchPage( $expected, $field, $title, $underscores ) { + $match = QueryHelper::matchPage( $field, $title, $underscores ); + + $this->assertType( \Elastica\Query\Match::class, $match ); + + $expectedArray = [ $field => [ 'query' => $expected ] ]; + + $this::assertEquals( json_encode( $expectedArray, JSON_PRETTY_PRINT ), + json_encode( $match->getParams(), JSON_PRETTY_PRINT ) + ); + } + + public function provideMatchPage() { + return [ + [ 'Page title', 'foo', 'Page title', false ], + [ 'Page title', 'foo', 'page_title', false ], + [ 'Page_title', 'foo', 'Page title', true ], + [ 'Page_title', 'foo', 'Page_title', true ], + ]; + } +} diff --git a/tests/unit/fixtures/searchText/browsertest_142.default.expected b/tests/unit/fixtures/searchText/browsertest_142.default.expected index aaaabe7..0f786c9 100644 --- a/tests/unit/fixtures/searchText/browsertest_142.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_142.default.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "doesnotexistatleastihopenot" + "query": "Doesnotexistatleastihopenot" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_142.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_142.fullyfeatured-interwiki.expected index 0b9e5ab..853956d 100644 --- a/tests/unit/fixtures/searchText/browsertest_142.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_142.fullyfeatured-interwiki.expected @@ -132,7 +132,7 @@ { "match": { "category.lowercase_keyword": { - "query": "doesnotexistatleastihopenot" + "query": "Doesnotexistatleastihopenot" } } } @@ -357,7 +357,7 @@ { "match": { "category.lowercase_keyword": { - "query": "doesnotexistatleastihopenot" + "query": "Doesnotexistatleastihopenot" } } } @@ -598,7 +598,7 @@ { "match": { "category.lowercase_keyword": { - "query": "doesnotexistatleastihopenot" + "query": "Doesnotexistatleastihopenot" } } } @@ -823,7 +823,7 @@ { "match": { "category.lowercase_keyword": { - "query": "doesnotexistatleastihopenot" + "query": "Doesnotexistatleastihopenot" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_142.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_142.fullyfeatured.expected index aaaabe7..0f786c9 100644 --- a/tests/unit/fixtures/searchText/browsertest_142.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_142.fullyfeatured.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "doesnotexistatleastihopenot" + "query": "Doesnotexistatleastihopenot" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_148.default.expected b/tests/unit/fixtures/searchText/browsertest_148.default.expected index cef634d..02575ea 100644 --- a/tests/unit/fixtures/searchText/browsertest_148.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_148.default.expected @@ -158,7 +158,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_148.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_148.fullyfeatured-interwiki.expected index 0248862..300b7af 100644 --- a/tests/unit/fixtures/searchText/browsertest_148.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_148.fullyfeatured-interwiki.expected @@ -160,7 +160,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } @@ -570,7 +570,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } @@ -1023,7 +1023,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } @@ -1433,7 +1433,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_148.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_148.fullyfeatured.expected index 21855a0..8377aea 100644 --- a/tests/unit/fixtures/searchText/browsertest_148.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_148.fullyfeatured.expected @@ -158,7 +158,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_149.default.expected b/tests/unit/fixtures/searchText/browsertest_149.default.expected index e8f330a..29c0b78 100644 --- a/tests/unit/fixtures/searchText/browsertest_149.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_149.default.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "templatetagged" + "query": "Templatetagged" } } } @@ -143,7 +143,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_149.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_149.fullyfeatured-interwiki.expected index 0afb5fc..caaf49a 100644 --- a/tests/unit/fixtures/searchText/browsertest_149.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_149.fullyfeatured-interwiki.expected @@ -132,7 +132,7 @@ { "match": { "category.lowercase_keyword": { - "query": "templatetagged" + "query": "Templatetagged" } } } @@ -145,7 +145,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } @@ -370,7 +370,7 @@ { "match": { "category.lowercase_keyword": { - "query": "templatetagged" + "query": "Templatetagged" } } } @@ -383,7 +383,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } @@ -624,7 +624,7 @@ { "match": { "category.lowercase_keyword": { - "query": "templatetagged" + "query": "Templatetagged" } } } @@ -637,7 +637,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } @@ -862,7 +862,7 @@ { "match": { "category.lowercase_keyword": { - "query": "templatetagged" + "query": "Templatetagged" } } } @@ -875,7 +875,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_149.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_149.fullyfeatured.expected index e8f330a..29c0b78 100644 --- a/tests/unit/fixtures/searchText/browsertest_149.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_149.fullyfeatured.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "templatetagged" + "query": "Templatetagged" } } } @@ -143,7 +143,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_150.default.expected b/tests/unit/fixtures/searchText/browsertest_150.default.expected index a8a43b8..b877e6e 100644 --- a/tests/unit/fixtures/searchText/browsertest_150.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_150.default.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_150.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_150.fullyfeatured-interwiki.expected index 4c87b7a..a92629c 100644 --- a/tests/unit/fixtures/searchText/browsertest_150.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_150.fullyfeatured-interwiki.expected @@ -132,7 +132,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -357,7 +357,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -598,7 +598,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -823,7 +823,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_150.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_150.fullyfeatured.expected index a8a43b8..b877e6e 100644 --- a/tests/unit/fixtures/searchText/browsertest_150.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_150.fullyfeatured.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_151.default.expected b/tests/unit/fixtures/searchText/browsertest_151.default.expected index c327935..54822e4 100644 --- a/tests/unit/fixtures/searchText/browsertest_151.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_151.default.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_151.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_151.fullyfeatured-interwiki.expected index e7d5e72..bb7cbfd 100644 --- a/tests/unit/fixtures/searchText/browsertest_151.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_151.fullyfeatured-interwiki.expected @@ -132,7 +132,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -357,7 +357,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -598,7 +598,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -823,7 +823,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_151.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_151.fullyfeatured.expected index c327935..54822e4 100644 --- a/tests/unit/fixtures/searchText/browsertest_151.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_151.fullyfeatured.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_152.default.expected b/tests/unit/fixtures/searchText/browsertest_152.default.expected index 38fdede..ec51aa3 100644 --- a/tests/unit/fixtures/searchText/browsertest_152.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_152.default.expected @@ -158,7 +158,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_152.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_152.fullyfeatured-interwiki.expected index dfdcd12..748572a 100644 --- a/tests/unit/fixtures/searchText/browsertest_152.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_152.fullyfeatured-interwiki.expected @@ -160,7 +160,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -570,7 +570,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -1023,7 +1023,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -1433,7 +1433,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_152.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_152.fullyfeatured.expected index d17b18b..54c9ce7 100644 --- a/tests/unit/fixtures/searchText/browsertest_152.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_152.fullyfeatured.expected @@ -158,7 +158,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_153.default.expected b/tests/unit/fixtures/searchText/browsertest_153.default.expected index e0401b8..e399bd5 100644 --- a/tests/unit/fixtures/searchText/browsertest_153.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_153.default.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } @@ -155,7 +155,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_153.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_153.fullyfeatured-interwiki.expected index 0ac36c6..0b0fa4c 100644 --- a/tests/unit/fixtures/searchText/browsertest_153.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_153.fullyfeatured-interwiki.expected @@ -132,7 +132,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } @@ -157,7 +157,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -372,7 +372,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } @@ -397,7 +397,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -628,7 +628,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } @@ -653,7 +653,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -868,7 +868,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } @@ -893,7 +893,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_153.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_153.fullyfeatured.expected index e0401b8..e399bd5 100644 --- a/tests/unit/fixtures/searchText/browsertest_153.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_153.fullyfeatured.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "twowords" + "query": "Twowords" } } } @@ -155,7 +155,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_154.default.expected b/tests/unit/fixtures/searchText/browsertest_154.default.expected index 2493566..1402484 100644 --- a/tests/unit/fixtures/searchText/browsertest_154.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_154.default.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -143,7 +143,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_154.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_154.fullyfeatured-interwiki.expected index 0d8dc3d..dc827cd 100644 --- a/tests/unit/fixtures/searchText/browsertest_154.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_154.fullyfeatured-interwiki.expected @@ -132,7 +132,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -145,7 +145,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -370,7 +370,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -383,7 +383,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -624,7 +624,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -637,7 +637,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -862,7 +862,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -875,7 +875,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_154.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_154.fullyfeatured.expected index 2493566..1402484 100644 --- a/tests/unit/fixtures/searchText/browsertest_154.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_154.fullyfeatured.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -143,7 +143,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_155.default.expected b/tests/unit/fixtures/searchText/browsertest_155.default.expected index 27e45a4..3ef4ac1 100644 --- a/tests/unit/fixtures/searchText/browsertest_155.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_155.default.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -143,7 +143,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_155.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_155.fullyfeatured-interwiki.expected index e46fc05..1a3c658 100644 --- a/tests/unit/fixtures/searchText/browsertest_155.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_155.fullyfeatured-interwiki.expected @@ -132,7 +132,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -145,7 +145,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -370,7 +370,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -383,7 +383,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -624,7 +624,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -637,7 +637,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -862,7 +862,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -875,7 +875,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_155.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_155.fullyfeatured.expected index 27e45a4..3ef4ac1 100644 --- a/tests/unit/fixtures/searchText/browsertest_155.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_155.fullyfeatured.expected @@ -130,7 +130,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -143,7 +143,7 @@ { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_156.default.expected b/tests/unit/fixtures/searchText/browsertest_156.default.expected index c2091d1..de95d31 100644 --- a/tests/unit/fixtures/searchText/browsertest_156.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_156.default.expected @@ -130,14 +130,14 @@ { "match": { "category.lowercase_keyword": { - "query": "nothing" + "query": "Nothing" } } }, { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_156.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_156.fullyfeatured-interwiki.expected index 2fd005f..a69624a 100644 --- a/tests/unit/fixtures/searchText/browsertest_156.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_156.fullyfeatured-interwiki.expected @@ -132,14 +132,14 @@ { "match": { "category.lowercase_keyword": { - "query": "nothing" + "query": "Nothing" } } }, { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -364,14 +364,14 @@ { "match": { "category.lowercase_keyword": { - "query": "nothing" + "query": "Nothing" } } }, { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -612,14 +612,14 @@ { "match": { "category.lowercase_keyword": { - "query": "nothing" + "query": "Nothing" } } }, { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } @@ -844,14 +844,14 @@ { "match": { "category.lowercase_keyword": { - "query": "nothing" + "query": "Nothing" } } }, { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_156.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_156.fullyfeatured.expected index c2091d1..de95d31 100644 --- a/tests/unit/fixtures/searchText/browsertest_156.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_156.fullyfeatured.expected @@ -130,14 +130,14 @@ { "match": { "category.lowercase_keyword": { - "query": "nothing" + "query": "Nothing" } } }, { "match": { "category.lowercase_keyword": { - "query": "weaponry" + "query": "Weaponry" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_192.default.expected b/tests/unit/fixtures/searchText/browsertest_192.default.expected index e78ba6d..ba8e003 100644 --- a/tests/unit/fixtures/searchText/browsertest_192.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_192.default.expected @@ -1,5 +1,5 @@ { - "description": "full_text search for 'linksto:\"LinksToTest Target\"'", + "description": "full_text search for 'linksto:\"linksToTest Target\"'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" diff --git a/tests/unit/fixtures/searchText/browsertest_192.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_192.fullyfeatured-interwiki.expected index 0bb0aa8..0fe3964 100644 --- a/tests/unit/fixtures/searchText/browsertest_192.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_192.fullyfeatured-interwiki.expected @@ -1,6 +1,6 @@ [ { - "description": "full_text search for 'linksto:\"LinksToTest Target\"'", + "description": "full_text search for 'linksto:\"linksToTest Target\"'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" @@ -219,7 +219,7 @@ } }, { - "description": "full_text search for 'linksto:\"LinksToTest Target\"'", + "description": "full_text search for 'linksto:\"linksToTest Target\"'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" @@ -454,7 +454,7 @@ } }, { - "description": "full_text search for 'linksto:\"LinksToTest Target\"'", + "description": "full_text search for 'linksto:\"linksToTest Target\"'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" @@ -673,7 +673,7 @@ } }, { - "description": "full_text search for 'linksto:\"LinksToTest Target\"'", + "description": "full_text search for 'linksto:\"linksToTest Target\"'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" diff --git a/tests/unit/fixtures/searchText/browsertest_192.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_192.fullyfeatured.expected index e78ba6d..ba8e003 100644 --- a/tests/unit/fixtures/searchText/browsertest_192.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_192.fullyfeatured.expected @@ -1,5 +1,5 @@ { - "description": "full_text search for 'linksto:\"LinksToTest Target\"'", + "description": "full_text search for 'linksto:\"linksToTest Target\"'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" diff --git a/tests/unit/fixtures/searchText/browsertest_192.query b/tests/unit/fixtures/searchText/browsertest_192.query index d7b496b..1202e2d 100644 --- a/tests/unit/fixtures/searchText/browsertest_192.query +++ b/tests/unit/fixtures/searchText/browsertest_192.query @@ -1,3 +1,3 @@ { - "query": "linksto:\"LinksToTest Target\"" + "query": "linksto:\"linksToTest Target\"" } diff --git a/tests/unit/fixtures/searchText/browsertest_193.default.expected b/tests/unit/fixtures/searchText/browsertest_193.default.expected index f370216..3e2208d 100644 --- a/tests/unit/fixtures/searchText/browsertest_193.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_193.default.expected @@ -1,5 +1,5 @@ { - "description": "full_text search for '-linksto:\"LinksToTest Target\" LinksToTest'", + "description": "full_text search for '-linksto:\"linksToTest Target\" LinksToTest'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" diff --git a/tests/unit/fixtures/searchText/browsertest_193.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_193.fullyfeatured-interwiki.expected index c963cbf..e97f272 100644 --- a/tests/unit/fixtures/searchText/browsertest_193.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_193.fullyfeatured-interwiki.expected @@ -1,6 +1,6 @@ [ { - "description": "full_text search for '-linksto:\"LinksToTest Target\" LinksToTest'", + "description": "full_text search for '-linksto:\"linksToTest Target\" LinksToTest'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" @@ -406,7 +406,7 @@ } }, { - "description": "full_text search for '-linksto:\"LinksToTest Target\" LinksToTest'", + "description": "full_text search for '-linksto:\"linksToTest Target\" LinksToTest'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" @@ -855,7 +855,7 @@ } }, { - "description": "full_text search for '-linksto:\"LinksToTest Target\" LinksToTest'", + "description": "full_text search for '-linksto:\"linksToTest Target\" LinksToTest'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" @@ -1261,7 +1261,7 @@ } }, { - "description": "full_text search for '-linksto:\"LinksToTest Target\" LinksToTest'", + "description": "full_text search for '-linksto:\"linksToTest Target\" LinksToTest'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" diff --git a/tests/unit/fixtures/searchText/browsertest_193.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_193.fullyfeatured.expected index cde2f37..a7c4b0e 100644 --- a/tests/unit/fixtures/searchText/browsertest_193.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_193.fullyfeatured.expected @@ -1,5 +1,5 @@ { - "description": "full_text search for '-linksto:\"LinksToTest Target\" LinksToTest'", + "description": "full_text search for '-linksto:\"linksToTest Target\" LinksToTest'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" diff --git a/tests/unit/fixtures/searchText/browsertest_193.query b/tests/unit/fixtures/searchText/browsertest_193.query index fdbcc9a..0076ccc 100644 --- a/tests/unit/fixtures/searchText/browsertest_193.query +++ b/tests/unit/fixtures/searchText/browsertest_193.query @@ -1,3 +1,3 @@ { - "query": "-linksto:\"LinksToTest Target\" LinksToTest" + "query": "-linksto:\"linksToTest Target\" LinksToTest" } diff --git a/tests/unit/fixtures/searchText/browsertest_194.default.expected b/tests/unit/fixtures/searchText/browsertest_194.default.expected index b736b78..85bcfac 100644 --- a/tests/unit/fixtures/searchText/browsertest_194.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_194.default.expected @@ -1,5 +1,5 @@ { - "description": "full_text search for 'linksto:\"LinksToTest Target\" text'", + "description": "full_text search for 'linksto:\"linksToTest Target\" text'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" diff --git a/tests/unit/fixtures/searchText/browsertest_194.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_194.fullyfeatured-interwiki.expected index 1d4a453..103bfba 100644 --- a/tests/unit/fixtures/searchText/browsertest_194.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_194.fullyfeatured-interwiki.expected @@ -1,6 +1,6 @@ [ { - "description": "full_text search for 'linksto:\"LinksToTest Target\" text'", + "description": "full_text search for 'linksto:\"linksToTest Target\" text'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" @@ -404,7 +404,7 @@ } }, { - "description": "full_text search for 'linksto:\"LinksToTest Target\" text'", + "description": "full_text search for 'linksto:\"linksToTest Target\" text'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" @@ -851,7 +851,7 @@ } }, { - "description": "full_text search for 'linksto:\"LinksToTest Target\" text'", + "description": "full_text search for 'linksto:\"linksToTest Target\" text'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" @@ -1255,7 +1255,7 @@ } }, { - "description": "full_text search for 'linksto:\"LinksToTest Target\" text'", + "description": "full_text search for 'linksto:\"linksToTest Target\" text'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" diff --git a/tests/unit/fixtures/searchText/browsertest_194.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_194.fullyfeatured.expected index c2bda01..1b56d5a 100644 --- a/tests/unit/fixtures/searchText/browsertest_194.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_194.fullyfeatured.expected @@ -1,5 +1,5 @@ { - "description": "full_text search for 'linksto:\"LinksToTest Target\" text'", + "description": "full_text search for 'linksto:\"linksToTest Target\" text'", "options": { "search_type": "dfs_query_then_fetch", "timeout": "20s" diff --git a/tests/unit/fixtures/searchText/browsertest_194.query b/tests/unit/fixtures/searchText/browsertest_194.query index 47ce7cc..244a5b8 100644 --- a/tests/unit/fixtures/searchText/browsertest_194.query +++ b/tests/unit/fixtures/searchText/browsertest_194.query @@ -1,3 +1,3 @@ { - "query": "linksto:\"LinksToTest Target\" text" + "query": "linksto:\"linksToTest Target\" text" } diff --git a/tests/unit/fixtures/searchText/browsertest_214.default.expected b/tests/unit/fixtures/searchText/browsertest_214.default.expected index 4e1f224..61c7cfc 100644 --- a/tests/unit/fixtures/searchText/browsertest_214.default.expected +++ b/tests/unit/fixtures/searchText/browsertest_214.default.expected @@ -158,7 +158,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_214.fullyfeatured-interwiki.expected b/tests/unit/fixtures/searchText/browsertest_214.fullyfeatured-interwiki.expected index 96ed4de..fea8a33 100644 --- a/tests/unit/fixtures/searchText/browsertest_214.fullyfeatured-interwiki.expected +++ b/tests/unit/fixtures/searchText/browsertest_214.fullyfeatured-interwiki.expected @@ -160,7 +160,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } @@ -570,7 +570,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } @@ -1023,7 +1023,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } @@ -1433,7 +1433,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } diff --git a/tests/unit/fixtures/searchText/browsertest_214.fullyfeatured.expected b/tests/unit/fixtures/searchText/browsertest_214.fullyfeatured.expected index bd3cf41..de8333b 100644 --- a/tests/unit/fixtures/searchText/browsertest_214.fullyfeatured.expected +++ b/tests/unit/fixtures/searchText/browsertest_214.fullyfeatured.expected @@ -158,7 +158,7 @@ { "match": { "category.lowercase_keyword": { - "query": "prize" + "query": "Prize" } } } -- To view, visit https://gerrit.wikimedia.org/r/390848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id477b5662ed35726eff6a597c42fa953f1f49381 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: MaxSem <[email protected]> Gerrit-Reviewer: Cindy-the-browser-test-bot <[email protected]> Gerrit-Reviewer: DCausse <[email protected]> Gerrit-Reviewer: EBernhardson <[email protected]> Gerrit-Reviewer: Gehel <[email protected]> Gerrit-Reviewer: Smalyshev <[email protected]> Gerrit-Reviewer: Tjones <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
