Merge branch 'master' into 2.1

2 files changed, 0 insertions, 183 deletions

diff --git a/src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php b/src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php
deleted file mode 100644
index 3eba7193..00000000
--- a/src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Wallabag\AnnotationBundle\Tests\Controller;
-
-use Wallabag\AnnotationBundle\Tests\WallabagAnnotationTestCase;
-
-class AnnotationControllerTest extends WallabagAnnotationTestCase
-{
-    public function testGetAnnotations()
-    {
-        $annotation = $this->client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagAnnotationBundle:Annotation')
-            ->findOneByUsername('admin');
-
-        if (!$annotation) {
-            $this->markTestSkipped('No content found in db.');
-        }
-
-        $this->logInAs('admin');
-        $crawler = $this->client->request('GET', 'annotations/'.$annotation->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($annotation->getText(), $content['rows'][0]['text']);
-    }
-
-    public function testSetAnnotation()
-    {
-        $this->logInAs('admin');
-
-        $entry = $this->client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUsernameAndNotArchived('admin');
-
-        $headers = ['CONTENT_TYPE' => 'application/json'];
-        $content = json_encode([
-            'text' => 'my annotation',
-            'quote' => 'my quote',
-            'ranges' => ['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31],
-        ]);
-        $crawler = $this->client->request('POST', 'annotations/'.$entry->getId().'.json', [], [], $headers, $content);
-
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-
-        $content = json_decode($this->client->getResponse()->getContent(), true);
-
-        $this->assertEquals('Big boss', $content['user']);
-        $this->assertEquals('v1.0', $content['annotator_schema_version']);
-        $this->assertEquals('my annotation', $content['text']);
-        $this->assertEquals('my quote', $content['quote']);
-
-        $annotation = $this->client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagAnnotationBundle:Annotation')
-            ->findLastAnnotationByPageId($entry->getId(), 1);
-
-        $this->assertEquals('my annotation', $annotation->getText());
-    }
-
-    public function testEditAnnotation()
-    {
-        $annotation = $this->client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagAnnotationBundle:Annotation')
-            ->findOneByUsername('admin');
-
-        $this->logInAs('admin');
-
-        $headers = ['CONTENT_TYPE' => 'application/json'];
-        $content = json_encode([
-            'text' => 'a modified annotation',
-        ]);
-        $crawler = $this->client->request('PUT', 'annotations/'.$annotation->getId().'.json', [], [], $headers, $content);
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-
-        $content = json_decode($this->client->getResponse()->getContent(), true);
-
-        $this->assertEquals('Big boss', $content['user']);
-        $this->assertEquals('v1.0', $content['annotator_schema_version']);
-        $this->assertEquals('a modified annotation', $content['text']);
-        $this->assertEquals('my quote', $content['quote']);
-
-        $annotationUpdated = $this->client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagAnnotationBundle:Annotation')
-            ->findOneById($annotation->getId());
-        $this->assertEquals('a modified annotation', $annotationUpdated->getText());
-    }
-
-    public function testDeleteAnnotation()
-    {
-        $annotation = $this->client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagAnnotationBundle:Annotation')
-            ->findOneByUsername('admin');
-
-        $this->logInAs('admin');
-
-        $headers = ['CONTENT_TYPE' => 'application/json'];
-        $content = json_encode([
-            'text' => 'a modified annotation',
-        ]);
-        $crawler = $this->client->request('DELETE', 'annotations/'.$annotation->getId().'.json', [], [], $headers, $content);
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-
-        $content = json_decode($this->client->getResponse()->getContent(), true);
-
-        $this->assertEquals('a modified annotation', $content['text']);
-
-        $annotationDeleted = $this->client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagAnnotationBundle:Annotation')
-            ->findOneById($annotation->getId());
-
-        $this->assertNull($annotationDeleted);
-    }
-}
diff --git a/src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php b/src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php
deleted file mode 100644
index a9035acc..00000000
--- a/src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Wallabag\AnnotationBundle\Tests;
-
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\BrowserKit\Cookie;
-
-abstract class WallabagAnnotationTestCase extends WebTestCase
-{
-    /**
-     * @var Client
-     */
-    protected $client = null;
-
-    /**
-     * @var \FOS\UserBundle\Model\UserInterface
-     */
-    protected $user;
-
-    public function setUp()
-    {
-        $this->client = $this->createAuthorizedClient();
-    }
-
-    public function logInAs($username)
-    {
-        $crawler = $this->client->request('GET', '/login');
-        $form = $crawler->filter('button[type=submit]')->form();
-        $data = [
-            '_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(['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;
-    }
-}