From 2ac03a912c9be5dff2ff906c2bc88edfac84c025 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Tue, 14 Oct 2014 07:33:08 +0000
Subject: [PATCH] VRFS-2217 fixed spec test; cleanup profile feeds issue

---
 web/app/assets/javascripts/feedHelper.js  | 6 +++---
 web/spec/features/profile_history_spec.rb | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/app/assets/javascripts/feedHelper.js b/web/app/assets/javascripts/feedHelper.js
index 869e289bf..78d827a9d 100644
--- a/web/app/assets/javascripts/feedHelper.js
+++ b/web/app/assets/javascripts/feedHelper.js
@@ -90,9 +90,9 @@
     function setLoading(yn) {
         isLoading = yn;
         if (yn) {
-            $('#'+screenID()+'loading-feeds').show();
+            $('#'+screenID()+'-loading-feeds').show();
         } else {
-            $('#'+screenID()+'loading-feeds').hide();
+            $('#'+screenID()+'-loading-feeds').hide();
         }
     }
 
@@ -542,7 +542,7 @@
           var winheight = $(scrollerID).height();
           var docheight = $('#'+screenID()+'-feed-entry-list').height();
           var scrollTrigger = 0.90;
-          console.log("feed scroll:  wintop="+wintop+" docheight="+docheight+" winheight="+winheight+" ratio="+(wintop / (docheight - winheight)));
+          //console.log("feed scroll:  wintop="+wintop+" docheight="+docheight+" winheight="+winheight+" ratio="+(wintop / (docheight - winheight)));
           if ((wintop / (docheight - winheight)) > scrollTrigger) {
               populate();
           }
diff --git a/web/spec/features/profile_history_spec.rb b/web/spec/features/profile_history_spec.rb
index dad18fadf..551b1dc22 100644
--- a/web/spec/features/profile_history_spec.rb
+++ b/web/spec/features/profile_history_spec.rb
@@ -24,7 +24,6 @@ describe "Profile History", :js => true, :type => :feature, :capybara_feature =>
   # the same feedHelper instance is used to show any user's feed. so we need to make sure bouncing back and forth
   # between feeds is safe
   it "between users" do
-    pending
     create_session(creator: user)
     formal_leave_by(user)
     user2 = FactoryGirl.create(:user)