jenkins-bot has submitted this change and it was merged.

Change subject: Update integration tests for new highlighter again
......................................................................


Update integration tests for new highlighter again

This time it grew the ability to filter down to matching phrases so we
reflect that.

Change-Id: I3bd4e443b2c70e0cdeb242feed58aa170939ec82
---
M includes/Updater.php
M tests/browser/features/highlighting.feature
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Updater.php b/includes/Updater.php
index 5675ba7..d4ea673 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -211,12 +211,12 @@
                try {
                        $pageType = Connection::getPageType( wfWikiId(), 
$indexType );
                        $this->start( "sending $documentCount documents to the 
$indexType index" );
-                       // addDocuments (notice plural) is the bulk api
                        $bulk = new \Elastica\Bulk( Connection::getClient() );
                        if ( $shardTimeout ) {
                                $bulk->setShardTimeout( $shardTimeout );
                        }
                        $bulk->setType( $pageType );
+                       // addDocuments (notice plural) is the bulk api
                        $bulk->addDocuments( $documents );
                        $bulk->send();
                } catch ( \Elastica\Exception\Bulk\ResponseException $e ) {
diff --git a/tests/browser/features/highlighting.feature 
b/tests/browser/features/highlighting.feature
index 770c9e1..2666ad5 100644
--- a/tests/browser/features/highlighting.feature
+++ b/tests/browser/features/highlighting.feature
@@ -19,8 +19,8 @@
     # Verify highlighting the presence of accent squashing
     | Africa test                | *África*                 | for *testing*    
                                |
     # Verify highlighting on large pages.
-    | "discuss problems of social and cultural importance" | Rashidun 
Caliphate | gathered to *discuss* *problems* *of* *social* *and* *cultural* 
*importance*. During the caliphate *of* Umar as many |
-    | "discuss problems of social and cultural importance"~ | Rashidun 
Caliphate | gathered to *discuss* *problems* *of* *social* *and* *cultural* 
*importance*. During the caliphate *of* Umar as many |
+    | "discuss problems of social and cultural importance" | Rashidun 
Caliphate | the faithful gathered to *discuss* *problems* *of* *social* *and* 
*cultural* *importance*. During the caliphate of |
+    | "discuss problems of social and cultural importance"~ | Rashidun 
Caliphate | the faithful gathered to *discuss* *problems* *of* *social* *and* 
*cultural* *importance*. During the caliphate of |
     # Auxiliary text
     | tallest alborz             | Rashidun Caliphate       | Mount Damavand, 
Iran's *tallest* mountain is located in *Alborz* mountain range. |
 
@@ -30,7 +30,7 @@
 
   Scenario: Found words are highlighted even if found by different analyzers
     When I search for "threatening the unity" community
-    Then *threatening* *the* *unity* and stability of *the* new *community* is 
in the highlighted text of the first search result
+    Then Abu Bakr's succession, *threatening* *the* *unity* and stability of 
the new *community* and state. Apostasy had is the highlighted text of the 
first search result
 
   @headings
   Scenario: Found words are highlighted in headings

-- 
To view, visit https://gerrit.wikimedia.org/r/131701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3bd4e443b2c70e0cdeb242feed58aa170939ec82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to