mark items on page 2+ read as well, update tests

Update integration tests, to ensure that all articles are marked read, instead of only visible.
mb-0 · Apr 7, 2015 · ee98a62 · ee98a62
1 parent 13aaf5f
commit ee98a62
Show file tree

Hide file tree

Showing 14 changed files with 2,342 additions and 193 deletions.
diff --git a/assets/js/all.min.js b/assets/js/all.min.js
diff --git a/assets/js/event.js b/assets/js/event.js
@@ -85,7 +85,7 @@ Miniflux.Event = (function() {
                             currentItem && Miniflux.Item.DownloadContent(currentItem);
                             break;
                         case 'mark-all-read':
-                            Miniflux.Item.MarkListingAsRead("?action=unread");
+                            Miniflux.Item.MarkAllAsRead('?action=unread');
                             break;
                         case 'mark-feed-read':
                             Miniflux.Item.MarkFeedAsRead(e.target.getAttribute("data-feed-id"));

diff --git a/assets/js/item.js b/assets/js/item.js
@@ -298,22 +298,15 @@ Miniflux.Item = (function() {
             request.open("POST", "?action=download-item&id=" + item_id, true);
             request.send();
         },
-        MarkListingAsRead: function(redirect) {
-            var articles = document.getElementsByTagName("article");
-            var listing = [];
-
-            for (var i = 0, ilen = articles.length; i < ilen; i++) {
-                listing.push(getItemID(articles[i]));
-            }
-
+        MarkAllAsRead: function(redirect) {
             var request = new XMLHttpRequest();
 
             request.onload = function() {
                 window.location.href = redirect;
             };
 
-            request.open("POST", "?action=mark-items-as-read", true);
-            request.send(JSON.stringify(listing));
+            request.open("POST", "?action=mark-all-read", true);
+            request.send();
         },
         MarkFeedAsRead: function(feed_id) {
             var request = new XMLHttpRequest();

diff --git a/controllers/item.php b/controllers/item.php
@@ -159,12 +159,19 @@
 });
 
 // Mark all unread items as read
-Router\get_action('mark-as-read', function() {
+Router\get_action('mark-all-read', function() {
 
     Model\Item\mark_all_as_read();
     Response\redirect('?action=unread');
 });
 
+// Mark all unread items as read (Ajax request)
+Router\post_action('mark-all-read', function(){
+
+    Model\Item\mark_all_as_read();
+    Response\json(array('OK'));
+});
+
 // Mark all unread items as read for a specific feed
 Router\get_action('mark-feed-as-read', function() {
 
@@ -187,13 +194,6 @@
     Response\raw($nb_items);
 });
 
-// Mark sent items id as read (Ajax request)
-Router\post_action('mark-items-as-read', function(){
-
-    Model\Item\mark_items_as_read(Request\values());
-    Response\json(array('OK'));
-});
-
 // Mark item as read and redirect to the listing page
 Router\get_action('mark-item-read', function() {
 

diff --git a/docs/tests.markdown b/docs/tests.markdown
@@ -86,11 +86,15 @@ The following `phpunit.xml` is used to run phpunit on a linux system with apache
 
 ```
 
-You can run the tests by executing phpunit within the Miniflux directory:
+Some tests don't run with every browser. You have to exclude those tests by using the ```--exclude-group``` commandline parameter. The following exclude groups exists:
+
+* moz_unsupported (Due to https://github.com/SeleniumHQ/selenium/issues/386)
+* ie_unsupported (Due to https://code.google.com/p/selenium/issues/detail?id=4973)
 
+You can run the tests by executing phpunit within the Miniflux directory:
 
 ```bash
-/usr/local/bin/phpunit
+/usr/local/bin/phpunit --exclude-group ie_unsupported
 
 PHPUnit 4.4.0 by Sebastian Bergmann.
 

diff --git a/models/item.php b/models/item.php
@@ -377,18 +377,6 @@ function mark_all_as_removed()
         ->save(array('status' => 'removed', 'content' => ''));
 }
 
-// Mark only specified items as read
-function mark_items_as_read(array $items_id)
-{
-    Database::get('db')->startTransaction();
-
-    foreach ($items_id as $id) {
-        set_read($id);
-    }
-
-    Database::get('db')->closeTransaction();
-}
-
 // Mark all items of a feed as read
 function mark_feed_as_read($feed_id)
 {

diff --git a/templates/unread_items.php b/templates/unread_items.php
@@ -9,7 +9,7 @@
                 <a href="?action=unread&amp;order=updated&amp;direction=<?= $direction == 'asc' ? 'desc' : 'asc' ?>"><?= tne('sort by date %s(%s)%s', '<span class="hide-mobile">',$direction == 'desc' ? t('older first') : t('most recent first'), '</span>') ?></a>
             </li>
             <li>
-                <a href="?action=mark-as-read" data-action="mark-all-read"><?= t('mark all as read') ?></a>
+                <a href="?action=mark-all-read" data-action="mark-all-read"><?= t('mark all as read') ?></a>
             </li>
         </ul>
     </div>
@@ -28,7 +28,7 @@
         <?php endforeach ?>
 
         <div id="bottom-menu">
-            <a href="?action=mark-as-read" data-action="mark-all-read"><?= t('mark all as read') ?></a>
+            <a href="?action=mark-all-read" data-action="mark-all-read"><?= t('mark all as read') ?></a>
         </div>
 
         <?= \PicoFarad\Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?>