diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-05-09 15:21:21 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-09 15:21:21 +0300 |
commit | 6e67f41152ad025e74696e7140de0f9fb0d601de (patch) | |
tree | 5d87be5998bedfc2e25099be17fdc1f3e5cc45ed /tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php | |
parent | 522e37ad274361dde697da13a92ff3f846599822 (diff) | |
parent | 68a90821a305867e9b655da2dbfe558d37253990 (diff) | |
download | wallabag-6e67f41152ad025e74696e7140de0f9fb0d601de.tar.gz wallabag-6e67f41152ad025e74696e7140de0f9fb0d601de.tar.zst wallabag-6e67f41152ad025e74696e7140de0f9fb0d601de.zip |
Merge pull request #3223 from wallabag/rss2atom
Changed RSS to Atom feed and improve paging
Diffstat (limited to 'tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php')
-rw-r--r-- | tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php index 1090a686..d8478ce3 100644 --- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php | |||
@@ -33,7 +33,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
33 | $this->assertCount(1, $crawler->filter('button[id=config_save]')); | 33 | $this->assertCount(1, $crawler->filter('button[id=config_save]')); |
34 | $this->assertCount(1, $crawler->filter('button[id=change_passwd_save]')); | 34 | $this->assertCount(1, $crawler->filter('button[id=change_passwd_save]')); |
35 | $this->assertCount(1, $crawler->filter('button[id=update_user_save]')); | 35 | $this->assertCount(1, $crawler->filter('button[id=update_user_save]')); |
36 | $this->assertCount(1, $crawler->filter('button[id=rss_config_save]')); | 36 | $this->assertCount(1, $crawler->filter('button[id=feed_config_save]')); |
37 | } | 37 | } |
38 | 38 | ||
39 | public function testUpdate() | 39 | public function testUpdate() |
@@ -297,7 +297,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
297 | $this->assertContains('flashes.config.notice.user_updated', $alert[0]); | 297 | $this->assertContains('flashes.config.notice.user_updated', $alert[0]); |
298 | } | 298 | } |
299 | 299 | ||
300 | public function testRssUpdateResetToken() | 300 | public function testFeedUpdateResetToken() |
301 | { | 301 | { |
302 | $this->logInAs('admin'); | 302 | $this->logInAs('admin'); |
303 | $client = $this->getClient(); | 303 | $client = $this->getClient(); |
@@ -313,7 +313,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
313 | } | 313 | } |
314 | 314 | ||
315 | $config = $user->getConfig(); | 315 | $config = $user->getConfig(); |
316 | $config->setRssToken(null); | 316 | $config->setFeedToken(null); |
317 | $em->persist($config); | 317 | $em->persist($config); |
318 | $em->flush(); | 318 | $em->flush(); |
319 | 319 | ||
@@ -322,7 +322,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
322 | $this->assertSame(200, $client->getResponse()->getStatusCode()); | 322 | $this->assertSame(200, $client->getResponse()->getStatusCode()); |
323 | 323 | ||
324 | $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text'])); | 324 | $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text'])); |
325 | $this->assertContains('config.form_rss.no_token', $body[0]); | 325 | $this->assertContains('config.form_feed.no_token', $body[0]); |
326 | 326 | ||
327 | $client->request('GET', '/generate-token'); | 327 | $client->request('GET', '/generate-token'); |
328 | $this->assertSame(302, $client->getResponse()->getStatusCode()); | 328 | $this->assertSame(302, $client->getResponse()->getStatusCode()); |
@@ -330,7 +330,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
330 | $crawler = $client->followRedirect(); | 330 | $crawler = $client->followRedirect(); |
331 | 331 | ||
332 | $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text'])); | 332 | $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text'])); |
333 | $this->assertNotContains('config.form_rss.no_token', $body[0]); | 333 | $this->assertNotContains('config.form_feed.no_token', $body[0]); |
334 | } | 334 | } |
335 | 335 | ||
336 | public function testGenerateTokenAjax() | 336 | public function testGenerateTokenAjax() |
@@ -351,7 +351,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
351 | $this->assertArrayHasKey('token', $content); | 351 | $this->assertArrayHasKey('token', $content); |
352 | } | 352 | } |
353 | 353 | ||
354 | public function testRssUpdate() | 354 | public function testFeedUpdate() |
355 | { | 355 | { |
356 | $this->logInAs('admin'); | 356 | $this->logInAs('admin'); |
357 | $client = $this->getClient(); | 357 | $client = $this->getClient(); |
@@ -360,10 +360,10 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
360 | 360 | ||
361 | $this->assertSame(200, $client->getResponse()->getStatusCode()); | 361 | $this->assertSame(200, $client->getResponse()->getStatusCode()); |
362 | 362 | ||
363 | $form = $crawler->filter('button[id=rss_config_save]')->form(); | 363 | $form = $crawler->filter('button[id=feed_config_save]')->form(); |
364 | 364 | ||
365 | $data = [ | 365 | $data = [ |
366 | 'rss_config[rss_limit]' => 12, | 366 | 'feed_config[feed_limit]' => 12, |
367 | ]; | 367 | ]; |
368 | 368 | ||
369 | $client->submit($form, $data); | 369 | $client->submit($form, $data); |
@@ -372,31 +372,31 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
372 | 372 | ||
373 | $crawler = $client->followRedirect(); | 373 | $crawler = $client->followRedirect(); |
374 | 374 | ||
375 | $this->assertContains('flashes.config.notice.rss_updated', $crawler->filter('body')->extract(['_text'])[0]); | 375 | $this->assertContains('flashes.config.notice.feed_updated', $crawler->filter('body')->extract(['_text'])[0]); |
376 | } | 376 | } |
377 | 377 | ||
378 | public function dataForRssFailed() | 378 | public function dataForFeedFailed() |
379 | { | 379 | { |
380 | return [ | 380 | return [ |
381 | [ | 381 | [ |
382 | [ | 382 | [ |
383 | 'rss_config[rss_limit]' => 0, | 383 | 'feed_config[feed_limit]' => 0, |
384 | ], | 384 | ], |
385 | 'This value should be 1 or more.', | 385 | 'This value should be 1 or more.', |
386 | ], | 386 | ], |
387 | [ | 387 | [ |
388 | [ | 388 | [ |
389 | 'rss_config[rss_limit]' => 1000000000000, | 389 | 'feed_config[feed_limit]' => 1000000000000, |
390 | ], | 390 | ], |
391 | 'validator.rss_limit_too_high', | 391 | 'validator.feed_limit_too_high', |
392 | ], | 392 | ], |
393 | ]; | 393 | ]; |
394 | } | 394 | } |
395 | 395 | ||
396 | /** | 396 | /** |
397 | * @dataProvider dataForRssFailed | 397 | * @dataProvider dataForFeedFailed |
398 | */ | 398 | */ |
399 | public function testRssFailed($data, $expectedMessage) | 399 | public function testFeedFailed($data, $expectedMessage) |
400 | { | 400 | { |
401 | $this->logInAs('admin'); | 401 | $this->logInAs('admin'); |
402 | $client = $this->getClient(); | 402 | $client = $this->getClient(); |
@@ -405,7 +405,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
405 | 405 | ||
406 | $this->assertSame(200, $client->getResponse()->getStatusCode()); | 406 | $this->assertSame(200, $client->getResponse()->getStatusCode()); |
407 | 407 | ||
408 | $form = $crawler->filter('button[id=rss_config_save]')->form(); | 408 | $form = $crawler->filter('button[id=feed_config_save]')->form(); |
409 | 409 | ||
410 | $crawler = $client->submit($form, $data); | 410 | $crawler = $client->submit($form, $data); |
411 | 411 | ||