mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 19:11:07 +00:00
Ensure download_images_enabled is disabled
Even if the tests fail, that config must stay disabled after the test. Otherwise it might timeout on other test (because it'll try to save all other images)
This commit is contained in:
parent
1f155b29db
commit
be085c3d18
1 changed files with 20 additions and 1 deletions
|
@ -8,8 +8,24 @@ use Wallabag\CoreBundle\Entity\Entry;
|
||||||
|
|
||||||
class EntryControllerTest extends WallabagCoreTestCase
|
class EntryControllerTest extends WallabagCoreTestCase
|
||||||
{
|
{
|
||||||
|
public $downloadImagesEnabled = false;
|
||||||
public $url = 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html';
|
public $url = 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @after
|
||||||
|
*
|
||||||
|
* Ensure download_images_enabled is disabled after each script
|
||||||
|
*/
|
||||||
|
public function tearDownImagesEnabled()
|
||||||
|
{
|
||||||
|
if ($this->downloadImagesEnabled) {
|
||||||
|
$client = static::createClient();
|
||||||
|
$client->getContainer()->get('craue_config')->set('download_images_enabled', 0);
|
||||||
|
|
||||||
|
$this->downloadImagesEnabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function testLogin()
|
public function testLogin()
|
||||||
{
|
{
|
||||||
$client = $this->getClient();
|
$client = $this->getClient();
|
||||||
|
@ -905,6 +921,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||||
|
|
||||||
public function testNewEntryWithDownloadImagesEnabled()
|
public function testNewEntryWithDownloadImagesEnabled()
|
||||||
{
|
{
|
||||||
|
$this->downloadImagesEnabled = true;
|
||||||
$this->logInAs('admin');
|
$this->logInAs('admin');
|
||||||
$client = $this->getClient();
|
$client = $this->getClient();
|
||||||
|
|
||||||
|
@ -935,7 +952,8 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||||
$this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $entry);
|
$this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $entry);
|
||||||
$this->assertEquals($url, $entry->getUrl());
|
$this->assertEquals($url, $entry->getUrl());
|
||||||
$this->assertContains('Perpignan', $entry->getTitle());
|
$this->assertContains('Perpignan', $entry->getTitle());
|
||||||
$this->assertContains('/c4789a7f.jpeg', $entry->getContent());
|
// instead of checking for the filename (which might change) check that the image is now local
|
||||||
|
$this->assertContains('http://v2.wallabag.org/assets/images/', $entry->getContent());
|
||||||
|
|
||||||
$client->getContainer()->get('craue_config')->set('download_images_enabled', 0);
|
$client->getContainer()->get('craue_config')->set('download_images_enabled', 0);
|
||||||
}
|
}
|
||||||
|
@ -945,6 +963,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||||
*/
|
*/
|
||||||
public function testRemoveEntryWithDownloadImagesEnabled()
|
public function testRemoveEntryWithDownloadImagesEnabled()
|
||||||
{
|
{
|
||||||
|
$this->downloadImagesEnabled = true;
|
||||||
$this->logInAs('admin');
|
$this->logInAs('admin');
|
||||||
$client = $this->getClient();
|
$client = $this->getClient();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue