hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ar-731-status-search-dsl

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/RecordIndexer.php
This commit is contained in:
Mathieu Darse
2015-10-06 12:26:03 +02:00
parent 8a5afb1140 b55cb86690
commit d6a82370a9
29 changed files with 517 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php
View File

@@ -234,9 +234,7 @@ class DataboxTest extends \PhraseanetAuthenticatedWebTestCase
$this->assertTrue($json->success);
$this->assertObjectHasAttribute('sbas_id', $json);
$this->assertObjectHasAttribute('indexable', $json);
$this->assertObjectHasAttribute('records', $json);
$this->assertObjectHasAttribute('xml_indexed', $json);
$this->assertObjectHasAttribute('thesaurus_indexed', $json);
$this->assertObjectHasAttribute('counts', $json);
$this->assertObjectHasAttribute('viewname', $json);
$this->assertObjectHasAttribute('printLogoURL', $json);
}

2
tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
View File

@@ -2288,7 +2288,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
$this->assertArrayHasKey('response', $content);
$this->assertTrue(is_array($content['meta']), 'Le bloc meta est un array');
$this->assertTrue(is_array($content['response']), 'Le bloc reponse est un array');
$this->assertEquals('1.4.1', $content['meta']['api_version']);
$this->assertEquals('2.0.0', $content['meta']['api_version']);
$this->assertNotNull($content['meta']['response_time']);
$this->assertEquals('UTF-8', $content['meta']['charset']);
}

6
tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TextNodeTest.php
View File

@@ -55,6 +55,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": {
"fields": ["foo.fr", "foo.en"],
"query": "bar",
"type": "cross_fields",
"operator": "and",
"lenient": true
}
@@ -94,6 +95,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": {
"fields": ["foo.fr", "foo.en"],
"query": "baz",
"type": "cross_fields",
"operator": "and",
"lenient": true
}
@@ -108,6 +110,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": {
"fields": ["private_caption.bar.fr", "private_caption.bar.en"],
"query": "baz",
"type": "cross_fields",
"operator": "and",
"lenient": true
}
@@ -140,6 +143,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": {
"fields": ["foo.fr", "foo.en"],
"query": "bar",
"type": "cross_fields",
"operator": "and",
"lenient": true
}
@@ -189,6 +193,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": {
"fields": ["foo.fr", "foo.en"],
"query": "baz",
"type": "cross_fields",
"operator": "and",
"lenient": true
}
@@ -212,6 +217,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": {
"fields": ["private_caption.bar.fr", "private_caption.bar.en"],
"query": "baz",
"type": "cross_fields",
"operator": "and",
"lenient": true
}