* uncommenting the index tests; fixed a bug too

ruby/lib/jam_ruby/models/active_music_session.rb

@@ -149,7 +149,7 @@ module JamRuby
         # if you are trying to join the session as a fan/listener,
         # we have to have a mount, fan_access has to be true, and we have to allow for the reload of icecast to have taken effect
         query = query.joins('INNER JOIN icecast_mounts ON icecast_mounts.music_session_id = active_music_sessions.id INNER JOIN icecast_servers ON icecast_mounts.icecast_server_id = icecast_servers.id')
-        query = query.where(:fan_access => true)
+        query = query.where('music_sessions.fan_access = true')
         query = query.where("(active_music_sessions.created_at < icecast_servers.config_updated_at)")
       end
 

ruby/spec/factories.rb

@@ -73,7 +73,7 @@ FactoryGirl.define do
         FactoryGirl.create(:music_session_user_history, :history => session.music_session, :user => session.creator)
       }
 
-      factory :music_session_with_mount do
+      factory :active_music_session_with_mount do
         association :mount, :factory => :icecast_mount
       end
     end

ruby/spec/jam_ruby/models/music_session_spec.rb

@@ -81,8 +81,6 @@ describe ActiveMusicSession do
     music_session.can_see?(user3).should == false
   end
 
-=begin
-#XXX These tests should use nindex
   describe "index" do
     it "orders two sessions by created_at starting with most recent" do
       creator = FactoryGirl.create(:user)
@@ -167,7 +165,7 @@ describe ActiveMusicSession do
     it "lists a session if the genre matches" do
       creator = FactoryGirl.create(:user)
       genre = FactoryGirl.create(:genre)
-      session = FactoryGirl.create(:active_music_session, :creator => creator, :description => "Session", :genres => [genre])
+      session = FactoryGirl.create(:active_music_session, :creator => creator, :description => "Session", :genre => genre)
       FactoryGirl.create(:connection, :user => creator, :music_session => session)
       user = FactoryGirl.create(:user)
 
@@ -179,7 +177,7 @@ describe ActiveMusicSession do
       creator = FactoryGirl.create(:user)
       genre1 = FactoryGirl.create(:genre)
       genre2 = FactoryGirl.create(:genre)
-      session = FactoryGirl.create(:active_music_session, :creator => creator, :description => "Session", :genres => [genre1])
+      session = FactoryGirl.create(:active_music_session, :creator => creator, :description => "Session", :genre => genre1)
       user = FactoryGirl.create(:user)
 
       music_sessions = ActiveMusicSession.index(user, genres: [genre2.id])
@@ -303,7 +301,7 @@ describe ActiveMusicSession do
 
     end
   end
-=end
+
   describe "nindex" do
     it "nindex orders two sessions by created_at starting with most recent" do
       creator = FactoryGirl.create(:user)