diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-10-10 19:02:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-10 19:02:05 +0200 |
| commit | 7dacf35845fd4a01299f732189dce06e34ea2796 (patch) | |
| tree | 0e739dd28005618578387fe8f589f4f8c2ae5ce1 /tests | |
| parent | bccf7a70bc22171904a5bb82d282e9c956684abc (diff) | |
| parent | e40bed36077164cb6d83761a6554b6b88ad95097 (diff) | |
| download | wallabag-7dacf35845fd4a01299f732189dce06e34ea2796.tar.gz wallabag-7dacf35845fd4a01299f732189dce06e34ea2796.tar.zst wallabag-7dacf35845fd4a01299f732189dce06e34ea2796.zip | |
Merge pull request #2420 from wallabag/redis-tests
Avoid error when Redis isn't here in tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Wallabag/ImportBundle/Controller/ChromeControllerTest.php | 1 | ||||
| -rw-r--r-- | tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/Wallabag/ImportBundle/Controller/ChromeControllerTest.php b/tests/Wallabag/ImportBundle/Controller/ChromeControllerTest.php index 23c80bec..c0417bbe 100644 --- a/tests/Wallabag/ImportBundle/Controller/ChromeControllerTest.php +++ b/tests/Wallabag/ImportBundle/Controller/ChromeControllerTest.php | |||
| @@ -54,6 +54,7 @@ class ChromeControllerTest extends WallabagCoreTestCase | |||
| 54 | 54 | ||
| 55 | public function testImportChromeWithRedisEnabled() | 55 | public function testImportChromeWithRedisEnabled() |
| 56 | { | 56 | { |
| 57 | $this->checkRedis(); | ||
| 57 | $this->logInAs('admin'); | 58 | $this->logInAs('admin'); |
| 58 | $client = $this->getClient(); | 59 | $client = $this->getClient(); |
| 59 | $client->getContainer()->get('craue_config')->set('import_with_redis', 1); | 60 | $client->getContainer()->get('craue_config')->set('import_with_redis', 1); |
diff --git a/tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php b/tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php index 98f13d72..6154ae8d 100644 --- a/tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php +++ b/tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php | |||
| @@ -54,6 +54,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase | |||
| 54 | 54 | ||
| 55 | public function testImportFirefoxWithRedisEnabled() | 55 | public function testImportFirefoxWithRedisEnabled() |
| 56 | { | 56 | { |
| 57 | $this->checkRedis(); | ||
| 57 | $this->logInAs('admin'); | 58 | $this->logInAs('admin'); |
| 58 | $client = $this->getClient(); | 59 | $client = $this->getClient(); |
| 59 | $client->getContainer()->get('craue_config')->set('import_with_redis', 1); | 60 | $client->getContainer()->get('craue_config')->set('import_with_redis', 1); |