Merge pull request #1612 from wallabag/v2-settings-page

Settings page
2016-02-04 15:59:57 +01:00
parent 74f39b0952 79b9e49d94
commit e008c037f5
40 changed files with 510 additions and 245 deletions
--- a/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php
+++ b/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php
@ -55,11 +55,20 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
            ->disableOriginalConstructor()
            ->getMock();

+        $config = $this->getMockBuilder('Craue\ConfigBundle\Util\Config')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $config->expects($this->any())
+            ->method('get')
+            ->with('pocket_consumer_key')
+            ->willReturn($consumerKey);
+
        $pocket = new PocketImportMock(
            $this->tokenStorage,
            $this->em,
            $this->contentProxy,
-            $consumerKey
+            $config
        );

        $this->logHandler = new TestHandler();