mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-23 08:06:33 +00:00
Code Issues Projects Releases Wiki Activity

Define storeArticleHeaders false by default

Browse source 
Fix tests which must use `$storeArticleHeaders`.
Fix CS
This commit is contained in:
Jeremy Benoist 2017-11-21 10:37:36 +01:00
parent 8a21985474
commit 709e21a3f4
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
4 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Helper/ContentProxy.php
View file

@ -26,7 +26,7 @@ class ContentProxy
protected $eventDispatcher; protected $eventDispatcher;
protected $storeArticleHeaders; protected $storeArticleHeaders;
public function __construct(Graby $graby, RuleBasedTagger $tagger, ValidatorInterface $validator, LoggerInterface $logger, $fetchingErrorMessage, $storeArticleHeaders) public function __construct(Graby $graby, RuleBasedTagger $tagger, ValidatorInterface $validator, LoggerInterface $logger, $fetchingErrorMessage, $storeArticleHeaders = false)
{ {
$this->graby = $graby; $this->graby = $graby;
$this->tagger = $tagger; $this->tagger = $tagger;

2
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
View file

@ -855,7 +855,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
$content = json_decode($this->client->getResponse()->getContent(), true); $content = json_decode($this->client->getResponse()->getContent(), true);
$this->assertSame(false, $content['exists']); $this->assertFalse($content['exists']);
} }
public function testGetEntriesExistsWithNoUrl() public function testGetEntriesExistsWithNoUrl()

2
tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
View file

@ -68,7 +68,7 @@ class GrabySiteConfigBuilderTest extends \PHPUnit_Framework_TestCase
$config = $this->builder->buildForHost('www.example.com'); $config = $this->builder->buildForHost('www.example.com');
$this->assertSame('example.com', $config->getHost()); $this->assertSame('example.com', $config->getHost());
$this->assertSame(true, $config->requiresLogin()); $this->assertTrue($config->requiresLogin());
$this->assertSame('http://www.example.com/login', $config->getLoginUri()); $this->assertSame('http://www.example.com/login', $config->getLoginUri());
$this->assertSame('login', $config->getUsernameField()); $this->assertSame('login', $config->getUsernameField());
$this->assertSame('password', $config->getPasswordField()); $this->assertSame('password', $config->getPasswordField());

29
tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
View file

@ -40,7 +40,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
'language' => '', 'language' => '',
]); ]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage, false); $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry($entry, 'http://user@:80'); $proxy->updateEntry($entry, 'http://user@:80');
@ -51,7 +51,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
$this->assertEmpty($entry->getMimetype()); $this->assertEmpty($entry->getMimetype());
$this->assertEmpty($entry->getLanguage()); $this->assertEmpty($entry->getLanguage());
$this->assertSame(0.0, $entry->getReadingTime()); $this->assertSame(0.0, $entry->getReadingTime());
$this->assertSame(null, $entry->getDomainName()); $this->assertNull($entry->getDomainName());
} }
public function testWithEmptyContent() public function testWithEmptyContent()
@ -75,7 +75,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
'language' => '', 'language' => '',
]); ]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage, false); $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry($entry, 'http://0.0.0.0'); $proxy->updateEntry($entry, 'http://0.0.0.0');
@ -115,7 +115,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
], ],
]); ]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage, false); $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry($entry, 'http://domain.io'); $proxy->updateEntry($entry, 'http://domain.io');
@ -157,7 +157,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
], ],
]); ]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage, false); $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry($entry, 'http://0.0.0.0'); $proxy->updateEntry($entry, 'http://0.0.0.0');
@ -199,7 +199,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
], ],
]); ]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage, false); $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry($entry, 'http://0.0.0.0'); $proxy->updateEntry($entry, 'http://0.0.0.0');
@ -241,7 +241,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
'status' => '200', 'status' => '200',
]); ]);
$proxy = new ContentProxy($graby, $tagger, $validator, $this->getLogger(), $this->fetchingErrorMessage, false); $proxy = new ContentProxy($graby, $tagger, $validator, $this->getLogger(), $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry($entry, 'http://0.0.0.0'); $proxy->updateEntry($entry, 'http://0.0.0.0');
@ -290,7 +290,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
], ],
]); ]);
$proxy = new ContentProxy($graby, $tagger, $validator, $this->getLogger(), $this->fetchingErrorMessage, false); $proxy = new ContentProxy($graby, $tagger, $validator, $this->getLogger(), $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry($entry, 'http://0.0.0.0'); $proxy->updateEntry($entry, 'http://0.0.0.0');
@ -311,7 +311,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
$tagger->expects($this->once()) $tagger->expects($this->once())
->method('tag'); ->method('tag');
$proxy = new ContentProxy((new Graby()), $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage, false); $proxy = new ContentProxy((new Graby()), $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage, true);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry( $proxy->updateEntry(
$entry, $entry,
@ -341,6 +341,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
$this->assertContains('Jeremy', $entry->getPublishedBy()); $this->assertContains('Jeremy', $entry->getPublishedBy());
$this->assertContains('Nico', $entry->getPublishedBy()); $this->assertContains('Nico', $entry->getPublishedBy());
$this->assertContains('Thomas', $entry->getPublishedBy()); $this->assertContains('Thomas', $entry->getPublishedBy());
$this->assertNotNull($entry->getHeaders(), 'Headers are stored, so value is not null');
$this->assertContains('no-cache', $entry->getHeaders()); $this->assertContains('no-cache', $entry->getHeaders());
} }
@ -353,7 +354,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
$logHandler = new TestHandler(); $logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]); $logger = new Logger('test', [$logHandler]);
$proxy = new ContentProxy((new Graby()), $tagger, $this->getValidator(), $logger, $this->fetchingErrorMessage, false); $proxy = new ContentProxy((new Graby()), $tagger, $this->getValidator(), $logger, $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry( $proxy->updateEntry(
$entry, $entry,
@ -388,7 +389,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
$handler = new TestHandler(); $handler = new TestHandler();
$logger->pushHandler($handler); $logger->pushHandler($handler);
$proxy = new ContentProxy((new Graby()), $tagger, $this->getValidator(), $logger, $this->fetchingErrorMessage, false); $proxy = new ContentProxy((new Graby()), $tagger, $this->getValidator(), $logger, $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry( $proxy->updateEntry(
$entry, $entry,
@ -425,7 +426,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
->method('tag') ->method('tag')
->will($this->throwException(new \Exception())); ->will($this->throwException(new \Exception()));
$proxy = new ContentProxy((new Graby()), $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage, false); $proxy = new ContentProxy((new Graby()), $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry( $proxy->updateEntry(
$entry, $entry,
@ -465,7 +466,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
$tagger->expects($this->once()) $tagger->expects($this->once())
->method('tag'); ->method('tag');
$proxy = new ContentProxy((new Graby()), $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage, false); $proxy = new ContentProxy((new Graby()), $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry( $proxy->updateEntry(
$entry, $entry,
@ -517,7 +518,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
'open_graph' => [], 'open_graph' => [],
]); ]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage, false); $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
$entry = new Entry(new User()); $entry = new Entry(new User());
$proxy->updateEntry($entry, 'http://0.0.0.0'); $proxy->updateEntry($entry, 'http://0.0.0.0');