From 9013ff2e940b5305d0b640289608d66fea819894 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 29 Jul 2014 21:42:35 -0500
Subject: [PATCH] * VRFS-1987 fix stupid typo caused by refactor of
 MusicSession to ActiveMusicSession

---
 ruby/lib/jam_ruby/models/music_session.rb |  2 +-
 web/app/views/api_feeds/show.rabl         |  2 +-
 web/spec/features/feed_spec.rb            | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb
index 271bd5863..f08235890 100644
--- a/ruby/lib/jam_ruby/models/music_session.rb
+++ b/ruby/lib/jam_ruby/models/music_session.rb
@@ -409,7 +409,7 @@ module JamRuby
     end
 
     def has_mount?
-      active_music_session && active_music_session.mount
+      !active_music_session.nil? && !active_music_session.mount.nil?
     end
 
     def can_cancel?  user
diff --git a/web/app/views/api_feeds/show.rabl b/web/app/views/api_feeds/show.rabl
index 140828833..e502fcbf7 100644
--- a/web/app/views/api_feeds/show.rabl
+++ b/web/app/views/api_feeds/show.rabl
@@ -60,7 +60,7 @@ glue :music_session do
     attributes :id, :name, :location, :photo_url
   }
 
-  child(:active_music_session => :music_session) do
+  child(:active_music_session => :active_music_session) do
     # only show mount info if fan_access is public.  Eventually we'll also need to show this in other scenarios, like if invited
     child({:mount => :mount}, :if => lambda { |music_session| music_session.fan_access}) {
       attributes :id, :name, :sourced, :listeners, :bitrate, :subtype, :url
diff --git a/web/spec/features/feed_spec.rb b/web/spec/features/feed_spec.rb
index 4e3bff388..d545d8c38 100644
--- a/web/spec/features/feed_spec.rb
+++ b/web/spec/features/feed_spec.rb
@@ -10,6 +10,22 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do
   end
 
 
+  describe "regressions" do
+
+    describe "mount" do
+
+      it "should render when has mount" do
+        # regression for VRFS-1987
+        ams = FactoryGirl.create(:active_music_session)
+        FactoryGirl.create(:icecast_mount, music_session_id: ams.id)
+
+        fast_signin user, "/client#/feed"
+        find('#feedScreen')
+
+        find(".feed-entry.music-session-history-entry[data-music-session='#{ams.id}']")
+      end
+    end
+  end
   describe "sessions" do
 
     before(:each) do
@@ -40,6 +56,7 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do
     #   it " and render artist hover bubble"
     # end
 
+
     it "should render stats" do
       visit "/client#/feed"