From 605c943af5cb39cf95fed87acc74cdb797d596a0 Mon Sep 17 00:00:00 2001
From: Mathieu Darse <mdarse@jolicode.com>
Date: Mon, 15 Jun 2015 16:13:44 +0200
Subject: [PATCH] Fix IN search regression from
 40e2df6c3f8653ff482f3cd8165cfbea9461f7e5

---
 .../Elastic/Search/QueryContext.php            |  2 +-
 .../SearchEngine/Search/QueryContextTest.php   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 tests/Alchemy/Tests/Phrasea/SearchEngine/Search/QueryContextTest.php

diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryContext.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryContext.php
index ffeb19c924..a53dc9a570 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryContext.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryContext.php
@@ -34,7 +34,7 @@ class QueryContext
             }
         }
 
-        return new static($this->locales, $this->queryLocale, $fields);
+        return new static($this->structure, $this->locales, $this->queryLocale, $fields);
     }
 
     public function getRawFields()
diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/Search/QueryContextTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/Search/QueryContextTest.php
new file mode 100644
index 0000000000..63d9bec908
--- /dev/null
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/Search/QueryContextTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Alchemy\Tests\Phrasea\SearchEngine\Search;
+
+use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryContext;
+use Alchemy\Phrasea\SearchEngine\Elastic\Structure\Structure;
+
+class QueryContextTest extends \PHPUnit_Framework_TestCase
+{
+    public function testFieldNarrowing()
+    {
+        $structure = $this->prophesize(Structure::class)->reveal();
+        $available_locales = ['ab', 'cd', 'ef'];
+        $context = new QueryContext($structure, $available_locales, 'fr');
+        $narrowed = $context->narrowToFields(['some_field']);
+        $this->assertEquals(['some_field'], $narrowed->getFields());
+    }
+}