Merge remote-tracking branch 'origin/master' into 2.3

This commit is contained in:
Jeremy Benoist
2017-03-28 14:07:42 +02:00
66 changed files with 2415 additions and 427 deletions

View File

@ -1093,5 +1093,29 @@ class EntryControllerTest extends WallabagCoreTestCase
$crawler = $client->submit($form, $data);
$this->assertCount(0, $crawler->filter('div[class=entry]'));
// test url search on list of all articles
$crawler = $client->request('GET', '/all/list');
$form = $crawler->filter('form[name=search]')->form();
$data = [
'search_entry[term]' => 'domain', // the search will match an entry with 'domain' in its url
];
$crawler = $client->submit($form, $data);
$this->assertCount(1, $crawler->filter('div[class=entry]'));
// same as previous test but for case-sensitivity
$crawler = $client->request('GET', '/all/list');
$form = $crawler->filter('form[name=search]')->form();
$data = [
'search_entry[term]' => 'doMain', // the search will match an entry with 'domain' in its url
];
$crawler = $client->submit($form, $data);
$this->assertCount(1, $crawler->filter('div[class=entry]'));
}
}

View File

@ -183,7 +183,9 @@ JSON;
$message = new AMQPMessage($body);
$consumer->execute($message);
$res = $consumer->execute($message);
$this->assertTrue($res);
}
public function testMessageWithEntryProcessed()

View File

@ -182,7 +182,7 @@ JSON;
$res = $consumer->manage($body);
$this->assertFalse($res);
$this->assertTrue($res);
}
public function testMessageWithEntryProcessed()