]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Added tests
authorNicolas Lœuillet <nicolas@loeuillet.org>
Sat, 25 Apr 2020 08:33:41 +0000 (10:33 +0200)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Tue, 28 Apr 2020 08:14:46 +0000 (10:14 +0200)
18 files changed:
src/Wallabag/CoreBundle/Form/Type/EntrySortType.php
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php

index ac251c5b95fad51d57bb2ba0df26b7846bb55aa5..4ad54118dedc36e55400a7b865f321c561fabd39 100644 (file)
@@ -36,8 +36,8 @@ class EntrySortType extends AbstractType
                     'entry.sort.by.creation_date' => 'createdAt',
                     'entry.sort.by.starred_date' => 'starredAt',
                     'entry.sort.by.archive_date' => 'archivedAt',
-                    'entry.sort.by.title' => 'title',
                     'entry.sort.by.last_updated' => 'updatedAt',
+                    'entry.sort.by.title' => 'title',
                 ],
                 'label' => 'entry.sort.status_label',
             ])
index 0c35f2f9265a5d9c527d5cf4b50ea18291b7b36e..20a3fa505dffdc11d01b192e343cf2cd12584052 100644 (file)
@@ -260,12 +260,16 @@ entry:
     sort:
         # title: 'Sort options'
         # status_label: 'Sort by'
+        # order_label: 'Order'
         # by:
-        #    creation_date: 'Creation date'
-        #    title: 'Title'
-        #    last_updated: 'Last updated'
-        #ascending: 'Asencending'
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
         # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             # back_to_top: 'Back to top'
index 73ecebb9b03516f7535fa721b37ca2b3fc1de2c1..d998cfc82f1b3d0bff9e91ddfed06b9127175553 100644 (file)
@@ -260,12 +260,16 @@ entry:
     sort:
         # title: 'Sort options'
         # status_label: 'Sort by'
+        # order_label: 'Order'
         # by:
-        #    creation_date: 'Creation date'
-        #    title: 'Title'
-        #    last_updated: 'Last updated'
-        #ascending: 'Asencending'
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
         # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             back_to_top: 'Nach oben'
index c7699ef04c6d8730e77b3857f55ca60e65d37f0a..635937a5239c0b311e43eb5586c54ccf427eb60f 100644 (file)
@@ -263,6 +263,8 @@ entry:
         order_label: 'Order'
         by:
             creation_date: 'Creation date'
+            starred_date: 'Starred date'
+            archive_date: 'Archived date'
             title: 'Title'
             last_updated: 'Last updated'
         ascending: 'Ascending'
index 1d834290ee944850419290e5fa5b8d1baacfcf22..9945e24b88551ffd5c3fde5ff89dc6eb8c903ecf 100644 (file)
@@ -260,12 +260,16 @@ entry:
     sort:
         # title: 'Sort options'
         # status_label: 'Sort by'
+        # order_label: 'Order'
         # by:
-        #    creation_date: 'Creation date'
-        #    title: 'Title'
-        #    last_updated: 'Last updated'
-        #ascending: 'Asencending'
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
         # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             back_to_top: 'Regrese al principio'
index 46e96c047a0b0401c2201f0cf40442c9a376d095..6cb3be4389c8665d23e36937bd4aaf36401d4c45 100644 (file)
@@ -260,12 +260,16 @@ entry:
     sort:
         # title: 'Sort options'
         # status_label: 'Sort by'
+        # order_label: 'Order'
         # by:
-        #    creation_date: 'Creation date'
-        #    title: 'Title'
-        #    last_updated: 'Last updated'
-        #ascending: 'Asencending'
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
         # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             back_to_top: 'بازگشت به بالای صفحه'
index dc75f5c105769e9aaaa4fdf2701dd13327e8c81f..75df9260327b40df2585185efba9f19b490739fa 100644 (file)
@@ -260,12 +260,16 @@ entry:
     sort:
         title: 'Options de tri'
         status_label: 'Trier par'
+        order_label: 'Ordre'
         by:
             creation_date: 'Date de création'
+            starred_date: 'Date de mise en favori date'
+            archive_date: "Date d'archivage"
             title: 'Titre'
             last_updated: 'Dernière mise à jour'
         ascending: 'Ascendant'
         descending: 'Descendant'
+        sort: 'Trier'
     view:
         left_menu:
             back_to_top: "Revenir en haut"
index 804871b1cac00e9c15a0c86e7f612fce4f47fe01..7e30fa8abe16fc1013d371e45455d50d95fb8d34 100644 (file)
@@ -260,12 +260,16 @@ entry:
     sort:
         # title: 'Sort options'
         # status_label: 'Sort by'
+        # order_label: 'Order'
         # by:
-        #    creation_date: 'Creation date'
-        #    title: 'Title'
-        #    last_updated: 'Last updated'
-        #ascending: 'Asencending'
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
         # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             back_to_top: "Torna all'inizio"
index 9ae4d6bb5a800f35766148ad36bc2bec722dcc06..38e8e95c089eb3ab9768b3ae784f55169d3a416c 100644 (file)
@@ -236,6 +236,19 @@ entry:
         action:
             clear: '解除'
             filter: '検索'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # order_label: 'Order'
+        # by:
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
+        # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             back_to_top: 'トップへ戻る'
index 93b844d811b45f1e8771dfd696a7db019976cea3..7bda58808ea9eb0e64233f81f3b6814f5cc3d8dc 100644 (file)
@@ -260,12 +260,16 @@ entry:
     sort:
         # title: 'Sort options'
         # status_label: 'Sort by'
+        # order_label: 'Order'
         # by:
-        #    creation_date: 'Creation date'
-        #    title: 'Title'
-        #    last_updated: 'Last updated'
-        #ascending: 'Asencending'
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
         # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             back_to_top: 'Tornar en naut'
index 0f0d83781738126bbeb7e0e03fbba04ecf1e1e86..77b93403e981883e7c22f78fd3e58264104a6d73 100644 (file)
@@ -260,12 +260,16 @@ entry:
     sort:
         # title: 'Sort options'
         # status_label: 'Sort by'
+        # order_label: 'Order'
         # by:
-        #    creation_date: 'Creation date'
-        #    title: 'Title'
-        #    last_updated: 'Last updated'
-        #ascending: 'Asencending'
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
         # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             back_to_top: 'Wróć na górę'
index 5a403c2361b2f52d96c5b3ed12afa74a00a2dae5..dd34d57964abb38b0118dd11fc6d2c3295a4b31c 100644 (file)
@@ -260,12 +260,16 @@ entry:
     sort:
         # title: 'Sort options'
         # status_label: 'Sort by'
+        # order_label: 'Order'
         # by:
-        #    creation_date: 'Creation date'
-        #    title: 'Title'
-        #    last_updated: 'Last updated'
-        #ascending: 'Asencending'
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
         # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             back_to_top: 'Voltar ao topo'
index 55fcead71877153a73a8d26c3cf54c52c43ce84d..0991c373a7e63fc3157d0da8ac809709a998f0b1 100644 (file)
@@ -260,12 +260,16 @@ entry:
     sort:
         # title: 'Sort options'
         # status_label: 'Sort by'
+        # order_label: 'Order'
         # by:
-        #    creation_date: 'Creation date'
-        #    title: 'Title'
-        #    last_updated: 'Last updated'
-        #ascending: 'Asencending'
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
         # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             # back_to_top: 'Back to top'
index f593a03787f7ce336d846a1705eea0a41820c2bd..d151e35173b85a1b3e09275bd6bebf980dc9260e 100644 (file)
@@ -256,6 +256,19 @@ entry:
         action:
             clear: 'Очистить'
             filter: 'Выбрать'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # order_label: 'Order'
+        # by:
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
+        # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             back_to_top: 'Наверх'
index fa013e55bc17233c83235e59fd4447957e1088f6..303644438cb0b1b6198b5a00019613067be5499a 100644 (file)
@@ -256,6 +256,19 @@ entry:
         action:
             clear: 'ล้าง'
             filter: 'ตัวกรอง'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # order_label: 'Order'
+        # by:
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
+        # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             back_to_top: 'กลับไปข้างบน'
index 0f5655faf1e62ea87a86b59fe0a6a55244a1f150..84a48f5b4b2b060eb8030140355a65b814b18519 100644 (file)
@@ -260,12 +260,16 @@ entry:
     sort:
         # title: 'Sort options'
         # status_label: 'Sort by'
+        # order_label: 'Order'
         # by:
-        #    creation_date: 'Creation date'
-        #    title: 'Title'
-        #    last_updated: 'Last updated'
-        #ascending: 'Asencending'
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
         # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             # back_to_top: 'Back to top'
index e68b91b729cf167b6204435cf41136ea2033d2ee..dad26cba449ea162291644814de65472091e9a8b 100644 (file)
@@ -236,6 +236,19 @@ entry:
         action:
             clear: '清除'
             filter: '筛选'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # order_label: 'Order'
+        # by:
+            # creation_date: 'Creation date'
+            # starred_date: 'Starred date'
+            # archive_date: 'Archived date'
+            # title: 'Title'
+            # last_updated: 'Last updated'
+        # ascending: 'Ascending'
+        # descending: 'Descending'
+        # sort: 'Sort'
     view:
         left_menu:
             back_to_top: '返回顶部'
index 15f05d489e80dc4d582f7a4db18ee5b8b946970c..765c108e9ad4512d61168d86027c796734a1609f 100644 (file)
@@ -1041,7 +1041,7 @@ class EntryControllerTest extends WallabagCoreTestCase
             $this->assertSame('test title entry' . $ids[$key], $result);
         }
 
-        rsort($ids);
+        $ids = array_reverse($ids);
 
         $crawler = $client->request('GET', '/unread/list');
         $form = $crawler->filter('button[id=submit-sort]')->form();
@@ -1061,6 +1061,201 @@ class EntryControllerTest extends WallabagCoreTestCase
         }
     }
 
+    public function testSortOnCreationDate()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+
+        $entry1 = new Entry($this->getLoggedInUser());
+        $entry1->setTitle('test title entry7');
+        $entry1->setCreatedAt(new \DateTime('2013-04-03T13:37:00'));
+        $this->getEntityManager()->persist($entry1);
+
+        $entry2 = new Entry($this->getLoggedInUser());
+        $entry2->setTitle('test title entry8');
+        $entry2->setCreatedAt(new \DateTime('2012-04-03T13:37:00'));
+        $this->getEntityManager()->persist($entry2);
+
+        $entry3 = new Entry($this->getLoggedInUser());
+        $entry3->setTitle('test title entry9');
+        $entry3->setCreatedAt(new \DateTime('2014-04-03T13:37:00'));
+        $this->getEntityManager()->persist($entry3);
+
+        $this->getEntityManager()->flush();
+
+        $crawler = $client->request('GET', '/unread/list');
+        $form = $crawler->filter('button[id=submit-sort]')->form();
+        $data = [
+            'entry_sort[sortType]' => 'createdAt',
+            'entry_sort[sortOrder]' => 'asc',
+        ];
+        $crawler = $client->submit($form, $data);
+
+        $this->assertCount(7, $crawler->filter('li.entry'));
+
+        $matches = [];
+        preg_match_all('/test title entry([0-9])/', $client->getResponse()->getContent(), $matches);
+
+        $results = array_values(array_unique($matches[0]));
+
+        $ids = [8, 7, 9, 1, 2, 4, 5];
+
+        foreach ($results as $key => $result) {
+            $this->assertSame('test title entry' . $ids[$key], $result);
+        }
+
+        $ids = array_reverse($ids);
+
+        $crawler = $client->request('GET', '/unread/list');
+        $form = $crawler->filter('button[id=submit-sort]')->form();
+        $data = [
+            'entry_sort[sortType]' => 'createdAt',
+            'entry_sort[sortOrder]' => 'desc',
+        ];
+        $crawler = $client->submit($form, $data);
+
+        $matches = [];
+        preg_match_all('/test title entry([0-9])/', $client->getResponse()->getContent(), $matches);
+
+        $results = array_values(array_unique($matches[0]));
+
+        foreach ($results as $key => $result) {
+            $this->assertSame('test title entry' . $ids[$key], $result);
+        }
+    }
+
+    public function testSortOnStarredDate()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+
+        $entry1 = new Entry($this->getLoggedInUser());
+        $entry1->setTitle('test title entry7');
+        $entry1->setStarred(true);
+        $entry1->setStarredAt(new \DateTime('2013-04-03T13:37:00'));
+        $this->getEntityManager()->persist($entry1);
+
+        $entry2 = new Entry($this->getLoggedInUser());
+        $entry2->setTitle('test title entry8');
+        $entry2->setStarred(true);
+        $entry2->setStarredAt(new \DateTime('2012-04-03T13:37:00'));
+        $this->getEntityManager()->persist($entry2);
+
+        $entry3 = new Entry($this->getLoggedInUser());
+        $entry3->setTitle('test title entry9');
+        $entry3->setStarred(true);
+        $entry3->setStarredAt(new \DateTime('2014-04-03T13:37:00'));
+        $this->getEntityManager()->persist($entry3);
+
+        $this->getEntityManager()->flush();
+
+        $crawler = $client->request('GET', '/starred/list');
+        $form = $crawler->filter('button[id=submit-sort]')->form();
+        $data = [
+            'entry_sort[sortType]' => 'starredAt',
+            'entry_sort[sortOrder]' => 'asc',
+        ];
+        $crawler = $client->submit($form, $data);
+
+        $this->assertCount(4, $crawler->filter('li.entry'));
+
+        $matches = [];
+        preg_match_all('/test title entry([0-9])/', $client->getResponse()->getContent(), $matches);
+
+        $results = array_values(array_unique($matches[0]));
+
+        $ids = [5, 8, 7, 9];
+
+        foreach ($results as $key => $result) {
+            $this->assertSame('test title entry' . $ids[$key], $result);
+        }
+
+        $ids = array_reverse($ids);
+
+        $crawler = $client->request('GET', '/starred/list');
+        $form = $crawler->filter('button[id=submit-sort]')->form();
+        $data = [
+            'entry_sort[sortType]' => 'starredAt',
+            'entry_sort[sortOrder]' => 'desc',
+        ];
+        $crawler = $client->submit($form, $data);
+
+        $matches = [];
+        preg_match_all('/test title entry([0-9])/', $client->getResponse()->getContent(), $matches);
+
+        $results = array_values(array_unique($matches[0]));
+
+        foreach ($results as $key => $result) {
+            $this->assertSame('test title entry' . $ids[$key], $result);
+        }
+    }
+
+    public function testSortOnArchivedDate()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+
+        $entry1 = new Entry($this->getLoggedInUser());
+        $entry1->setTitle('test title entry7');
+        $entry1->setArchived(true);
+        $entry1->setArchivedAt(new \DateTime('2010-04-03T13:37:00'));
+        $this->getEntityManager()->persist($entry1);
+
+        $entry2 = new Entry($this->getLoggedInUser());
+        $entry2->setTitle('test title entry8');
+        $entry2->setArchived(true);
+        $entry2->setArchivedAt(new \DateTime('2000-04-03T13:37:00'));
+        $this->getEntityManager()->persist($entry2);
+
+        $entry3 = new Entry($this->getLoggedInUser());
+        $entry3->setTitle('test title entry9');
+        $entry3->setArchived(true);
+        $entry3->setArchivedAt(new \DateTime('2020-04-03T13:37:00'));
+        $this->getEntityManager()->persist($entry3);
+
+        $this->getEntityManager()->flush();
+
+        $crawler = $client->request('GET', '/archive/list');
+        $form = $crawler->filter('button[id=submit-sort]')->form();
+        $data = [
+            'entry_sort[sortType]' => 'archivedAt',
+            'entry_sort[sortOrder]' => 'asc',
+        ];
+        $crawler = $client->submit($form, $data);
+
+        $this->assertCount(4, $crawler->filter('li.entry'));
+
+        $matches = [];
+        preg_match_all('/test title entry([0-9])/', $client->getResponse()->getContent(), $matches);
+
+        $results = array_values(array_unique($matches[0]));
+
+        $ids = [6, 8, 7, 9];
+
+        foreach ($results as $key => $result) {
+            $this->assertSame('test title entry' . $ids[$key], $result);
+        }
+
+        $ids = array_reverse($ids);
+
+        $crawler = $client->request('GET', '/archive/list');
+        $form = $crawler->filter('button[id=submit-sort]')->form();
+        $data = [
+            'entry_sort[sortType]' => 'archivedAt',
+            'entry_sort[sortOrder]' => 'desc',
+        ];
+        $crawler = $client->submit($form, $data);
+
+        $matches = [];
+        preg_match_all('/test title entry([0-9])/', $client->getResponse()->getContent(), $matches);
+
+        $results = array_values(array_unique($matches[0]));
+
+        foreach ($results as $key => $result) {
+            $this->assertSame('test title entry' . $ids[$key], $result);
+        }
+    }
+
     public function testShareEntryPublicly()
     {
         $this->logInAs('admin');