X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FTests%2FController%2FEntryControllerTest.php;h=64ebd6318be8d3d17ee1c39a25741e553be1e20f;hb=f2e5fdc3666a2a6525b4202ab48df05efeebaf5c;hp=3a77518245e068bbb985ff6cba5adbb20a2a2107;hpb=5c072d2b57b2b5f95b25411909ac8a6af2ef6ebe;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php index 3a775182..64ebd631 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php @@ -25,28 +25,30 @@ class EntryControllerTest extends WallabagCoreTestCase $client = $this->getClient(); $client->request('GET', '/unread/list'); - $client->followRedirect(); + $crawler = $client->followRedirect(); $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $this->assertContains('We\'ll accompany you to visit wallabag', $client->getResponse()->getContent()); + $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text'])); + $this->assertContains('quickstart.intro.paragraph_1', $body[0]); // Test if quickstart is disabled when user has 1 entry $crawler = $client->request('GET', '/new'); $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $form = $crawler->filter('button[type=submit]')->form(); + $form = $crawler->filter('form[name=entry]')->form(); - $data = array( - 'entry[url]' => 'https://www.wallabag.org/blog/2016/01/08/wallabag-alpha1-v2', - ); + $data = [ + 'entry[url]' => $this->url, + ]; $client->submit($form, $data); $this->assertEquals(302, $client->getResponse()->getStatusCode()); $client->followRedirect(); - $client->request('GET', '/unread/list'); - $this->assertContains('There is one entry.', $client->getResponse()->getContent()); + $crawler = $client->request('GET', '/unread/list'); + $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text'])); + $this->assertContains('entry.list.number_on_the_page', $body[0]); } public function testGetNew() @@ -59,7 +61,7 @@ class EntryControllerTest extends WallabagCoreTestCase $this->assertEquals(200, $client->getResponse()->getStatusCode()); $this->assertCount(1, $crawler->filter('input[type=url]')); - $this->assertCount(1, $crawler->filter('button[type=submit]')); + $this->assertCount(1, $crawler->filter('form[name=entry]')); } public function testPostNewViaBookmarklet() @@ -72,7 +74,7 @@ class EntryControllerTest extends WallabagCoreTestCase $this->assertCount(4, $crawler->filter('div[class=entry]')); // Good URL - $client->request('GET', '/bookmarklet', array('url' => $this->url)); + $client->request('GET', '/bookmarklet', ['url' => $this->url]); $this->assertEquals(302, $client->getResponse()->getStatusCode()); $client->followRedirect(); $crawler = $client->request('GET', '/'); @@ -82,7 +84,7 @@ class EntryControllerTest extends WallabagCoreTestCase ->get('doctrine.orm.entity_manager'); $entry = $em ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUrl($this->url); + ->findByUrlAndUserId($this->url, $this->getLoggedInUserId()); $em->remove($entry); $em->flush(); } @@ -96,12 +98,12 @@ class EntryControllerTest extends WallabagCoreTestCase $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $form = $crawler->filter('button[type=submit]')->form(); + $form = $crawler->filter('form[name=entry]')->form(); $crawler = $client->submit($form); $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $this->assertCount(1, $alert = $crawler->filter('form ul li')->extract(array('_text'))); + $this->assertCount(1, $alert = $crawler->filter('form ul li')->extract(['_text'])); $this->assertEquals('This value should not be blank.', $alert[0]); } @@ -117,20 +119,45 @@ class EntryControllerTest extends WallabagCoreTestCase $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $form = $crawler->filter('button[type=submit]')->form(); + $form = $crawler->filter('form[name=entry]')->form(); - $data = array( + $data = [ 'entry[url]' => $this->url, - ); + ]; $client->submit($form, $data); $this->assertEquals(302, $client->getResponse()->getStatusCode()); - $crawler = $client->followRedirect(); + $content = $client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findByUrlAndUserId($this->url, $this->getLoggedInUserId()); + + $this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $content); + $this->assertEquals($this->url, $content->getUrl()); + $this->assertContains('Google', $content->getTitle()); + } + + public function testPostNewOkUrlExist() + { + $this->logInAs('admin'); + $client = $this->getClient(); + + $crawler = $client->request('GET', '/new'); + + $this->assertEquals(200, $client->getResponse()->getStatusCode()); + + $form = $crawler->filter('form[name=entry]')->form(); + + $data = [ + 'entry[url]' => $this->url, + ]; + + $client->submit($form, $data); - $this->assertGreaterThan(1, $alert = $crawler->filter('h2 a')->extract(array('_text'))); - $this->assertContains('Google', $alert[0]); + $this->assertEquals(302, $client->getResponse()->getStatusCode()); + $this->assertContains('/view/', $client->getResponse()->getTargetUrl()); } /** @@ -145,11 +172,11 @@ class EntryControllerTest extends WallabagCoreTestCase $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $form = $crawler->filter('button[type=submit]')->form(); + $form = $crawler->filter('form[name=entry]')->form(); - $data = array( + $data = [ 'entry[url]' => $url = 'https://github.com/wallabag/wallabag', - ); + ]; $client->submit($form, $data); @@ -191,6 +218,17 @@ class EntryControllerTest extends WallabagCoreTestCase $this->assertEquals(200, $client->getResponse()->getStatusCode()); } + public function testRangeException() + { + $this->logInAs('admin'); + $client = $this->getClient(); + + $client->request('GET', '/all/list/900'); + + $this->assertEquals(302, $client->getResponse()->getStatusCode()); + $this->assertEquals('/all/list', $client->getResponse()->getTargetUrl()); + } + /** * @depends testPostNewOk */ @@ -202,12 +240,13 @@ class EntryControllerTest extends WallabagCoreTestCase $content = $client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUrl($this->url); + ->findByUrlAndUserId($this->url, $this->getLoggedInUserId()); - $client->request('GET', '/view/'.$content->getId()); + $crawler = $client->request('GET', '/view/'.$content->getId()); $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $this->assertContains($content->getTitle(), $client->getResponse()->getContent()); + $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text'])); + $this->assertContains($content->getTitle(), $body[0]); } /** @@ -223,7 +262,7 @@ class EntryControllerTest extends WallabagCoreTestCase $content = $client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUrl($this->url); + ->findByUrlAndUserId($this->url, $this->getLoggedInUserId()); // empty content $content->setContent(''); @@ -237,7 +276,7 @@ class EntryControllerTest extends WallabagCoreTestCase $content = $client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUrl($this->url); + ->findByUrlAndUserId($this->url, $this->getLoggedInUserId()); $this->assertNotEmpty($content->getContent()); } @@ -250,7 +289,7 @@ class EntryControllerTest extends WallabagCoreTestCase $content = $client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUrl($this->url); + ->findByUrlAndUserId($this->url, $this->getLoggedInUserId()); $crawler = $client->request('GET', '/edit/'.$content->getId()); @@ -268,7 +307,7 @@ class EntryControllerTest extends WallabagCoreTestCase $content = $client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUrl($this->url); + ->findByUrlAndUserId($this->url, $this->getLoggedInUserId()); $crawler = $client->request('GET', '/edit/'.$content->getId()); @@ -276,9 +315,9 @@ class EntryControllerTest extends WallabagCoreTestCase $form = $crawler->filter('button[type=submit]')->form(); - $data = array( + $data = [ 'entry[title]' => 'My updated title hehe :)', - ); + ]; $client->submit($form, $data); @@ -286,7 +325,7 @@ class EntryControllerTest extends WallabagCoreTestCase $crawler = $client->followRedirect(); - $this->assertGreaterThan(1, $alert = $crawler->filter('div[id=article] h1')->extract(array('_text'))); + $this->assertGreaterThan(1, $alert = $crawler->filter('div[id=article] h1')->extract(['_text'])); $this->assertContains('My updated title hehe :)', $alert[0]); } @@ -298,7 +337,7 @@ class EntryControllerTest extends WallabagCoreTestCase $content = $client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUrl($this->url); + ->findByUrlAndUserId($this->url, $this->getLoggedInUserId()); $client->request('GET', '/archive/'.$content->getId()); @@ -320,7 +359,7 @@ class EntryControllerTest extends WallabagCoreTestCase $content = $client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUrl($this->url); + ->findByUrlAndUserId($this->url, $this->getLoggedInUserId()); $client->request('GET', '/star/'.$content->getId()); @@ -342,7 +381,7 @@ class EntryControllerTest extends WallabagCoreTestCase $content = $client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUrl($this->url); + ->findByUrlAndUserId($this->url, $this->getLoggedInUserId()); $client->request('GET', '/delete/'.$content->getId()); @@ -422,10 +461,10 @@ class EntryControllerTest extends WallabagCoreTestCase $form = $crawler->filter('button[id=submit-filter]')->form(); - $data = array( + $data = [ 'entry_filter[readingTime][right_number]' => 11, 'entry_filter[readingTime][left_number]' => 11, - ); + ]; $crawler = $client->submit($form, $data); @@ -441,28 +480,28 @@ class EntryControllerTest extends WallabagCoreTestCase $form = $crawler->filter('button[id=submit-filter]')->form(); - $data = array( + $data = [ 'entry_filter[createdAt][left_date]' => date('d/m/Y'), 'entry_filter[createdAt][right_date]' => date('d/m/Y', strtotime('+1 day')), - ); + ]; $crawler = $client->submit($form, $data); $this->assertCount(5, $crawler->filter('div[class=entry]')); - $data = array( + $data = [ 'entry_filter[createdAt][left_date]' => date('d/m/Y'), 'entry_filter[createdAt][right_date]' => date('d/m/Y'), - ); + ]; $crawler = $client->submit($form, $data); $this->assertCount(5, $crawler->filter('div[class=entry]')); - $data = array( + $data = [ 'entry_filter[createdAt][left_date]' => '01/01/1970', 'entry_filter[createdAt][right_date]' => '01/01/1970', - ); + ]; $crawler = $client->submit($form, $data); @@ -477,13 +516,13 @@ class EntryControllerTest extends WallabagCoreTestCase $form = $crawler->filter('button[id=config_save]')->form(); - $data = array( + $data = [ 'config[items_per_page]' => '1', - ); + ]; $client->submit($form, $data); - $parameters = '?entry_filter%5BreadingTime%5D%5Bleft_number%5D=&entry_filter%5BreadingTime%5D%5Bright_number%5D='; + $parameters = '?entry_filter%5BreadingTime%5D%5Bleft_number%5D=&entry_filter%5BreadingTime%5D%5Bright_number%5D='; $client->request('GET', 'unread/list'.$parameters); @@ -492,9 +531,9 @@ class EntryControllerTest extends WallabagCoreTestCase // reset pagination $crawler = $client->request('GET', '/config'); $form = $crawler->filter('button[id=config_save]')->form(); - $data = array( + $data = [ 'config[items_per_page]' => '12', - ); + ]; $client->submit($form, $data); } @@ -505,17 +544,17 @@ class EntryControllerTest extends WallabagCoreTestCase $crawler = $client->request('GET', '/unread/list'); $form = $crawler->filter('button[id=submit-filter]')->form(); - $data = array( + $data = [ 'entry_filter[domainName]' => 'domain', - ); + ]; $crawler = $client->submit($form, $data); $this->assertCount(5, $crawler->filter('div[class=entry]')); $form = $crawler->filter('button[id=submit-filter]')->form(); - $data = array( + $data = [ 'entry_filter[domainName]' => 'wallabag', - ); + ]; $crawler = $client->submit($form, $data); $this->assertCount(0, $crawler->filter('div[class=entry]')); @@ -562,17 +601,17 @@ class EntryControllerTest extends WallabagCoreTestCase $crawler = $client->request('GET', '/unread/list'); $form = $crawler->filter('button[id=submit-filter]')->form(); - $data = array( + $data = [ 'entry_filter[language]' => 'fr', - ); + ]; $crawler = $client->submit($form, $data); $this->assertCount(2, $crawler->filter('div[class=entry]')); $form = $crawler->filter('button[id=submit-filter]')->form(); - $data = array( + $data = [ 'entry_filter[language]' => 'en', - ); + ]; $crawler = $client->submit($form, $data); $this->assertCount(2, $crawler->filter('div[class=entry]'));