From 33a431f82240f7160554ac8c781a2fabcf4baf25 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Sun, 2 Nov 2014 14:26:56 -0500
Subject: [PATCH] VRFS-2427 fixed broken test

---
 ruby/lib/jam_ruby/models/feed.rb              | 19 ++++---------------
 web/app/assets/javascripts/feedHelper.js      |  6 +++---
 .../controllers/api_feeds_controller_spec.rb  | 10 +++++-----
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/feed.rb b/ruby/lib/jam_ruby/models/feed.rb
index f61c949b6..7fba1e705 100644
--- a/ruby/lib/jam_ruby/models/feed.rb
+++ b/ruby/lib/jam_ruby/models/feed.rb
@@ -20,14 +20,6 @@ module JamRuby
       sort ||= 'date'
       raise "not valid sort #{sort}" unless SORT_TYPES.include?(sort)
 
-      # start = params[:start].presence
-      # if sort == 'date'
-      #   start ||= FIXNUM_MAX
-      # else
-      #   start ||= 0
-      # end
-      # start = start.to_i
-
       time_range = params[:time_range]
       time_range ||= 'all'
       raise "not valid time_range #{time_range}" unless TIME_RANGES.has_key?(time_range)
@@ -47,13 +39,10 @@ module JamRuby
 
       # handle sort
       if sort == 'date'
-        # query = query.where("feeds.id < #{start}")
         query = query.order('feeds.active DESC, feeds.id DESC')
       elsif sort == 'plays'
-        # query = query.offset(start)
         query = query.order("feeds.active DESC, COALESCE(recordings.play_count, music_sessions.play_count) DESC")
       elsif sort == 'likes'
-        # query = query.offset(start)
         query = query.order("feeds.active DESC, COALESCE(recordings.like_count, music_sessions.like_count) DESC")
       else
         raise "sort not implemented: #{sort}"
@@ -117,17 +106,17 @@ module JamRuby
       query = query.paginate(:page => current_page, :per_page => limit)
 
       if params[:hash]
-        if query.length == 0
+        if query.length == 0  # no more results
           { query: query, next_page: nil}
-        elsif query.length < limit
+        elsif query.length < limit  # no more results
           { query: query, next_page: nil}
         else
           { query: query, next_page: next_page }
         end
       else
-        if query.length == 0
+        if query.length == 0  # no more results
           [query, nil]
-        elsif query.length < limit
+        elsif query.length < limit  # no more results
           [query, nil]
         else
           [query, next_page]
diff --git a/web/app/assets/javascripts/feedHelper.js b/web/app/assets/javascripts/feedHelper.js
index 74dfae892..ab7c8b14a 100644
--- a/web/app/assets/javascripts/feedHelper.js
+++ b/web/app/assets/javascripts/feedHelper.js
@@ -20,7 +20,7 @@
     var $refresh = null;
     var $sortFeedBy = null;
     var $includeDate = null;
-    var nextPage = null;
+    var nextPage = 1;
     var $includeType = null;
     var didLoadAllFeeds = false, isLoading = false;
 
@@ -53,7 +53,7 @@
       currentFeedPage = 0;
       $content.empty(); // TODO: do we need to delete audio elements?
       $noMoreFeeds.hide();
-      nextPage = null;
+      nextPage = 1;
     }
 
     function handleFeedResponse(response) {
@@ -63,7 +63,7 @@
       if(nextPage == null) {
         didLoadAllFeeds = true;
 
-        // if we less results than asked for, end searching
+        // if we got less results than asked for, end searching
         logger.debug("end of feeds")
 
         if(currentFeedPage == 0 && response.entries.length == 0) {
diff --git a/web/spec/controllers/api_feeds_controller_spec.rb b/web/spec/controllers/api_feeds_controller_spec.rb
index 78a60b021..c0a62ab8b 100644
--- a/web/spec/controllers/api_feeds_controller_spec.rb
+++ b/web/spec/controllers/api_feeds_controller_spec.rb
@@ -100,19 +100,19 @@ describe ApiFeedsController do
       get :index, { limit: 1 }
       json = JSON.parse(response.body, :symbolize_names => true)
       json[:entries].length.should == 1
-      _next = json[:next]
+      _next = json[:next_page]
       _next.should_not be_nil
 
-      get :index, { limit: 1, since: _next }
+      get :index, { limit: 1, next_page: _next }
       json = JSON.parse(response.body, :symbolize_names => true)
       json[:entries].length.should == 1
-      _next = json[:next]
+      _next = json[:next_page]
       _next.should_not be_nil
 
-      get :index, { limit: 1, since: _next }
+      get :index, { limit: 1, next_page: _next }
       json = JSON.parse(response.body, :symbolize_names => true)
       json[:entries].length.should == 0
-      _next = json[:next]
+      _next = json[:next_page]
       _next.should be_nil
     end
   end