JsonTest.php (tine20-2020.08.3) | : | JsonTest.php (tine20-2020.08.4) | ||
---|---|---|---|---|
skipping to change at line 1369 | skipping to change at line 1369 | |||
* @see 0006628: tag handling on duplicate resolve actions in import fails | * @see 0006628: tag handling on duplicate resolve actions in import fails | |||
*/ | */ | |||
public function testImportKeepExistingWithTag() | public function testImportKeepExistingWithTag() | |||
{ | { | |||
$this->_testNeedsTransaction(); | $this->_testNeedsTransaction(); | |||
$klaus = $this->_tagImportHelper('discard'); | $klaus = $this->_tagImportHelper('discard'); | |||
$this->assertEquals(2, count($klaus['tags']), 'klaus should have both ta gs: ' . print_r($klaus['tags'], TRUE)); | $this->assertEquals(2, count($klaus['tags']), 'klaus should have both ta gs: ' . print_r($klaus['tags'], TRUE)); | |||
} | } | |||
public function testQueryFilterReturnedFromSrv() | ||||
{ | ||||
$result = $this->_uit->searchContacts(json_decode('[{"condition":"OR","f | ||||
ilters":[{"field":"foreignRecord","operator":"AND","value":{"appName":"Addressbo | ||||
ok","modelName":"Contact","linkType":"relation","filters":[{"field":"foreignReco | ||||
rd","operator":"AND","value":{"appName":"Addressbook","modelName":"Contact","lin | ||||
kType":"relation","filters":[{"field":"query","operator":"contains","value":"adf | ||||
","id":"ext-record-206"}]},"id":"ext-record-110"}]},"id":"ext-record-91"}],"id": | ||||
"FilterPanel"},{"field":"query","operator":"contains","value":"","id":"quickFilt | ||||
er"}]', true), []); | ||||
$this->assertArrayHasKey('filter', $result); | ||||
$filters = $result['filter'][0]['filters'][0]['value']['filters'][0]['va | ||||
lue']['filters']; | ||||
// make sure the query filter is not getting expanded | ||||
$count = count($filters); | ||||
$this->assertTrue(2 <= $count && 3 >= $count, '2019.11 should find 2, 20 | ||||
20.11+ should find 3 filters, found: ' . $count); | ||||
} | ||||
/** | /** | |||
* testImportMergeTheirsWithTag | * testImportMergeTheirsWithTag | |||
* | * | |||
*/ | */ | |||
public function testImportMergeTheirsWithTag() | public function testImportMergeTheirsWithTag() | |||
{ | { | |||
$this->_testNeedsTransaction(); | $this->_testNeedsTransaction(); | |||
$result = $this->_importHelper(array('dryrun' => 0)); | $result = $this->_importHelper(array('dryrun' => 0)); | |||
$this->assertTrue(count($result['results']) > 0, 'no record were importe d'); | $this->assertTrue(count($result['results']) > 0, 'no record were importe d'); | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 20 lines changed or added |