From 8197f08266256f55767666b90be47f585c7a6d28 Mon Sep 17 00:00:00 2001
From: adev <adev2000@gmail.com>
Date: Sun, 27 Oct 2019 18:51:32 +0100
Subject: API return an error with empty quote

Fix #4137
---
 .../Controller/AnnotationControllerTest.php        | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php')

diff --git a/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php b/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
index 2c46e0a1..74e9ba8f 100644
--- a/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
+++ b/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
@@ -107,6 +107,36 @@ class AnnotationControllerTest extends WallabagAnnotationTestCase
         $this->assertSame('my annotation', $annotation->getText());
     }
 
+    public function testCouldNotSetAnnotationWithoutQuote()
+    {
+        $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
+
+        /** @var Entry $entry */
+        $entry = $em
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findOneByUsernameAndNotArchived('admin');
+
+        $headers = ['CONTENT_TYPE' => 'application/json'];
+        $content = json_encode([
+            'text' => 'my annotation',
+            'quote' => null,
+            'ranges' => [
+                ['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31],
+            ],
+        ]);
+        $this->client->request('POST', '/api/annotations/' . $entry->getId() . '.json', [], [], $headers, $content);
+
+        $this->assertSame(400, $this->client->getResponse()->getStatusCode());
+
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+
+        $this->assertCount(
+            1,
+            $content['errors']['children']['quote']['errors'],
+            'The quote field should contains an error'
+        );
+    }
+
     /**
      * @dataProvider dataForEachAnnotations
      */
-- 
cgit v1.2.3


From 6a0d49ab7a8ac9e00f9df34b37b6d3e1ab40f2a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Benoist?=
 <j0k3r@users.noreply.github.com>
Date: Wed, 27 Nov 2019 14:04:11 +0100
Subject: Fix tests

---
 .../Controller/AnnotationControllerTest.php        | 41 ++++++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

(limited to 'tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php')

diff --git a/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php b/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
index 74e9ba8f..260edd77 100644
--- a/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
+++ b/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
@@ -107,7 +107,7 @@ class AnnotationControllerTest extends WallabagAnnotationTestCase
         $this->assertSame('my annotation', $annotation->getText());
     }
 
-    public function testCouldNotSetAnnotationWithoutQuote()
+    public function testAllowEmptyQuote()
     {
         $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
 
@@ -126,15 +126,42 @@ class AnnotationControllerTest extends WallabagAnnotationTestCase
         ]);
         $this->client->request('POST', '/api/annotations/' . $entry->getId() . '.json', [], [], $headers, $content);
 
-        $this->assertSame(400, $this->client->getResponse()->getStatusCode());
+        $this->assertSame(200, $this->client->getResponse()->getStatusCode());
+
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+
+        $this->assertSame('Big boss', $content['user']);
+        $this->assertSame('v1.0', $content['annotator_schema_version']);
+        $this->assertSame('my annotation', $content['text']);
+        $this->assertSame('', $content['quote']);
+    }
+
+    public function testAllowOmmittedQuote()
+    {
+        $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
+
+        /** @var Entry $entry */
+        $entry = $em
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findOneByUsernameAndNotArchived('admin');
+
+        $headers = ['CONTENT_TYPE' => 'application/json'];
+        $content = json_encode([
+            'text' => 'my new annotation',
+            'ranges' => [
+                ['start' => '', 'startOffset' => 25, 'end' => '', 'endOffset' => 32],
+            ],
+        ]);
+        $this->client->request('POST', '/api/annotations/' . $entry->getId() . '.json', [], [], $headers, $content);
+
+        $this->assertSame(200, $this->client->getResponse()->getStatusCode());
 
         $content = json_decode($this->client->getResponse()->getContent(), true);
 
-        $this->assertCount(
-            1,
-            $content['errors']['children']['quote']['errors'],
-            'The quote field should contains an error'
-        );
+        $this->assertSame('Big boss', $content['user']);
+        $this->assertSame('v1.0', $content['annotator_schema_version']);
+        $this->assertSame('my new annotation', $content['text']);
+        $this->assertSame('', $content['quote']);
     }
 
     /**
-- 
cgit v1.2.3