From f38e03dc02c96344677fd2720912605b21c90b5d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 7 Feb 2016 16:52:59 +0100 Subject: Comment work with annotator v2 - add missing annotator.js file and fix typo - edit & delete routes, started tests - basic tests --- .../Tests/Controller/CommentControllerTest.php | 81 ++++++++++++++++++++++ .../Tests/WallabagCommentTestCase.php | 63 +++++++++++++++++ 2 files changed, 144 insertions(+) create mode 100644 src/Wallabag/CommentBundle/Tests/Controller/CommentControllerTest.php create mode 100644 src/Wallabag/CommentBundle/Tests/WallabagCommentTestCase.php (limited to 'src/Wallabag/CommentBundle/Tests') diff --git a/src/Wallabag/CommentBundle/Tests/Controller/CommentControllerTest.php b/src/Wallabag/CommentBundle/Tests/Controller/CommentControllerTest.php new file mode 100644 index 00000000..f8b2a56f --- /dev/null +++ b/src/Wallabag/CommentBundle/Tests/Controller/CommentControllerTest.php @@ -0,0 +1,81 @@ +client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCommentBundle:Comment') + ->findOneBy(array('user' => 1)); + + if (!$comment) { + $this->markTestSkipped('No content found in db.'); + } + $this->logInAs('admin'); + $crawler = $this->client->request('GET', 'annotations/'.$comment->getEntry()->getId().'.json'); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + $this->assertEquals(1, $content['total']); + $this->assertEquals($comment->getText(), $content['rows'][0]['text']); + } + + public function testSetcomment() + { + $this->logInAs('admin'); + + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneBy(array('user' => 1)); + + $headers = array('CONTENT_TYPE' => 'application/json'); + $content = json_encode(array( + 'text' => 'my comment', + 'quote' => 'my quote', + 'range' => '[{"start":"","startOffset":24,"end":"","endOffset":31}]', + )); + $crawler = $this->client->request('POST', 'annotations/'.$entry->getId().'.json', array(), array(), $headers, $content); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $comment = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCommentBundle:Comment') + ->findLastCommentByPageId($entry->getId(), 1); + + $this->assertEquals('my comment', $comment->getText()); + } + + public function testEditcomment() + { + $comment = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCommentBundle:Comment') + ->findOneBy(array('user' => 1)); + + $this->logInAs('admin'); + + $headers = array('CONTENT_TYPE' => 'application/json'); + $content = json_encode(array( + 'text' => 'a modified comment', + )); + $crawler = $this->client->request('PUT', 'annotations/'.$comment->getId().'.json', array(), array(), $headers, $content); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertEquals('a modified comment', $content['text']); + + $commentUpdated = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCommentBundle:Comment') + ->findCommentById($comment->getId()); + $this->assertEquals('a modified comment', $commentUpdated->getText()); + } +} diff --git a/src/Wallabag/CommentBundle/Tests/WallabagCommentTestCase.php b/src/Wallabag/CommentBundle/Tests/WallabagCommentTestCase.php new file mode 100644 index 00000000..f4a2ae6c --- /dev/null +++ b/src/Wallabag/CommentBundle/Tests/WallabagCommentTestCase.php @@ -0,0 +1,63 @@ +client = $this->createAuthorizedClient(); + } + + public function logInAs($username) + { + $crawler = $this->client->request('GET', '/login'); + $form = $crawler->filter('button[type=submit]')->form(); + $data = array( + '_username' => $username, + '_password' => 'mypassword', + ); + + $this->client->submit($form, $data); + } + + /** + * @return Client + */ + protected function createAuthorizedClient() + { + $client = static::createClient(); + $container = $client->getContainer(); + + /** @var $userManager \FOS\UserBundle\Doctrine\UserManager */ + $userManager = $container->get('fos_user.user_manager'); + /** @var $loginManager \FOS\UserBundle\Security\LoginManager */ + $loginManager = $container->get('fos_user.security.login_manager'); + $firewallName = $container->getParameter('fos_user.firewall_name'); + + $this->user = $userManager->findUserBy(array('username' => 'admin')); + $loginManager->loginUser($firewallName, $this->user); + + // save the login token into the session and put it in a cookie + $container->get('session')->set('_security_'.$firewallName, serialize($container->get('security.token_storage')->getToken())); + $container->get('session')->save(); + + $session = $container->get('session'); + $client->getCookieJar()->set(new Cookie($session->getName(), $session->getId())); + + return $client; + } +} -- cgit v1.2.3