diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
commit | e4cf672ccf61689ba28c2e89fc55f83167800b18 (patch) | |
tree | 5dc22c97797bdcdd0a3d2a7e182410f04a748c1e /tests/Wallabag/ImportBundle | |
parent | e57df5611fe82ce61a71d51c762ee9296f18c3ac (diff) | |
parent | dbe94e73a9eaf3acb250812913b0303b35d01a2e (diff) | |
download | wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.gz wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.zst wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.zip |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'tests/Wallabag/ImportBundle')
-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); |